diff --git a/.vscode/settings.json b/.vscode/settings.json index 4fa8059898..11e44342bd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,7 +10,7 @@ "**/.pnp.*": true }, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "files.eol": "\n", "files.insertFinalNewline": true, diff --git a/_mapload/euthenia.dm b/_mapload/euthenia.dm new file mode 100644 index 0000000000..1e8222e521 --- /dev/null +++ b/_mapload/euthenia.dm @@ -0,0 +1,5 @@ +#ifdef FORCE_MAP + #error Duplicate FORCE_MAP, what are you doing!? +#endif + +#define FORCE_MAP "euthenia" diff --git a/_mapload/minitest.dm b/_mapload/minitest.dm new file mode 100644 index 0000000000..14f378fa88 --- /dev/null +++ b/_mapload/minitest.dm @@ -0,0 +1,5 @@ +#ifdef FORCE_MAP + #error Duplicate FORCE_MAP, what are you doing!? +#endif + +#define FORCE_MAP "minitest" diff --git a/citadel.dme b/citadel.dme index ecbcfbf779..c9414d382a 100644 --- a/citadel.dme +++ b/citadel.dme @@ -222,6 +222,7 @@ #include "code\__DEFINES\languages\ids.dm" #include "code\__DEFINES\languages\legacy.dm" #include "code\__DEFINES\languages\translation.dm" +#include "code\__DEFINES\machines\airlock_states.dm" #include "code\__DEFINES\machines\door.dm" #include "code\__DEFINES\mapping\levels.dm" #include "code\__DEFINES\mapping\maploader.dm" @@ -238,17 +239,20 @@ #include "code\__DEFINES\mining\legacy.dm" #include "code\__DEFINES\misc\attack_animations.dm" #include "code\__DEFINES\misc\message_ranges.dm" +#include "code\__DEFINES\misc\nightshift.dm" #include "code\__DEFINES\mobs\actions.dm" +#include "code\__DEFINES\mobs\biology.dm" #include "code\__DEFINES\mobs\characteristics.dm" #include "code\__DEFINES\mobs\grab.dm" -#include "code\__DEFINES\mobs\health.dm" #include "code\__DEFINES\mobs\intent.dm" +#include "code\__DEFINES\mobs\life.dm" #include "code\__DEFINES\mobs\mobility.dm" #include "code\__DEFINES\mobs\mobs.dm" #include "code\__DEFINES\mobs\organs.dm" #include "code\__DEFINES\mobs\silicon_privileges.dm" #include "code\__DEFINES\mobs\sprite_accessories.dm" #include "code\__DEFINES\mobs\stat.dm" +#include "code\__DEFINES\objects\type_generation.dm" #include "code\__DEFINES\overmaps\misc.dm" #include "code\__DEFINES\overmaps\overmap.dm" #include "code\__DEFINES\power\balancing.dm" @@ -605,6 +609,7 @@ #include "code\controllers\subsystem\sound\channel_manager.dm" #include "code\controllers\subsystem\sound\soundbyte_manager.dm" #include "code\datums\ability.dm" +#include "code\datums\ability_handler.dm" #include "code\datums\access.dm" #include "code\datums\action.dm" #include "code\datums\ai_law_sets.dm" @@ -1192,6 +1197,7 @@ #include "code\game\machinery\fire_alarm.dm" #include "code\game\machinery\flasher.dm" #include "code\game\machinery\floodlight.dm" +#include "code\game\machinery\floor_inflatables.dm" #include "code\game\machinery\floor_light.dm" #include "code\game\machinery\floorlayer.dm" #include "code\game\machinery\fossilrevive.dm" @@ -1983,6 +1989,7 @@ #include "code\game\turfs\simulated\floor_types\lava.dm" #include "code\game\turfs\simulated\floor_types\outdoors.dm" #include "code\game\turfs\simulated\floor_types\outdoors_attackby.dm" +#include "code\game\turfs\simulated\floor_types\river.dm" #include "code\game\turfs\simulated\floor_types\sky.dm" #include "code\game\turfs\simulated\floor_types\snow.dm" #include "code\game\turfs\simulated\floor_types\water.dm" @@ -2012,7 +2019,6 @@ #include "code\game\turfs\unsimulated\walls.dm" #include "code\game\verbs\advanced_who.dm" #include "code\game\verbs\character_directory.dm" -#include "code\game\verbs\character_profile_verbs.dm" #include "code\game\verbs\ignore.dm" #include "code\game\verbs\suicide.dm" #include "code\game\verbs\who.dm" @@ -2346,13 +2352,11 @@ #include "code\modules\catalogue\cataloguer_visuals.dm" #include "code\modules\catalogue\cataloguer_vr.dm" #include "code\modules\client\client.dm" -#include "code\modules\client\client_data.dm" #include "code\modules\client\client_procs.dm" #include "code\modules\client\connection.dm" #include "code\modules\client\cutscene.dm" #include "code\modules\client\legacy.dm" #include "code\modules\client\perspective.dm" -#include "code\modules\client\player_data.dm" #include "code\modules\client\security.dm" #include "code\modules\client\spam_prevention.dm" #include "code\modules\client\statpanel.dm" @@ -2360,6 +2364,8 @@ #include "code\modules\client\ui_style.dm" #include "code\modules\client\viewport.dm" #include "code\modules\client\wrappers.dm" +#include "code\modules\client\data\client_data.dm" +#include "code\modules\client\data\player_data.dm" #include "code\modules\client\onboarding\_onboarding.dm" #include "code\modules\client\onboarding\age_verification.dm" #include "code\modules\client\onboarding\panic_bunker.dm" @@ -2637,42 +2643,53 @@ #include "code\modules\food\recipes_fryer.dm" #include "code\modules\food\recipes_microwave.dm" #include "code\modules\food\recipes_oven.dm" -#include "code\modules\food\drinkingglass\drinkingglass.dm" #include "code\modules\food\drinkingglass\extras.dm" +#include "code\modules\food\drinkingglass\glass1.dm" +#include "code\modules\food\drinkingglass\glass2.dm" #include "code\modules\food\drinkingglass\glass_boxes.dm" #include "code\modules\food\drinkingglass\glass_types.dm" #include "code\modules\food\drinkingglass\metaglass.dm" #include "code\modules\food\drinkingglass\shaker.dm" -#include "code\modules\food\food\cans.dm" +#include "code\modules\food\drinks\bottle.dm" +#include "code\modules\food\drinks\can.dm" +#include "code\modules\food\drinks\carton.dm" +#include "code\modules\food\drinks\cup.dm" +#include "code\modules\food\drinks\flask.dm" +#include "code\modules\food\drinks\jar.dm" +#include "code\modules\food\drinks\misc.dm" +#include "code\modules\food\drinks\shaker.dm" +#include "code\modules\food\drinks\tea.dm" +#include "code\modules\food\drinks\bottle\alcohol.dm" +#include "code\modules\food\drinks\bottle\dairy.dm" +#include "code\modules\food\drinks\bottle\juice.dm" +#include "code\modules\food\drinks\bottle\misc.dm" +#include "code\modules\food\drinks\bottle\soda.dm" #include "code\modules\food\food\condiment.dm" #include "code\modules\food\food\drinks.dm" +#include "code\modules\food\food\ice_cream.dm" #include "code\modules\food\food\lunch.dm" #include "code\modules\food\food\sandwich.dm" #include "code\modules\food\food\snacks.dm" #include "code\modules\food\food\z_custom_food_vr.dm" -#include "code\modules\food\food\drinks\bottle.dm" -#include "code\modules\food\food\drinks\cup.dm" -#include "code\modules\food\food\drinks\drinkingglass.dm" -#include "code\modules\food\food\drinks\jar.dm" #include "code\modules\food\food\snacks\meat.dm" #include "code\modules\food\glass\bottle.dm" #include "code\modules\food\glass\bottle_vr.dm" #include "code\modules\food\glass\bottle\robot.dm" -#include "code\modules\food\kitchen\gibber.dm" -#include "code\modules\food\kitchen\icecream.dm" -#include "code\modules\food\kitchen\microwave.dm" -#include "code\modules\food\kitchen\smartfridge.dm" -#include "code\modules\food\kitchen\smartfridge_vr.dm" -#include "code\modules\food\kitchen\cooking_machines\_appliance.dm" -#include "code\modules\food\kitchen\cooking_machines\_cooker.dm" -#include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm" -#include "code\modules\food\kitchen\cooking_machines\_mixer.dm" -#include "code\modules\food\kitchen\cooking_machines\candy.dm" -#include "code\modules\food\kitchen\cooking_machines\cereal.dm" -#include "code\modules\food\kitchen\cooking_machines\container.dm" -#include "code\modules\food\kitchen\cooking_machines\fryer.dm" -#include "code\modules\food\kitchen\cooking_machines\grill.dm" -#include "code\modules\food\kitchen\cooking_machines\oven.dm" +#include "code\modules\food\machinery\gibber.dm" +#include "code\modules\food\machinery\microwave.dm" +#include "code\modules\food\machinery\smartfridge.dm" +#include "code\modules\food\machinery\smartfridge_vr.dm" +#include "code\modules\food\machinery\appliance\_appliance.dm" +#include "code\modules\food\machinery\appliance\_cooker.dm" +#include "code\modules\food\machinery\appliance\_cooker_output.dm" +#include "code\modules\food\machinery\appliance\_mixer.dm" +#include "code\modules\food\machinery\appliance\candy.dm" +#include "code\modules\food\machinery\appliance\cereal.dm" +#include "code\modules\food\machinery\appliance\container.dm" +#include "code\modules\food\machinery\appliance\fryer.dm" +#include "code\modules\food\machinery\appliance\grill.dm" +#include "code\modules\food\machinery\appliance\oven.dm" +#include "code\modules\food\structures\icecream_cart.dm" #include "code\modules\gamemaster\controller.dm" #include "code\modules\gamemaster\defines.dm" #include "code\modules\gamemaster\helpers.dm" @@ -3406,6 +3423,7 @@ #include "code\modules\mob\living\say.dm" #include "code\modules\mob\living\status_procs.dm" #include "code\modules\mob\living\throwing.dm" +#include "code\modules\mob\living\vv.dm" #include "code\modules\mob\living\bot\assembly.dm" #include "code\modules\mob\living\bot\bot.dm" #include "code\modules\mob\living\bot\cleanbot.dm" @@ -3426,10 +3444,13 @@ #include "code\modules\mob\living\carbon\carbon_movement.dm" #include "code\modules\mob\living\carbon\carbon_powers.dm" #include "code\modules\mob\living\carbon\cpr.dm" +#include "code\modules\mob\living\carbon\damage_procs.dm" #include "code\modules\mob\living\carbon\give.dm" #include "code\modules\mob\living\carbon\health.dm" #include "code\modules\mob\living\carbon\inventory.dm" +#include "code\modules\mob\living\carbon\organs.dm" #include "code\modules\mob\living\carbon\perspective.dm" +#include "code\modules\mob\living\carbon\physiology.dm" #include "code\modules\mob\living\carbon\resist.dm" #include "code\modules\mob\living\carbon\shock.dm" #include "code\modules\mob\living\carbon\taste.dm" @@ -3540,6 +3561,7 @@ #include "code\modules\mob\living\silicon\decoy\death.dm" #include "code\modules\mob\living\silicon\decoy\decoy.dm" #include "code\modules\mob\living\silicon\decoy\life.dm" +#include "code\modules\mob\living\silicon\pai\actions.dm" #include "code\modules\mob\living\silicon\pai\admin.dm" #include "code\modules\mob\living\silicon\pai\death.dm" #include "code\modules\mob\living\silicon\pai\defense.dm" @@ -3563,6 +3585,7 @@ #include "code\modules\mob\living\silicon\robot\analyzer.dm" #include "code\modules\mob\living\silicon\robot\component.dm" #include "code\modules\mob\living\silicon\robot\custom_sprites.dm" +#include "code\modules\mob\living\silicon\robot\damage_procs.dm" #include "code\modules\mob\living\silicon\robot\death.dm" #include "code\modules\mob\living\silicon\robot\examine.dm" #include "code\modules\mob\living\silicon\robot\examine_vr.dm" @@ -3586,6 +3609,7 @@ #include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm" #include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm" #include "code\modules\mob\living\silicon\robot\drone\_defines.dm" +#include "code\modules\mob\living\silicon\robot\drone\damage_procs.dm" #include "code\modules\mob\living\silicon\robot\drone\drone.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_console.dm" @@ -4694,13 +4718,15 @@ #include "code\modules\tgchat\message.dm" #include "code\modules\tgchat\to_chat.dm" #include "code\modules\tgs\includes.dm" -#include "code\modules\tgui\external.dm" -#include "code\modules\tgui\modal_vr_legacy.dm" +#include "code\modules\tgui\client.dm" +#include "code\modules\tgui\datum.dm" +#include "code\modules\tgui\mob.dm" #include "code\modules\tgui\module.dm" #include "code\modules\tgui\states.dm" #include "code\modules\tgui\status_composers.dm" #include "code\modules\tgui\tgui.dm" #include "code\modules\tgui\tgui_window.dm" +#include "code\modules\tgui\legacy\modal_vr_legacy.dm" #include "code\modules\tgui\modals\tgui_alert.dm" #include "code\modules\tgui\modals\tgui_dynamic_input.dm" #include "code\modules\tgui\modals\tgui_input_list.dm" @@ -4914,6 +4940,7 @@ #include "interface\skin.dmf" #include "interface\menus\_menus.dm" #include "interface\menus\main.dm" +#include "maps\euthenia\euthenia.dm" #include "maps\generic\death_triggers.dm" #include "maps\generic\map_data.dm" #include "maps\generic\misc.dm" diff --git a/code/__DEFINES/_flags/atom_flags.dm b/code/__DEFINES/_flags/atom_flags.dm index 5f9ef421b7..5beef64962 100644 --- a/code/__DEFINES/_flags/atom_flags.dm +++ b/code/__DEFINES/_flags/atom_flags.dm @@ -29,21 +29,6 @@ /// Does not leave user's fingerprints/fibers when used on things? #define NOPRINT (1<<12) // TODO: item flag -///CITMAIN FLAG BITMASKS - Completely unused. -/* -/// Early returns mob.face_atom() -#define BLOCK_FACE_ATOM (1<<16) -/// Prevents mobs from getting chainshocked by teslas and the supermatter. -#define SHOCKED (1<<17) -/// Projectiles will use default chance-based ricochet handling on things with this. -#define DEFAULT_RICOCHET (1<<18) -/// For machines and structures that should not break into parts, eg, holodeck stuff. -#define NODECONSTRUCT (1<<19) -/// Prevent clicking things below it on the same turf eg. doors/ fulltile windows. -#define PREVENT_CLICK_UNDER (1<<20) -/// should not get harmed if this gets caught by an explosion? -#define PREVENT_CONTENTS_EXPLOSION (1<<22) -*/ /// We are ticking in materials #define ATOM_MATERIALS_TICKING (1<<22) /// Use initial icon/icon state for HTML renders in things like VV diff --git a/code/__DEFINES/ability.dm b/code/__DEFINES/ability.dm index dc6fd5c3b2..b009141129 100644 --- a/code/__DEFINES/ability.dm +++ b/code/__DEFINES/ability.dm @@ -7,6 +7,12 @@ /// toggle interact, hot-bindable #define ABILITY_INTERACT_TOGGLE "toggle" +//? targeting_type - exclusively used for targeted abilities + +#define ABILITY_TARGET_ALL "all" +#define ABILITY_TARGET_MOB "mob" +#define ABILITY_TARGET_TURF "turf" + //? ability_check_flags - if you add new ones, make sure to modify available_check() and unavailable_reason(). #define ABILITY_CHECK_CONSCIOUS (1<<0) diff --git a/code/__DEFINES/atmospherics/atmos.dm b/code/__DEFINES/atmospherics/atmos.dm index 66ec751321..74bcf83f22 100644 --- a/code/__DEFINES/atmospherics/atmos.dm +++ b/code/__DEFINES/atmospherics/atmos.dm @@ -1,6 +1,4 @@ // Math constants. -/// kPa*L/(K*mol). -#define R_IDEAL_GAS_EQUATION 8.31 /// kPa. #define ONE_ATMOSPHERE 101.325 /// (mol^3 * s^3) / (kg^3 * L). @@ -13,10 +11,6 @@ #define TCMB 2.7 //! -270.3 degrees celcius // Radiation constants. -/// W/(m^2*K^4). -#define STEFAN_BOLTZMANN_CONSTANT 5.6704e-8 -/// K. -#define COSMIC_RADIATION_TEMPERATURE 3.15 /// W/m^2. Kind of arbitrary. Really this should depend on the sun position much like solars. #define AVERAGE_SOLAR_RADIATION 200 /// kPa at 20 C. This should be higher as gases aren't great conductors until they are dense. Used the critical pressure for air. @@ -27,8 +21,6 @@ #define RADIATOR_EXPOSED_SURFACE_AREA_RATIO 0.04 ///m^2, surface area of 1.7m (H) x 0.46m (D) cylinder #define HUMAN_EXPOSED_SURFACE_AREA 5.2 -/// Moles in a 2.5 m^3 cell at 101.325 kPa and 20 C. -#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) /// Percentage. #define O2STANDARD 0.21 #define N2STANDARD 0.79 @@ -36,9 +28,9 @@ /// Moles in a standard cell after which phoron is visible. #define MOLES_PHORON_VISIBLE 0.7 /// O2 standard value (21%) -#define MOLES_O2STANDARD (MOLES_CELLSTANDARD * O2STANDARD) +#define MOLES_O2STANDARD (CELL_MOLES * O2STANDARD) /// N2 standard value (79%) -#define MOLES_N2STANDARD (MOLES_CELLSTANDARD * N2STANDARD) +#define MOLES_N2STANDARD (CELL_MOLES * N2STANDARD) #define MOLES_O2ATMOS (MOLES_O2STANDARD*50) #define MOLES_N2ATMOS (MOLES_N2STANDARD*50) @@ -52,7 +44,7 @@ #define BREATH_MOLES (ONE_ATMOSPHERE * BREATH_VOLUME / (T20C * R_IDEAL_GAS_EQUATION)) /// Amount of air needed before pass out/suffocation commences. #define BREATH_PERCENTAGE (BREATH_VOLUME / CELL_VOLUME) -#define HUMAN_NEEDED_OXYGEN (MOLES_CELLSTANDARD * BREATH_PERCENTAGE * 0.16) +#define HUMAN_NEEDED_OXYGEN (CELL_MOLES * BREATH_PERCENTAGE * 0.16) ///J/K For 80kg person #define HUMAN_HEAT_CAPACITY 280000 /// The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE. diff --git a/code/__DEFINES/atmospherics/constants.dm b/code/__DEFINES/atmospherics/constants.dm index f2b2a2c7a5..d5c7580239 100644 --- a/code/__DEFINES/atmospherics/constants.dm +++ b/code/__DEFINES/atmospherics/constants.dm @@ -1,3 +1,15 @@ +//* Physics Constants *// + +/// in Kelvin, temperature of cosmic microwave background radiation (used for radiative space cooling) +#define COSMIC_RADIATION_TEMPERATURE 3.15 +/// kPa*L/(K*mol). +#define R_IDEAL_GAS_EQUATION 8.31 +/// W/(m^2*K^4). +#define STEFAN_BOLTZMANN_CONSTANT 5.6704e-8 + + /// Volume, in liters, of a single tile. Y'KNOW WHY THIS IS A CONSTANT? WELL FOR ONE, initial_gas_mix IS MOLES, NOT PERCENTAGES OR PRESSURES. IF YOU TOUCH THIS, YOU BREAK *EVERYTHING*. DON'T TOUCH THIS. /// Exceptions can be made if you're a big boy who knows how this clusterfuck of a ZAS/LINDA hybrid works and have good reason to touch this. -#define CELL_VOLUME 2500 +#define CELL_VOLUME 2500 +/// Moles in a 2.5 m^3 cell at 101.325 kPa and 20 C. +#define CELL_MOLES (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) diff --git a/code/__DEFINES/atmospherics/environmental.dm b/code/__DEFINES/atmospherics/environmental.dm index 6fb0388893..b3ffdde739 100644 --- a/code/__DEFINES/atmospherics/environmental.dm +++ b/code/__DEFINES/atmospherics/environmental.dm @@ -1,4 +1,5 @@ -// CANATMOSPASS +//* CanAtmosPass, CanAtmosPassVertical *// + // make sure it's in this order so we cann use min() //! these are actual return values, using them in CanAtmosPass results in it always be returned. /// lets everything through @@ -18,7 +19,6 @@ #define CANATMOSPASS(A, O, D) (A.CanAtmosPass > -1? A.CanAtmosPass : (A.CanAtmosPass == ATMOS_PASS_PROC? A.CanAtmosPass(O, D) : (A.density? ATMOS_PASS_AIR_BLOCKED : ATMOS_PASS_NOT_BLOCKED))) #define CANVERTICALATMOSPASS(A, O, D) (A.CanAtmosPassVertical == ATMOS_PASS_VERTICAL_DEFAULT? CANATMOSPASS(A, O, D) : (A.CanAtmosPassVertical > -1? A.CanAtmosPassVertical : (A.CanAtmosPassVertical == ATMOS_PASS_PROC? A.CanAtmosPass(O, D) : (A.density? ATMOS_PASS_AIR_BLOCKED : ATMOS_PASS_NOT_BLOCKED)))) - /** * LEGACY BELOW */ diff --git a/code/__DEFINES/color/lights.dm b/code/__DEFINES/color/lights.dm index 66f715b6b3..781628408b 100644 --- a/code/__DEFINES/color/lights.dm +++ b/code/__DEFINES/color/lights.dm @@ -1,4 +1,6 @@ -//Some defines to generalise colours used in lighting. +//* Some defines to generalise colours used in lighting. +//* This file also contains powers/ranges, because power really does matter for lighting. + //! ## GENERAL COLORS //? Important note on colors. Colors can end up significantly different from the basic html picture, especially when saturated! #define LIGHT_COLOR_WHITE "#FFFFFF" // rgb(255, 255, 255) Pure white. @@ -34,4 +36,13 @@ #define LIGHT_COLOR_INCANDESCENT_TUBE "#E0EFF0" // rgb(224, 239, 240) Slightly blueish white. #define LIGHT_COLOR_INCANDESCENT_BULB "#FFFEB8" // rgb(255, 254, 184) Slightly yellowish white. #define LIGHT_COLOR_INCANDESCENT_FLASHLIGHT "#FFCC66" // rgb(255, 204, 102) Slightly yellowish white. -#define LIGHT_COLOR_NIGHTSHIFT "#616191" // rgb(97, 97, 145) Dark blue. + +/// Nightshift Light Color +/// Used on full-strength light tubes. +#define LIGHT_COLOR_NIGHTSHIFT "#c7c7ff" +/// Nightshift Light Power +/// Used on full-strength light tubes. +#define LIGHT_POWER_NIGHTSHIFT 0.435 +/// Nightshift Light Range +/// Used on full-strength light tubes. +#define LIGHT_RANGE_NIGHTSHIFT 7 diff --git a/code/__DEFINES/combat/damage.dm b/code/__DEFINES/combat/damage.dm index 335ea3ae37..32d831fed8 100644 --- a/code/__DEFINES/combat/damage.dm +++ b/code/__DEFINES/combat/damage.dm @@ -12,3 +12,7 @@ #define DAMAGE_MODE_ABLATING (1<<2) //! pulse lasers, etc, basically blows a crater #define DAMAGE_MODE_PIERCE (1<<3) //! specifically highly-piercing weapons like bullets, even worse than sharp. #define DAMAGE_MODE_SHRED (1<<4) //! messy, shredded wounds instead of a clean cut / pierce. strong. +#define DAMAGE_MODE_GRADUAL (1<<5) //! disallow bone breaks, ablation, etc; used for gradual sources like depressurization +#define DAMAGE_MODE_INTERNAL (1<<6) //! coming from internal; used to flag that something isn't coming through the skin. certain defenses don't work if this is set. +#define DAMAGE_MODE_REDIRECT (1<<7) //! if zone doesn't exist / etc, allow redirection +#define DAMAGE_MODE_NO_OVERFLOW (1<<8)//! temporary - re-evaluate when health is reworked. prevents damage from overflowing caps. diff --git a/code/__DEFINES/dcs/signals/signals_datum.dm b/code/__DEFINES/dcs/signals/signals_datum.dm index f4462c1315..119acfbbb1 100644 --- a/code/__DEFINES/dcs/signals/signals_datum.dm +++ b/code/__DEFINES/dcs/signals/signals_datum.dm @@ -18,10 +18,10 @@ /// Handler for vv_do_topic (usr, href_list) ////#define COMSIG_VV_TOPIC "vv_topic" ////#define COMPONENT_VV_HANDLED (1<<0) -/// From datum ui_act (usr, action, list/params, datum/tgui/ui) -#define COMSIG_UI_ACT "ui_act" -/// From datum ui_module_act (usr, module_id, action, list/params, datum/tgui/ui) -#define COMSIG_UI_MODULE_ACT "ui_module_act" +/// From datum ui_act (usr, action, list/params, datum/tgui/ui, datum/tgui_module_context/module_context) +#define COMSIG_DATUM_UI_ACT "ui_act" +/// From datum push_ui_data: (mob/user, datum/tgui/ui, list/data) +#define COMSIG_DATUM_PUSH_UI_DATA "push_ui_data" /// Fires on the target datum when an element is attached to it (/datum/element) ////#define COMSIG_ELEMENT_ATTACH "element_attach" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm index 894562605d..3dc6401c22 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -79,7 +79,7 @@ /// From base of /mob/update_sight(): () #define COMSIG_MOB_UPDATE_SIGHT "mob_update_sight" //// From /mob/living/say(): () -////#define COMSIG_MOB_SAY "mob_say" +#define COMSIG_MOB_SAY "mob_say" ////#define COMPONENT_UPPERCASE_SPEECH (1<<0) //? used to access COMSIG_MOB_SAY argslist ////#define SPEECH_MESSAGE 1 diff --git a/code/__DEFINES/dcs/signals/signals_painting.dm b/code/__DEFINES/dcs/signals/signals_painting.dm index 8a1340e786..6261670366 100644 --- a/code/__DEFINES/dcs/signals/signals_painting.dm +++ b/code/__DEFINES/dcs/signals/signals_painting.dm @@ -8,5 +8,5 @@ /// From base of /item/proc/set_painting_tool_color(): (chosen_color) ////#define COMSIG_PAINTING_TOOL_SET_COLOR "painting_tool_set_color" -/// From base of /item/canvas/ui_data(): (data) +/// From base of /item/canvas/ui_data(mob/user, datum/tgui/ui) ////#define COMSIG_PAINTING_TOOL_GET_ADDITIONAL_DATA "painting_tool_get_data" diff --git a/code/__DEFINES/inventory/carry_weight.dm b/code/__DEFINES/inventory/carry_weight.dm index 92814959f4..128bda3b57 100644 --- a/code/__DEFINES/inventory/carry_weight.dm +++ b/code/__DEFINES/inventory/carry_weight.dm @@ -27,7 +27,7 @@ //? Carry factor - multiplier for penalizing over-limit weight; higher is worse. -#define CARRY_FACTOR_BASELINE 1 +#define CARRY_FACTOR_BASELINE 0.97 #define CARRY_FACTOR_MOD_HUMAN 0.92 #define CARRY_FACTOR_MOD_UNATHI 0.92 @@ -38,8 +38,8 @@ #define CARRY_FACTOR_MOD_PROTEAN 1.12 #define CARRY_FACTOR_MOD_XENOCHIMERA 0.88 #define CARRY_FACTOR_MOD_XENOHYBRID 0.88 -#define CARRY_FACTOR_MOD_ALRAUNE 0.25 -#define CARRY_FACTOR_MOD_DIONA 0.1 +#define CARRY_FACTOR_MOD_ALRAUNE 0.25 //! finally, a real reason to be an alraune +#define CARRY_FACTOR_MOD_DIONA 0.1 //! i am groot //? Carry equation constants @@ -120,26 +120,26 @@ //* Spacesuits -#define ITEM_ENCUMBRANCE_SOFTSUIT 30 +#define ITEM_ENCUMBRANCE_SOFTSUIT 22.5 #define ITEM_ENCUMBRANCE_SOFTSUIT_HELMET 2.5 -#define ITEM_ENCUMBRANCE_VOIDSUIT 30 +#define ITEM_ENCUMBRANCE_VOIDSUIT 25 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET 0 -#define ITEM_ENCUMBRANCE_VOIDSUIT_LIGHT 25 +#define ITEM_ENCUMBRANCE_VOIDSUIT_LIGHT 20 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET_LIGHT 0 -#define ITEM_ENCUMBRANCE_VOIDSUIT_HEAVY 35 +#define ITEM_ENCUMBRANCE_VOIDSUIT_HEAVY 30 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET_HEAVY 0 #define ITEM_ENCUMBRANCE_VOIDSUIT_ULTRALIGHT 20 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET_ULTRALIGHT 0 -#define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY 30 +#define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY 22.5 #define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY_HELMET 2.5 -#define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 17.5 +#define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 20 #define ITEM_ENCUMBRANCE_LEGACY_RIG 25 -#define ITEM_ENCUMBRANCE_LEGACY_RIG_HEAVY 35 +#define ITEM_ENCUMBRANCE_LEGACY_RIG_HEAVY 30 -#define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT 30 +#define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT 25 #define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT_HELMET 0 //* Storage @@ -156,18 +156,18 @@ //* Weapons -#define ITEM_ENCUMBRANCE_GUN_LIGHT 2.5 -#define ITEM_ENCUMBRANCE_GUN_NORMAL 5 -#define ITEM_ENCUMBRANCE_GUN_LARGE 7.5 -#define ITEM_ENCUMBRANCE_GUN_BULKY 12.5 -#define ITEM_ENCUMBRANCE_GUN_UNREASONABLE 17.5 +#define ITEM_ENCUMBRANCE_GUN_LIGHT 1.25 +#define ITEM_ENCUMBRANCE_GUN_NORMAL 2.5 +#define ITEM_ENCUMBRANCE_GUN_LARGE 5 +#define ITEM_ENCUMBRANCE_GUN_BULKY 8 +#define ITEM_ENCUMBRANCE_GUN_UNREASONABLE 15 #define ITEM_ENCUMBRANCE_GUN_RIDICULOUS 30 #define ITEM_ENCUMBRANCE_GUN_VEHICLE 60 -#define ITEM_ENCUMBRANCE_MELEE_SPEAR 15 -#define ITEM_ENCUMBRANCE_MELEE_SLEDGEHAMMER 20 +#define ITEM_ENCUMBRANCE_MELEE_SPEAR 7.5 +#define ITEM_ENCUMBRANCE_MELEE_SLEDGEHAMMER 12.5 -#define ITEM_ENCUMBRANCE_SHIELD_TOWER 30 +#define ITEM_ENCUMBRANCE_SHIELD_TOWER 12.5 //? Item Flat Encumbrance defines diff --git a/code/__DEFINES/items_clothing.dm b/code/__DEFINES/items_clothing.dm index 6c463461f0..28cac6d347 100644 --- a/code/__DEFINES/items_clothing.dm +++ b/code/__DEFINES/items_clothing.dm @@ -1,6 +1,4 @@ - -/// For how bright candles are. -#define CANDLE_LUM 3 +// todo: this all should go somewhere else. // Bitflags for the percentual amount of protection a piece of clothing which covers the body part offers. // Used with human/proc/get_heat_protection() and human/proc/get_cold_protection(). @@ -17,6 +15,8 @@ #define THERMAL_PROTECTION_HAND_LEFT 0.025 #define THERMAL_PROTECTION_HAND_RIGHT 0.025 +/// when being temperature-modified by environment, + // Pressure limits. /// This determines at what pressure the ultra-high pressure red icon is displayed. (This one is set as a constant) #define HAZARD_HIGH_PRESSURE 550 @@ -30,7 +30,7 @@ #define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 /// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive. #define BODYTEMP_AUTORECOVERY_DIVISOR 12 -/// Minimum amount of kelvin moved toward 310.15K per tick. So long as abs(310.15 - bodytemp) is more than 50. +/// Minimum amount of kelvin moved toward 310.15K per tick, when bodytemp is dangerously far from livable. #define BODYTEMP_AUTORECOVERY_MINIMUM 1 /// Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster. #define BODYTEMP_COLD_DIVISOR 6 @@ -40,10 +40,12 @@ #define BODYTEMP_COOLING_MAX -30 /// The maximum number of degrees that your body can heat up in 1 tick, when in a hot area. #define BODYTEMP_HEATING_MAX 30 + /// The limit the human body can take before it starts taking damage from heat. -#define BODYTEMP_HEAT_DAMAGE_LIMIT 360.15 +#define LEGACY_BODYTEMP_HEAT_DAMAGE_THRESHOLD 360.15 /// The limit the human body can take before it starts taking damage from coldness. -#define BODYTEMP_COLD_DAMAGE_LIMIT 260.15 +#define LEGACY_BODYTEMP_COLD_DAMAGE_THRESHOLD 260.15 + /// What min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0. #define SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE 2.0 /// What min_cold_protection_temperature is set to for space-suit quality jumpsuits or suits. MUST NOT BE 0. diff --git a/code/__DEFINES/machines/airlock_states.dm b/code/__DEFINES/machines/airlock_states.dm new file mode 100644 index 0000000000..803e45f88b --- /dev/null +++ b/code/__DEFINES/machines/airlock_states.dm @@ -0,0 +1,10 @@ +#define STATE_UNDEFINED -1 //Manual overrides +#define STATE_CLOSED 0 //Both doors closed +#define STATE_OPEN_IN 1 //Interior doors open, exterior closed +#define STATE_OPEN_OUT 2 //Exterior doors open, interior closed +#define STATE_BYPASS 3 + +#define STATE_CYCLING_IN 4 //Matching indoors pressure and composition +#define STATE_CYCLING_OUT 5 //Matching outdoors pressure +#define STATE_SEALING 6 //Closing both doors +#define STATE_BYPASSING 7 //Unlocking both doors diff --git a/code/__DEFINES/misc/nightshift.dm b/code/__DEFINES/misc/nightshift.dm new file mode 100644 index 0000000000..339b7008ed --- /dev/null +++ b/code/__DEFINES/misc/nightshift.dm @@ -0,0 +1,32 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* nightshift flags + +#define NIGHTSHIFT_LEVEL_UNSET (1<<0) + +#define NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS (1<<1) +#define NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES (1<<2) + +#define NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS (1<<3) +#define NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES (1<<4) +#define NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE (1<<5) +#define NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE (1<<6) + +#define NIGHTSHIFT_LEVEL_COMMAND_HALLWAYS (1<<7) +#define NIGHTSHIFT_LEVEL_COMMAND_FACILITIES (1<<8) +#define NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE (1<<9) + +//* Do not randomly change this, it is used for configuration. *// +DEFINE_BITFIELD(nightshift_level, list( + BITFIELD_NAMED("Unset", NIGHTSHIFT_LEVEL_UNSET), + BITFIELD_NAMED("PublicHalls", NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS), + BITFIELD_NAMED("PublicAreas", NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES), + BITFIELD_NAMED("DepartmentHalls", NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS), + BITFIELD_NAMED("DepartmentAreas", NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES), + BITFIELD_NAMED("DepartmentSecure", NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE), + BITFIELD_NAMED("DepartmentLeisure", NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE), + BITFIELD_NAMED("CommandHalls", NIGHTSHIFT_LEVEL_COMMAND_HALLWAYS), + BITFIELD_NAMED("CommandAreas", NIGHTSHIFT_LEVEL_COMMAND_FACILITIES), + BITFIELD_NAMED("CommandSecure", NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE), +)) diff --git a/code/__DEFINES/mobs/biology.dm b/code/__DEFINES/mobs/biology.dm new file mode 100644 index 0000000000..8762562388 --- /dev/null +++ b/code/__DEFINES/mobs/biology.dm @@ -0,0 +1,22 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* biology flags + +/// humanlike, organic, normal biology +#define BIOLOGY_TYPE_HUMAN (1<<0) +/// fully machinelike +#define BIOLOGY_TYPE_SYNTH (1<<1) +/// promethean / slime +#define BIOLOGY_TYPE_SLIME (1<<2) +/// chimeric +#define BIOLOGY_TYPE_CHIMERA (1<<3) +/// protean +#define BIOLOGY_TYPE_NANITES (1<<4) +/// plant +#define BIOLOGY_TYPE_PLANT (1<<5) + +#define BIOLOGY_TYPES_FLESHY (BIOLOGY_TYPE_HUMAN | BIOLOGY_TYPE_CHIMERA | BIOLOGY_TYPE_PLANT | BIOLOGY_TYPE_SLIME) +#define BIOLOGY_TYPES_ALL (ALL) + +// todo: define bitfield (when do i rework define bitfield) diff --git a/code/__DEFINES/mobs/health.dm b/code/__DEFINES/mobs/life.dm similarity index 60% rename from code/__DEFINES/mobs/health.dm rename to code/__DEFINES/mobs/life.dm index ab1c1e7186..2ba9d0ae43 100644 --- a/code/__DEFINES/mobs/health.dm +++ b/code/__DEFINES/mobs/life.dm @@ -1,4 +1,7 @@ -//* Medical system defines go in here +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* This file is called 'life', but realistically is the resting place of all things metabolism, health, and related. *// //? Health - Core /** Round damage values to this value @@ -9,6 +12,19 @@ #define ARMOR_PRECISION 0.001 #define ARMOR_TIER_PRECISION 0.01 +//* Health - Environmental Interactions *// + +/// % of temperature recovered when going towards favorable +#define MOB_BODYTEMP_EQUALIZATION_FAVORABLE_RATIO (1 / 6) +/// % of temperature gained/lost when going away from favorable +#define MOB_BODYTEMP_EQUALIZATION_UNFAVORABLE_RATIO (1 / 6) +/// minimum stabilization when far from 'livable' tempreatures, but environment is closer to livable temperature +#define MOB_BODYTEMP_EQUALIZATION_MIN_FAVORABLE 10 +/// minimum temperature change when environment is further from livable temperature / is going ot harm us from its temperature +#define MOB_BODYTEMP_EQUALIZATION_MIN_UNFAVORABLE 1 +/// maximum temperature change when environment is further from livable temperature / is going to harm us from its temperature +#define MOB_BODYTEMP_EQUALIZATION_MAX_UNFAVORABLE 50 + //? CPR /// how long CPR suppresses brain decay #define CPR_BRAIN_STASIS_TIME (15 SECONDS) diff --git a/code/__DEFINES/mobs/mobs.dm b/code/__DEFINES/mobs/mobs.dm index 94e5a35c44..506bbc3637 100644 --- a/code/__DEFINES/mobs/mobs.dm +++ b/code/__DEFINES/mobs/mobs.dm @@ -1,4 +1,6 @@ +// todo: if i haven't bad touched something in here, i probably need to & will ~silicons + // These are used as the layers for the icons, as well as indexes in a list that holds onto them. // Technically the layers used are all -100+layer to make them FLOAT_LAYER overlays. //! Human Overlays Indexes///////// @@ -75,6 +77,7 @@ ////////////////////////////////// // Bitflags defining which status effects could be or are inflicted on a mob. +// todo: this is all terrible tbh #define STATUS_CAN_STUN (1<<0) //! Can Stun() #define STATUS_CAN_KNOCKDOWN (1<<1) //! Can Knockdown() #define STATUS_CAN_ROOT (1<<2) //! Can Root() @@ -84,6 +87,7 @@ #define STATUS_LEAPING (1<<20) //! Is leaping (??? legacy) #define STATUS_HIDING (1<<21) //! Is hiding (??? legacy) +// todo: this should be a trait with a mob_flags flag to go with it for quick access #define STATUS_GODMODE (1<<22) //! Godmode (??? legacy) #define STATUS_FAKEDEATH (1<<23) //! In fakedeath - SLATED FOR REMOVAL, THIS SHOULD BE TRAIT diff --git a/code/__DEFINES/mobs/organs.dm b/code/__DEFINES/mobs/organs.dm index 20c2be19fe..259494f92f 100644 --- a/code/__DEFINES/mobs/organs.dm +++ b/code/__DEFINES/mobs/organs.dm @@ -157,6 +157,8 @@ BP_R_LEG, \ BP_TORSO) +GLOBAL_LIST_INIT(body_zones, BP_ALL_STANDARD) + //* ADHERENT EXTERNAL ORGANS *// #define O_COOLING_FINS "cooling fins" diff --git a/code/__DEFINES/mobs/silicon_privileges.dm b/code/__DEFINES/mobs/silicon_privileges.dm index 94ea5157a3..62f69f210c 100644 --- a/code/__DEFINES/mobs/silicon_privileges.dm +++ b/code/__DEFINES/mobs/silicon_privileges.dm @@ -1,4 +1,5 @@ //silicon_privileges flags on /mob +// todo: rework #define PRIVILEGES_SILICON (1<<0) #define PRIVILEGES_PAI (1<<1) #define PRIVILEGES_BOT (1<<2) diff --git a/code/__DEFINES/objects/type_generation.dm b/code/__DEFINES/objects/type_generation.dm new file mode 100644 index 0000000000..9a42c379ff --- /dev/null +++ b/code/__DEFINES/objects/type_generation.dm @@ -0,0 +1,84 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +#define CREATE_WALL_MOUNTING_TYPES(TYPE) \ +##TYPE/north_mount{ \ + dir = SOUTH; \ +} \ +##TYPE/south_mount{ \ + dir = NORTH; \ +} \ +##TYPE/east_mount{ \ + dir = WEST; \ +} \ +##TYPE/west_mount{ \ + dir = EAST; \ +} \ +##TYPE/auto_mount/Initialize(){ \ + auto_orient_wallmount_single_preinit(); \ + return ..(); \ +} + +#define CREATE_WALL_MOUNTING_TYPES_AUTOSPRITE(TYPE, AUTOSPRITE) \ +##TYPE/north_mount{ \ + dir = SOUTH; \ +} \ +##TYPE/south_mount{ \ + dir = NORTH; \ +} \ +##TYPE/east_mount{ \ + dir = WEST; \ +} \ +##TYPE/west_mount{ \ + dir = EAST; \ +} \ +##TYPE/auto_mount { icon_state = AUTOSPRITE } \ +##TYPE/auto_mount/Initialize(){ \ + auto_orient_wallmount_single_preinit(); \ + return ..(); \ +} + +#define CREATE_WALL_MOUNTING_TYPES_SHIFTED(TYPE, SHIFT) \ +##TYPE/north_mount{ \ + dir = SOUTH; \ + pixel_y = SHIFT; \ +} \ +##TYPE/south_mount{ \ + dir = NORTH; \ + pixel_y = -SHIFT; \ +} \ +##TYPE/east_mount{ \ + dir = WEST; \ + pixel_x = SHIFT; \ +} \ +##TYPE/west_mount{ \ + dir = EAST; \ + pixel_x = -SHIFT; \ +} \ +##TYPE/auto_mount/Initialize(){ \ + auto_orient_wallmount_single_preinit(); \ + return ..(); \ +} + +#define CREATE_WALL_MOUNTING_TYPES_SHIFTED_AUTOSPRITE(TYPE, SHIFT, AUTOSPRITE) \ +##TYPE/north_mount{ \ + dir = SOUTH; \ + pixel_y = SHIFT; \ +} \ +##TYPE/south_mount{ \ + dir = NORTH; \ + pixel_y = -SHIFT; \ +} \ +##TYPE/east_mount{ \ + dir = WEST; \ + pixel_x = SHIFT; \ +} \ +##TYPE/west_mount{ \ + dir = EAST; \ + pixel_x = -SHIFT; \ +} \ +##TYPE/auto_mount { icon_state = AUTOSPRITE } \ +##TYPE/auto_mount/Initialize(){ \ + auto_orient_wallmount_single_preinit(); \ + return ..(); \ +} diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index b0e97e05e9..fdfec5e8ca 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.7.0" +#define TGS_DMAPI_VERSION "7.0.2" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -73,12 +73,12 @@ #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3 /// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path. #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4 -/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND. -#define TGS_EVENT_BYOND_INSTALL_START 5 -/// When a BYOND install operation fails. Parameters: Error message -#define TGS_EVENT_BYOND_INSTALL_FAIL 6 -/// When the active BYOND version changes. Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND. -#define TGS_EVENT_BYOND_ACTIVE_VERSION_CHANGE 7 +/// Before a engine install operation begins. Parameters: Version string of the installing engine. +#define TGS_EVENT_ENGINE_INSTALL_START 5 +/// When a engine install operation fails. Parameters: Error message +#define TGS_EVENT_ENGINE_INSTALL_FAIL 6 +/// When the active engine version changes. Parameters: (Nullable) Version string of the current engine, version string of the new engine. +#define TGS_EVENT_ENGINE_ACTIVE_VERSION_CHANGE 7 /// When the compiler starts running. Parameters: Game directory path, origin commit SHA. #define TGS_EVENT_COMPILE_START 8 /// When a compile is cancelled. No parameters. @@ -108,7 +108,7 @@ // #define TGS_EVENT_DREAM_DAEMON_LAUNCH 22 /// After a single submodule update is performed. Parameters: Updated submodule name. #define TGS_EVENT_REPO_SUBMODULE_UPDATE 23 -/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, byond version. +/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, version string of the used engine. #define TGS_EVENT_PRE_DREAM_MAKER 24 /// Whenever a deployment folder is deleted from disk. Parameters: Game directory path. #define TGS_EVENT_DEPLOYMENT_CLEANUP 25 @@ -122,6 +122,7 @@ /// The watchdog will restart on reboot. #define TGS_REBOOT_MODE_RESTART 2 +// Note that security levels are currently meaningless in OpenDream /// DreamDaemon Trusted security level. #define TGS_SECURITY_TRUSTED 0 /// DreamDaemon Safe security level. @@ -136,6 +137,11 @@ /// DreamDaemon invisible visibility level. #define TGS_VISIBILITY_INVISIBLE 2 +/// The Build Your Own Net Dream engine. +#define TGS_ENGINE_TYPE_BYOND 0 +/// The OpenDream engine. +#define TGS_ENGINE_TYPE_OPENDREAM 1 + //REQUIRED HOOKS /** @@ -420,6 +426,7 @@ /** * Send a message to connected chats. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies. @@ -429,6 +436,7 @@ /** * Send a private message to a specific user. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * user: The [/datum/tgs_chat_user] to PM. @@ -438,6 +446,7 @@ /** * Send a message to connected chats that are flagged as game-related in TGS. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to. @@ -449,6 +458,10 @@ /world/proc/TgsVersion() return +/// Returns the running engine type +/world/proc/TgsEngine() + return + /// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsApiVersion() return diff --git a/code/__DEFINES/turfs/type_generation.dm b/code/__DEFINES/turfs/type_generation.dm index d8fb0c98e7..0afaab7890 100644 --- a/code/__DEFINES/turfs/type_generation.dm +++ b/code/__DEFINES/turfs/type_generation.dm @@ -1,3 +1,6 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + /// create the standard 4 types of turfs for a given turf type. #define CREATE_STANDARD_TURFS(type) \ ##type/indoors { \ diff --git a/code/__DEFINES/vv.dm b/code/__DEFINES/vv.dm index 74f97ebc4b..0c812d4b04 100644 --- a/code/__DEFINES/vv.dm +++ b/code/__DEFINES/vv.dm @@ -97,7 +97,9 @@ #define VV_HK_EDIT_ARMOR "edit_armor" // /mob +/// used on /mob as well as /obj/item/organ #define VV_HK_ADD_PHYSIOLOGY_MODIFIER "add_physiology_mod" +/// used on /mob as well as /obj/item/organ #define VV_HK_REMOVE_PHYSIOLOGY_MODIFIER "remove_physiology_mod" /* diff --git a/code/__HELPERS/datastructs/priority_queue.dm b/code/__HELPERS/datastructs/priority_queue.dm index 7c43fe02cb..a77f218a04 100644 --- a/code/__HELPERS/datastructs/priority_queue.dm +++ b/code/__HELPERS/datastructs/priority_queue.dm @@ -1,66 +1,89 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + /** - * array-backed priority heap + * An array-backed priority queue. * - * not written in house, cloned from oldish polaris/bay (?) + * The "front" of the queue is popped first; check comparators.dm for what this means. */ /datum/priority_queue - var/list/queue - var/comparison_function + /// comparaison function + var/procpath/comparison + /// internal array + var/list/array = list() -/datum/priority_queue/New(compare) - queue = list() - comparison_function = compare +/datum/priority_queue/New(cmp) + src.comparison = cmp + array = list() /datum/priority_queue/proc/is_empty() - return !queue.len - -/datum/priority_queue/proc/enqueue(data) - queue.Add(data) - var/index = queue.len + return length(array) == 0 - //From what I can tell, this automagically sorts the added data into the correct location. - while(index > 2 && call(comparison_function)(queue[index / 2], queue[index]) > 0) - queue.Swap(index, index / 2) - index /= 2 +/datum/priority_queue/proc/enqueue(entry) + array += entry + bubble_up(length(array)) /datum/priority_queue/proc/dequeue() - if(!queue.len) - return 0 - return remove(1) + if(length(array) == 0) + return null + . = array[1] + array.Swap(1, length(array)) + --array.len + bubble_down(1) -/datum/priority_queue/proc/remove(index) - if(index > queue.len) - return 0 +/datum/priority_queue/proc/peek() + return length(array)? array[1] : null - var/thing = queue[index] - queue.Swap(index, queue.len) - --queue.len - if(index < queue.len) - fix_queue(index) - return thing - -/datum/priority_queue/proc/fix_queue(index) - var/child = 2 * index - var/item = queue[index] +// todo: define this +/datum/priority_queue/proc/bubble_up(index) + while(index >= 2 && call(comparison)(array[index], array[index / 2]) < 0) + array.Swap(index, index / 2) + index /= 2 - while(child <= queue.len) - if(child < queue.len && call(comparison_function)(queue[child], queue[child + 1]) > 0) - child++ - if(call(comparison_function)(item, queue[child]) > 0) - queue[index] = queue[child] - index = child +// todo: define this +/datum/priority_queue/proc/bubble_down(index) + var/length = length(array) + var/next = index * 2 + while(next <= length) + // left always exists, right doesn't necessarily exist + if(call(comparison)(array[next], array[index]) < 0) + if(next < length && call(comparison)(array[next], array[next + 1]) > 0) + array.Swap(index, next + 1) + index = next + 1 + else + array.Swap(index, next) + index = next + else if(next < length && call(comparison)(array[next + 1], array[index]) < 0) + array.Swap(index, next + 1) + index = next + 1 else break - child = 2 * index - queue[index] = item + next = index * 2 -/datum/priority_queue/proc/clone_list() - return queue.Copy() +/** + * returns copy of list of entries in no particular order + */ +/datum/priority_queue/proc/flattened() + return array.Copy() -/datum/priority_queue/proc/size() - return queue.len +/datum/priority_queue/proc/remove_index(index) + var/length = length(array) + if(!index || index > length) + return + if(index == length) + . = array[index] + --array.len + return + . = array[index] + array.Swap(index, length) + --array.len + bubble_down(index) + +/datum/priority_queue/proc/find(entry) + return array.Find(entry) -/datum/priority_queue/proc/remove_item(data) - var/index = queue.Find(data) - if(index) - return remove(index) +/datum/priority_queue/proc/remove_entry(entry) + return remove_index(array.Find(entry)) + +/datum/priority_queue/proc/size() + return length(array) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index cbdad2423f..9a9827e78c 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -601,13 +601,13 @@ var/global/list/remainless_species = list(SPECIES_ID_PROMETHEAN, var/cost = instance.cost traits_costs[path] = cost all_traits[path] = instance + if(!instance.custom_only && instance.cost <= 0) + everyone_traits[path] = instance switch(cost) if(-INFINITY to -0.1) negative_traits[path] = instance if(0) neutral_traits[path] = instance - if(!(instance.custom_only)) - everyone_traits[path] = instance if(0.1 to INFINITY) positive_traits[path] = instance diff --git a/code/__HELPERS/graphs/astar.dm b/code/__HELPERS/graphs/astar.dm index d851edea14..1a0079c465 100644 --- a/code/__HELPERS/graphs/astar.dm +++ b/code/__HELPERS/graphs/astar.dm @@ -114,7 +114,7 @@ var/datum/graph_astar_node/target = path_node_by_position[datum] if(target.best_estimated_cost) if(best_estimated_cost + call(datum, dist)(end) < target.best_estimated_cost) - open.remove_item(target) + open.remove_entry(target) else continue @@ -122,7 +122,7 @@ path_node_by_position[datum] = next_node open.enqueue(next_node) - if(max_nodes && length(open.queue) > max_nodes) - open.remove(length(open.queue)) + if(max_nodes && length(open.array) > max_nodes) + open.remove_index(length(open.array)) return path diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index e234e5b03e..8631670446 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -15,54 +15,42 @@ * * For turfs, what appears under the diagonal corners depends on the turf that was in the same position previously: if you make a wall on * a plating floor, you will see plating under the diagonal wall corner, if it was space, you will see space. + */ + + +/** + * Stole this from @DaedalusDock - @Zandario + * Checks if `thing` (an atom) can smooth with `turf`, based on the [/area/var/area_limited_icon_smoothing] variable of their areas. * - * If you wish to map a diagonal wall corner with a fixed underlay, you must configure the turf's 'fixed_underlay' list var, like so: - * fixed_underlay = list("icon"='icon_file.dmi', "icon_state"="iconstatename") - * A non null 'fixed_underlay' list var will skip copying the previous turf appearance and always use the list. If the list is - * not set properly, the underlay will default to regular floor plating. + * * If `thing` doesn't have an area (E.g. the edge of the z level), return `FALSE`. + * * If one area has `area_limited_icon_smoothing` set, and the other area's type doesn't match it, return `FALSE`. + * * Else, return `TRUE`. * - * To see an example of a diagonal wall, see '/turf/closed/wall/mineral/titanium' and its subtypes. + * Arguments: + * * thing - The source atom we're smoothing. + * * turf - The target turf we're trying to smooth with. + * * val - The variable to set to `TRUE` depending on if the two can smooth. + * + *? This is a macro because it is a very very hot proc. */ - -#define SET_ADJ_IN_DIR(source, junction, direction, direction_flag) \ - do { \ - var/turf/neighbor = get_step(source, direction); \ - if(!neighbor) { \ - if(source.smoothing_flags & SMOOTH_BORDER) { \ - junction |= direction_flag; \ - }; \ +#define CAN_AREAS_SMOOTH(thing, turf, val) \ + do{ \ + if(isnull(turf)) { \ + break; \ }; \ - else { \ - if(source.can_area_smooth(neighbor)) { \ - if(!isnull(neighbor.smoothing_groups)) { \ - for(var/target in source.canSmoothWith) { \ - if(!(source.canSmoothWith[target] & neighbor.smoothing_groups[target])) { \ - continue; \ - }; \ - junction |= direction_flag; \ - break; \ - }; \ - }; \ - if(!(junction & direction_flag) && source.smoothing_flags & SMOOTH_OBJ) { \ - for(var/obj/thing in neighbor) { \ - if(!thing.anchored || isnull(thing.smoothing_groups)) { \ - continue; \ - }; \ - for(var/target in source.canSmoothWith) { \ - if(!(source.canSmoothWith[target] & thing.smoothing_groups[target])) { \ - continue; \ - }; \ - junction |= direction_flag; \ - break; \ - }; \ - if(junction & direction_flag) { \ - break; \ - }; \ - }; \ - }; \ - }; \ + var/area/source_area = get_step(thing, 0)?.loc; \ + var/area/target_area = turf:loc; \ + if(isnull(target_area)) { \ + break; \ + };\ + if(target_area.area_limited_icon_smoothing && !istype(source_area, target_area.area_limited_icon_smoothing)) { \ + break; \ + }; \ + if(source_area.area_limited_icon_smoothing && !istype(target_area, source_area.area_limited_icon_smoothing)) { \ + break; \ }; \ - } while(FALSE) + val = TRUE; \ + }while(FALSE) /** * Performs the work to set smoothing_groups and canSmoothWith. @@ -95,28 +83,6 @@ var/list/unwrapped = UNWRAP_SMOOTHING_GROUPS(smoothing_group_variable, unwrapped); \ assert_sorted(unwrapped, "[#smoothing_group_variable] ([type])"); \ -/** - * Stole this from @DaedalusDock - @Zandario - * Checks if `src` can smooth with `target`, based on the [/area/var/area_limited_icon_smoothing] variable of their areas. - * - * * If `target` doesn't have an area (E.g. the edge of the z level), return `FALSE`. - * * If one area has `area_limited_icon_smoothing` set, and the other area's type doesn't match it, return `FALSE`. - * * Else, return `TRUE`. - * - * Arguments: - * * target - The atom we're trying to smooth with. - */ -/atom/proc/can_area_smooth(atom/target) - var/area/target_area = get_area(target) - var/area/source_area = get_area(src) - if(!target_area) - return FALSE - if(target_area.area_limited_icon_smoothing && !istype(source_area, target_area.area_limited_icon_smoothing)) - return FALSE - if(source_area.area_limited_icon_smoothing && !istype(target_area, source_area.area_limited_icon_smoothing)) - return FALSE - return TRUE - /** * Scans all adjacent turfs to find targets to smooth with. */ @@ -327,7 +293,9 @@ if(!target_turf) return NULLTURF_BORDER - if(!can_area_smooth(target_turf)) + var/can_area_smooth + CAN_AREAS_SMOOTH(src, target_turf, can_area_smooth) + if(isnull(can_area_smooth)) return NO_ADJ_FOUND if(isnull(canSmoothWith)) //special case in which it will only smooth with itself @@ -358,12 +326,55 @@ * Basic smoothing proc. The atom checks for adjacent directions to smooth with and changes the icon_state based on that. * * Returns the previous smoothing_junction state so the previous state can be compared with the new one after the proc ends, and see the changes, if any. + * */ /atom/proc/bitmask_smooth() var/new_junction = NONE + // cache for sanic speed + var/canSmoothWith = src.canSmoothWith + + var/smooth_border = (smoothing_flags & SMOOTH_BORDER) + var/smooth_obj = (smoothing_flags & SMOOTH_OBJ) + + #define SET_ADJ_IN_DIR(direction, direction_flag) \ + set_adj_in_dir: { \ + do { \ + var/turf/neighbor = get_step(src, direction); \ + var/can_area_smooth; \ + CAN_AREAS_SMOOTH(src, neighbor, can_area_smooth); \ + if(neighbor && can_area_smooth) { \ + var/neighbor_smoothing_groups = neighbor.smoothing_groups; \ + if(neighbor_smoothing_groups) { \ + for(var/target in canSmoothWith) { \ + if(canSmoothWith[target] & neighbor_smoothing_groups[target]) { \ + new_junction |= direction_flag; \ + break set_adj_in_dir; \ + }; \ + }; \ + }; \ + if(smooth_obj) { \ + for(var/atom/movable/thing as anything in neighbor) { \ + var/thing_smoothing_groups = thing.smoothing_groups; \ + if(!thing.anchored || isnull(thing_smoothing_groups)) { \ + continue; \ + }; \ + for(var/target in canSmoothWith) { \ + if(canSmoothWith[target] & thing_smoothing_groups[target]) { \ + new_junction |= direction_flag; \ + break set_adj_in_dir; \ + }; \ + }; \ + }; \ + }; \ + } else if (smooth_border) { \ + new_junction |= direction_flag; \ + }; \ + } while(FALSE) \ + } + for(var/direction in GLOB.cardinal) //Cardinal case first. - SET_ADJ_IN_DIR(src, new_junction, direction, direction) + SET_ADJ_IN_DIR(direction, direction) if(!(new_junction & (NORTH|SOUTH)) || !(new_junction & (EAST|WEST))) set_smoothed_icon_state(new_junction) @@ -371,20 +382,20 @@ if(new_junction & NORTH_JUNCTION) if(new_junction & WEST_JUNCTION) - SET_ADJ_IN_DIR(src, new_junction, NORTHWEST, NORTHWEST_JUNCTION) + SET_ADJ_IN_DIR(NORTHWEST, NORTHWEST_JUNCTION) if(new_junction & EAST_JUNCTION) - SET_ADJ_IN_DIR(src, new_junction, NORTHEAST, NORTHEAST_JUNCTION) + SET_ADJ_IN_DIR(NORTHEAST, NORTHEAST_JUNCTION) if(new_junction & SOUTH_JUNCTION) if(new_junction & WEST_JUNCTION) - SET_ADJ_IN_DIR(src, new_junction, SOUTHWEST, SOUTHWEST_JUNCTION) + SET_ADJ_IN_DIR(SOUTHWEST, SOUTHWEST_JUNCTION) if(new_junction & EAST_JUNCTION) - SET_ADJ_IN_DIR(src, new_junction, SOUTHEAST, SOUTHEAST_JUNCTION) + SET_ADJ_IN_DIR(SOUTHEAST, SOUTHEAST_JUNCTION) set_smoothed_icon_state(new_junction) - +#undef SET_ADJ_IN_DIR /** * Changes the icon state based on the new junction bitmask. Returns the old junction value. @@ -547,5 +558,3 @@ underlay_appearance.icon_state = icon_state underlay_appearance.dir = adjacency_dir return TRUE - -#undef SET_ADJ_IN_DIR diff --git a/code/__HELPERS/pathfinding/astar.dm b/code/__HELPERS/pathfinding/astar.dm index 8de65a3f5c..901fb35ae7 100644 --- a/code/__HELPERS/pathfinding/astar.dm +++ b/code/__HELPERS/pathfinding/astar.dm @@ -176,7 +176,7 @@ GLOBAL_VAR_INIT(astar_visualization_persist, 3 SECONDS) start.color = ASTAR_VISUAL_COLOR_OPEN #endif - while(length(open.queue)) + while(length(open.array)) // get best node var/datum/astar_node/top = open.dequeue() current = top.pos @@ -231,7 +231,7 @@ GLOBAL_VAR_INIT(astar_visualization_persist, 3 SECONDS) turfs_got_colored[top.pos] = TRUE #endif - if(length(open.queue) > ASTAR_SANE_NODE_LIMIT) + if(length(open.array) > ASTAR_SANE_NODE_LIMIT) #ifdef ASTAR_DEBUGGING astar_wipe_colors_after(turfs_got_colored, GLOB.astar_visualization_persist) #endif diff --git a/code/__HELPERS/pathfinding/jps.dm b/code/__HELPERS/pathfinding/jps.dm index 75f7bbdb58..9e1cdb5147 100644 --- a/code/__HELPERS/pathfinding/jps.dm +++ b/code/__HELPERS/pathfinding/jps.dm @@ -406,7 +406,7 @@ GLOBAL_VAR_INIT(jps_visualization_resolve, TRUE) while(TRUE); #endif //* loop - while(length(open.queue)) + while(length(open.array)) node_top = open.dequeue() node_top_pos = node_top.pos #ifdef JPS_DEBUGGING diff --git a/code/__HELPERS/sorts/comparators.dm b/code/__HELPERS/sorts/comparators.dm index 6e3134a538..0214226acb 100644 --- a/code/__HELPERS/sorts/comparators.dm +++ b/code/__HELPERS/sorts/comparators.dm @@ -1,6 +1,10 @@ /** * Comparators for use with /datum/sort_instance (or wherever you want) - * They should return negative, zero, or positive numbers for a < b, a == b, and a > b respectively. + * + * They should return negative, zero, or positive numbers for a < b, a == b, and a > b respectively, where + * * neg : a < b = "a should be in front of b", + * * zero: a == b = "a and b are equivalent" + * * pos : a > b = "a should be behind b" */ //! Standard Sort diff --git a/code/_globals/lists/clothing.dm b/code/_globals/lists/clothing.dm index 6cb05adce2..fdb1697eaf 100644 --- a/code/_globals/lists/clothing.dm +++ b/code/_globals/lists/clothing.dm @@ -28,3 +28,7 @@ GLOBAL_LIST_INIT(clothing_belt, generate_chameleon_choices(/obj/item/storage/bel // accessories GLOBAL_LIST_INIT(clothing_accessory, generate_chameleon_choices(/obj/item/clothing/accessory, list(/obj/item/clothing/accessory/chameleon))) + +GLOBAL_LIST_INIT(clothing_ears, generate_chameleon_choices(/obj/item/clothing/ears)) + +GLOBAL_LIST_INIT(clothing_headsets, generate_chameleon_choices(/obj/item/radio/headset)) diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index c8b2cdd3f9..8c571111df 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -224,7 +224,7 @@ continue_check_key = ispath(new_key) switch(value_mode) if(VALUE_MODE_FLAG) - new_value = TRUE + new_value = text2num(key_value) != 0 && lowertext(key_value) != "false" continue_check_value = TRUE if(VALUE_MODE_NUM) new_value = text2num(key_value) diff --git a/code/controllers/configuration/entries/game.dm b/code/controllers/configuration/entries/game.dm index 549ab14ca6..3da3132bf9 100644 --- a/code/controllers/configuration/entries/game.dm +++ b/code/controllers/configuration/entries/game.dm @@ -37,9 +37,6 @@ /datum/config_entry/flag/allow_holidays default = TRUE -/datum/config_entry/flag/nightshifts_enabled - default = TRUE - /datum/config_entry/string/alert_desc_green default = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." @@ -81,3 +78,34 @@ /datum/config_entry/flag/almost_everyone_has_maintenance_access default = TRUE + +//* Nightshifts *// + +/datum/config_entry/flag/nightshifts_enabled + default = TRUE + +/datum/config_entry/keyed_list/nightshift_levels + default = list( + "Unset", + "PublicHalls", + "PublicAreas", + "DepartmentHalls", + "DepartmentLeisure", + "CommandHalls", + ) + lowercase = FALSE + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_FLAG + +/datum/config_entry/keyed_list/nightshift_levels/ValidateAndSet(str_val) + . = ..() + if(!.) + return + var/datum/bitfield/single/target_bitfield = /datum/bitfield/single/nightshift_level + var/target_bitname = initial(target_bitfield.variable) + var/list/actual_bitfield = GLOB.bitfields[target_bitname] + var/new_flags = NONE + for(var/key in config_entry_value) + if(config_entry_value[key]) + new_flags |= actual_bitfield[key] + SSnightshift.nightshift_level = new_flags diff --git a/code/controllers/configuration_old/configuration.dm b/code/controllers/configuration_old/configuration.dm index 1af300a08d..3bd2f44c05 100644 --- a/code/controllers/configuration_old/configuration.dm +++ b/code/controllers/configuration_old/configuration.dm @@ -125,18 +125,9 @@ var/health_threshold_crit = 0 var/health_threshold_dead = -100 - var/organ_health_multiplier = 1 - var/organ_regeneration_multiplier = 1 var/default_brain_health = 400 var/allow_headgibs = FALSE - //Paincrit knocks someone down once they hit 60 shock_stage, so by default make it so that close to 100 additional damage needs to be dealt, - //so that it's similar to HALLOSS. Lowered it a bit since hitting paincrit takes much longer to wear off than a halloss stun. - var/organ_damage_spillover_multiplier = 0.5 - - var/bones_can_break = 0 - var/limbs_can_break = 0 - var/revival_pod_plants = 1 var/revival_cloning = 1 var/revival_brain_life = -1 @@ -794,20 +785,10 @@ config_legacy.revival_cloning = value if("revival_brain_life") config_legacy.revival_brain_life = value - if("organ_health_multiplier") - config_legacy.organ_health_multiplier = value / 100 - if("organ_regeneration_multiplier") - config_legacy.organ_regeneration_multiplier = value / 100 - if("organ_damage_spillover_multiplier") - config_legacy.organ_damage_spillover_multiplier = value / 100 if("default_brain_health") config_legacy.default_brain_health = text2num(value) if(!config_legacy.default_brain_health || config_legacy.default_brain_health < 1) config_legacy.default_brain_health = initial(config_legacy.default_brain_health) - if("bones_can_break") - config_legacy.bones_can_break = value - if("limbs_can_break") - config_legacy.limbs_can_break = value if("allow_headgibs") config_legacy.allow_headgibs = TRUE diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index f05c86e92d..6f848ba04c 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -104,15 +104,14 @@ SUBSYSTEM_DEF(input) // Badmins just wanna have fun ♪ /datum/controller/subsystem/input/proc/refresh_client_macro_sets() - var/list/clients = GLOB.clients - for(var/i in 1 to clients.len) - var/client/user = clients[i] + for(var/client/user as anything in GLOB.clients) + if(!user.initialized) + continue user.set_macros() user.update_movement_keys() /datum/controller/subsystem/input/fire() - var/list/clients = GLOB.clients // Let's sing the list cache song - for(var/client/C as anything in clients) + for(var/client/C as anything in GLOB.clients) if(!C.initialized) continue C.keyLoop() diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm index c9384bcf05..e5bc5d6314 100644 --- a/code/controllers/subsystem/nanoui.dm +++ b/code/controllers/subsystem/nanoui.dm @@ -182,7 +182,7 @@ SUBSYSTEM_DEF(nanoui) * * @return bool FALSE if no ui was removed, TRUE if removed successfully */ -/datum/controller/subsystem/nanoui/proc/ui_closed(datum/nanoui/ui) +/datum/controller/subsystem/nanoui/proc/on_ui_closed(datum/nanoui/ui) var/src_object_key = "\ref[ui.src_object]" if (!open_uis[src_object_key] || !open_uis[src_object_key][ui.ui_key]) return FALSE // wasn't open diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index 8696aa1480..7321979537 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -5,6 +5,11 @@ SUBSYSTEM_DEF(nightshift) wait = 60 SECONDS subsystem_flags = SS_NO_TICK_CHECK + /// Set from configuration - enabled nightshift flags. + var/nightshift_level = NONE + + //! legacy below + var/nightshift_active = FALSE var/nightshift_start_time = 19 HOURS + 30 MINUTES //7:30 PM, station time var/nightshift_end_time = 7 HOURS + 30 MINUTES //7:30 AM, station time @@ -64,7 +69,7 @@ SUBSYSTEM_DEF(nightshift) for(var/obj/machinery/power/apc/apc in GLOB.apcs) if(apc.z in (LEGACY_MAP_DATUM).station_levels) - apc.set_nightshift(active, TRUE) + apc.set_nightshift(active && (apc.area.nightshift_level & nightshift_level), TRUE) CHECK_TICK SSlighting.resume_instant() diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index fdf4653963..5c1b72de73 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -17,6 +17,7 @@ SUBSYSTEM_DEF(parallax) while(length(currentrun)) var/client/processing_client = currentrun[currentrun.len] currentrun.len-- + // implicitly checks initialized if (QDELETED(processing_client) || !processing_client.eye) if (MC_TICK_CHECK) return @@ -28,6 +29,7 @@ SUBSYSTEM_DEF(parallax) while(length(currentrun)) var/client/processing_client = currentrun[currentrun.len] currentrun.len-- + // implicitly checks initialized if (QDELETED(processing_client) || !processing_client.eye) if (MC_TICK_CHECK) return @@ -106,6 +108,8 @@ SUBSYSTEM_DEF(parallax) */ /datum/controller/subsystem/parallax/proc/update_clients_on_z(z) for(var/client/C in GLOB.clients) + if(!C.initialized) + continue if(C.mob.z == z) C.parallax_holder?.Update(TRUE) @@ -114,6 +118,8 @@ SUBSYSTEM_DEF(parallax) */ /datum/controller/subsystem/parallax/proc/reset_clients_on_z(z) for(var/client/C in GLOB.clients) + if(!C.initialized) + continue if(C.mob.z == z) C.parallax_holder?.reset() @@ -122,6 +128,8 @@ SUBSYSTEM_DEF(parallax) */ /datum/controller/subsystem/parallax/proc/update_z_vis_contents(z) for(var/client/C in GLOB.clients) + if(!C.initialized) + continue if(C.mob.z == z) C.parallax_holder?.SyncVisContents() @@ -130,6 +138,8 @@ SUBSYSTEM_DEF(parallax) */ /datum/controller/subsystem/parallax/proc/update_z_motion(z) for(var/client/C in GLOB.clients) + if(!C.initialized) + continue if(C.mob.z == z) C.parallax_holder?.UpdateMotion() diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm index d8b5ba01b9..12ac61b1b4 100644 --- a/code/controllers/subsystem/ping.dm +++ b/code/controllers/subsystem/ping.dm @@ -27,6 +27,9 @@ SUBSYSTEM_DEF(ping) var/client/client = currentrun[currentrun.len] currentrun.len-- + if(!client.initialized) + continue + if (client?.tgui_panel?.is_ready()) // Send a soft ping client.tgui_panel.window.send_message("ping/soft", list( diff --git a/code/controllers/subsystem/processing/chemistry.dm b/code/controllers/subsystem/processing/chemistry.dm index 07eff0f752..9bd0ed8199 100644 --- a/code/controllers/subsystem/processing/chemistry.dm +++ b/code/controllers/subsystem/processing/chemistry.dm @@ -62,5 +62,5 @@ PROCESSING_SUBSYSTEM_DEF(chemistry) * * do not edit the returned instance, it is global! */ -/datum/controller/subsystem/processing/chemistry/proc/get_reagent(datum/reagent/id_or_path) +/datum/controller/subsystem/processing/chemistry/proc/fetch_reagent(datum/reagent/id_or_path) return reagent_lookup[ispath(id_or_path)? initial(id_or_path.id) : id_or_path] diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index 1815632e1b..b3d214da48 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -361,6 +361,8 @@ SUBSYSTEM_DEF(tgui) ui.user = target target.tgui_open_uis.Add(ui) source.on_ui_transfer(source, target, ui) + for(var/datum/module in ui.modules_processed) + module.on_ui_transfer(source, target, ui, TRUE) // Clear the old list. source.tgui_open_uis.Cut() return TRUE diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 33eb999ab1..7fa198c888 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -35,6 +35,8 @@ SUBSYSTEM_DEF(throwing) currentrun = null +// todo: the landing stack kinda sucks ass and needs to be unit tested and rewritten + /datum/thrownthing //! important stuff /// thing we threw @@ -197,7 +199,7 @@ SUBSYSTEM_DEF(throwing) // if we have gravity we can end, else keep going if(AM.has_gravity()) if(dist_travelled >= maxrange || AM.loc == target_turf) - terminate() + land() return else if(dist_travelled >= MAX_THROWING_DIST) terminate() @@ -340,6 +342,7 @@ SUBSYSTEM_DEF(throwing) * land on something and terminate the throw */ /datum/thrownthing/proc/land(atom/A = get_turf(thrownthing)) + // todo: need to rewrite to consider qdel's for object + us maybe? // nothing to land on if(!A) terminate() @@ -349,6 +352,10 @@ SUBSYSTEM_DEF(throwing) if(!impacted[target] && (target in get_turf(A))) impact(target, TRUE) + // we got terminated already + if(finished) + return + // land thrownthing._throw_finalize(A, src) on_land?.InvokeAsync(A, src) @@ -361,6 +368,9 @@ SUBSYSTEM_DEF(throwing) * when called, immediately erases the throw from the atom and stops it. */ /datum/thrownthing/proc/terminate(in_qdel) + // todo: shitcode, rewrite + if(QDELETED(src)) + return finished = TRUE thrownthing.throwing = null if(!QDELETED(thrownthing)) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index f7c293c180..885cf5541c 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -184,9 +184,12 @@ SUBSYSTEM_DEF(vote) log_vote(text) to_chat(world, "[text]\nType vote or click here to place your votes.\nYou have [config_legacy.vote_period / 10] seconds to vote.") - if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE || vote_type == VOTE_CUSTOM) + if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE) SEND_SOUND(world, sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)) + if(vote_type == VOTE_CUSTOM) + SEND_SOUND(world, sound('sound/custom_vote.ogg', repeat = 0, wait = 0, volume = 30, channel = 3)) + time_remaining = round(config_legacy.vote_period / 10) return 1 return 0 @@ -215,7 +218,7 @@ SUBSYSTEM_DEF(vote) ui = new(user, src, "Vote") ui.open() -/datum/controller/subsystem/vote/ui_data(mob/user) +/datum/controller/subsystem/vote/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "choices" = list(), "question" = question, @@ -235,7 +238,7 @@ SUBSYSTEM_DEF(vote) return data -/datum/controller/subsystem/vote/ui_act(action, params) +/datum/controller/subsystem/vote/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/datums/ability.dm b/code/datums/ability.dm index 6c50c2ba8b..277197b696 100644 --- a/code/datums/ability.dm +++ b/code/datums/ability.dm @@ -30,7 +30,7 @@ /// action button background icon var/background_icon = 'icons/screen/actions/backgrounds.dmi' /// action button background icon state - the _on overlay will be added while active, automatically. - var/background_state = "alien" + var/background_state = "default" /// currently hotbound? var/bound = FALSE /// automatically hotbound? @@ -41,6 +41,13 @@ var/interact_type = ABILITY_INTERACT_NONE /// currently hidden? var/hidden = FALSE + /// targeted? + /// targeted abilities only work with ABILITY_INTERACT_TOGGLE + var/targeted = FALSE + /// target type? Can be anything (atoms), mobs or turfs + var/targeting_type = ABILITY_TARGET_ALL + /// range? + var/range //? ui /// tgui id @@ -148,6 +155,10 @@ return if(isnull(toggling)) toggling = !enabled + if(targeted) + if(ishuman(user) && toggling == TRUE) + var/mob/living/carbon/human/H = user + H.ab_handler?.process_ability(src) if(!check_trigger(user, toggling, TRUE)) return if(windup) @@ -199,12 +210,16 @@ enabled = TRUE if(update_action) update_action() + action?.background_icon_state += "_on" + action?.update_button() on_enable() /datum/ability/proc/disable(update_action) enabled = FALSE if(update_action) update_action() + action?.background_icon_state = background_state + action?.update_button() on_disable() /datum/ability/proc/on_enable() @@ -299,10 +314,30 @@ if(always_bind) quickbind() + +/** + * checks if the target is within range and the ability is triggerable + */ +/datum/ability/proc/target_check(mob/user, atom/target) + if(range) + if(get_dist(get_turf(user),get_turf(target)) > range) + return FALSE + if(check_trigger(user)) + target_trigger(user,target) + return TRUE + return FALSE + +/** + * target-affecting proc + */ +/datum/ability/proc/target_trigger(mob/user, atom/target) + //target-related code goes here + disable() + /** * static data for tgui panel */ -/datum/ability/ui_static_data(mob/user) +/datum/ability/ui_static_data(mob/user, datum/tgui/ui) return list( "$tgui" = tgui_id, "$src" = REF(src), diff --git a/code/datums/ability_handler.dm b/code/datums/ability_handler.dm new file mode 100644 index 0000000000..269acce512 --- /dev/null +++ b/code/datums/ability_handler.dm @@ -0,0 +1,31 @@ +/datum/ability_handler + var/datum/ability/current + var/target_type + +///Is called by the ability +/datum/ability_handler/proc/process_ability(var/datum/ability/ab) + current = ab + switch(current?.targeting_type) + if(ABILITY_TARGET_ALL) + target_type = /atom + if(ABILITY_TARGET_MOB) + target_type = /mob + if(ABILITY_TARGET_TURF) + target_type = /turf + else + target_type = null + return + ab.owner.client.mouse_pointer_icon = file("icons/screen/mouse_pointers/standard1.dmi") + +///Is called by a click if there's an ability in 'current' +/datum/ability_handler/proc/process_click(mob/user, atom/A) + if(current) + if(target_type && !istype(A, target_type)) + return FALSE + if(A.atom_flags & ATOM_ABSTRACT) + return FALSE + if(current.target_check(user, A)) + current = null + user.client?.mouse_pointer_icon = initial(user.client.mouse_pointer_icon) + return TRUE + return FALSE diff --git a/code/datums/action.dm b/code/datums/action.dm index c5c3fe219e..7f508f61e5 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -69,6 +69,8 @@ var/button_toggled /// are button updates managed? if so, we don't auto update. var/button_managed = FALSE + /// is the button visible + var/button_visibility = TRUE /datum/action/New(datum/target) if(!target_compatible(target)) diff --git a/code/datums/changelog.dm b/code/datums/changelog.dm index d1f8709524..910c72186f 100644 --- a/code/datums/changelog.dm +++ b/code/datums/changelog.dm @@ -21,7 +21,7 @@ changelog_items[params["date"]] = changelog_item return ui.send_asset(changelog_item) -/datum/changelog/ui_static_data() +/datum/changelog/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list( "dates" = list() ) var/regex/ymlRegex = regex(@"\.yml", "g") diff --git a/code/datums/character_profile.dm b/code/datums/character_profile.dm index 6a512863e3..93ddda7b62 100644 --- a/code/datums/character_profile.dm +++ b/code/datums/character_profile.dm @@ -1,5 +1,3 @@ -GLOBAL_LIST_EMPTY(cached_previews) - /datum/description_profile var/datum/weakref/host @@ -14,7 +12,7 @@ GLOBAL_LIST_EMPTY(cached_previews) /datum/description_profile/ui_state() return GLOB.always_state -/datum/description_profile/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/description_profile/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/data[0] var/mob/living/carbon/human/H = host.resolve() diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 004d48b532..48d25e16a0 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -328,7 +328,7 @@ if(user == parent) INVOKE_ASYNC(src, PROC_REF(ui_interact), user) -/datum/component/personal_crafting/ui_state(mob/user, datum/tgui_module/module) +/datum/component/personal_crafting/ui_state() return GLOB.not_incapacitated_turf_state //For the UI related things we're going to assume the user is a mob rather than typesetting it to an atom as the UI isn't generated if the parent is an atom @@ -344,7 +344,7 @@ ui = new(user, src, "PersonalCrafting") ui.open() -/datum/component/personal_crafting/ui_data(mob/user) +/datum/component/personal_crafting/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["busy"] = busy data["category"] = cur_category @@ -368,7 +368,7 @@ data["craftability"] = craftability return data -/datum/component/personal_crafting/ui_static_data(mob/user) +/datum/component/personal_crafting/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/crafting_recipes = list() @@ -395,7 +395,7 @@ data["crafting_recipes"] = crafting_recipes return data -/datum/component/personal_crafting/ui_act(action, params) +/datum/component/personal_crafting/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) diff --git a/code/datums/components/turfs/transition_border.dm b/code/datums/components/turfs/transition_border.dm index bf885a186a..056b63042f 100644 --- a/code/datums/components/turfs/transition_border.dm +++ b/code/datums/components/turfs/transition_border.dm @@ -54,25 +54,29 @@ STACK_TRACE("no z index?! deleting self.") qdel(src) return - var/turf/target - switch(dir) - if(NORTH) - target = locate(our_turf.x, 2, z_index) - if(SOUTH) - target = locate(our_turf.x, world.maxy - 1, z_index) - if(EAST) - target = locate(2, our_turf.y, z_index) - if(WEST) - target = locate(world.maxx - 1, our_turf.y, z_index) - if(NORTHEAST) - target = locate(2, 2, z_index) - if(NORTHWEST) - target = locate(world.maxx - 1, 2, z_index) - if(SOUTHEAST) - target = locate(2, world.maxy - 1, z_index) - if(SOUTHWEST) - target = locate(world.maxx - 1, world.maxy - 1, z_index) - AM.locationTransitForceMove(target, recurse_levels = 2) + // todo: this is shit but we have to yield to prevent a Moved() before Moved() + spawn(0) + if(AM.loc != our_turf) + return + var/turf/target + switch(dir) + if(NORTH) + target = locate(our_turf.x, 2, z_index) + if(SOUTH) + target = locate(our_turf.x, world.maxy - 1, z_index) + if(EAST) + target = locate(2, our_turf.y, z_index) + if(WEST) + target = locate(world.maxx - 1, our_turf.y, z_index) + if(NORTHEAST) + target = locate(2, 2, z_index) + if(NORTHWEST) + target = locate(world.maxx - 1, 2, z_index) + if(SOUTHEAST) + target = locate(2, world.maxy - 1, z_index) + if(SOUTHWEST) + target = locate(world.maxx - 1, world.maxy - 1, z_index) + AM.locationTransitForceMove(target, recurse_levels = 2) /datum/component/transition_border/proc/rebuild() // reset first diff --git a/code/datums/recipe/stack_recipe.dm b/code/datums/recipe/stack_recipe.dm index 4d716d4e31..581d427a31 100644 --- a/code/datums/recipe/stack_recipe.dm +++ b/code/datums/recipe/stack_recipe.dm @@ -48,12 +48,17 @@ var/exclusitivity /// max amount to allow crafting at once. null for 1 non stack, infinity stack var/max_amount + /// we're a border object + var/on_border = FALSE // todo: material constraints /datum/stack_recipe/New() if(ispath(result_type, /obj/item/stack)) result_is_stack = TRUE + var/atom/casted = result_type + on_border = !!(initial(casted.atom_flags) & ATOM_BORDER) + /** * attepmt to craft * @@ -92,6 +97,9 @@ for(var/atom/movable/AM as anything in where) if(AM == user) continue + // border only collides with other border objs in the same dir + if((AM.atom_flags & ATOM_BORDER) && (!on_border || (AM.dir != use_dir))) + continue if(AM.density) if(!silent) user.action_feedback(SPAN_WARNING("[AM] is in the way.")) diff --git a/code/datums/underwear/socks.dm b/code/datums/underwear/socks.dm index 3b8533fab3..be6f1e9743 100644 --- a/code/datums/underwear/socks.dm +++ b/code/datums/underwear/socks.dm @@ -443,3 +443,12 @@ /datum/category_item/underwear/socks/pantyhose_rip_stirrup name = "Ripped Pantyhose (Stirrup)" icon_state = "pantyhose_ripped-stir" + +/datum/category_item/underwear/socks/asymmetrical_thigh_stirrups + name = "Asymmetrical Thigh (Stirrup)" + icon_state = "socks_thigh_asym_stirrup" + has_color = TRUE + +/datum/category_item/underwear/socks/asymmetrical_thigh_stirrups/reversed + name = "Asymmetrical Thigh (Stirrup) (Reversed)" + icon_state = "socks_thigh_asym_stirrup_r" diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index f1b15da6ca..e923ccd693 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -15,7 +15,7 @@ if(A.isElectrified()) if(A.shock(user, 100)) return FALSE - if(A.p_open) + if(A.panel_open) return TRUE return FALSE diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 110c1dff22..e7a2edfed2 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -92,10 +92,10 @@ ui = new(user, src, "Wires", "[proper_name] wires") ui.open() -/datum/wires/ui_state(mob/user, datum/tgui_module/module) +/datum/wires/ui_state() return GLOB.physical_state -/datum/wires/ui_data(mob/user) +/datum/wires/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/replace_colors @@ -150,7 +150,7 @@ data["status"] = status return data -/datum/wires/ui_act(action, list/params) +/datum/wires/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/game/area/Ship_Station_Areas.dm b/code/game/area/Ship_Station_Areas.dm index 0e0a373702..5a428eeeff 100644 --- a/code/game/area/Ship_Station_Areas.dm +++ b/code/game/area/Ship_Station_Areas.dm @@ -17,6 +17,69 @@ /area/main_map/hanger_cafe name = "Fuel Cafe" + +/** + * Turbolifts + * Medical + */ + +/area/turbolift/medical/EutheniaDeck3 + name = "Medical (Deck 3)" + lift_floor_label = "Medical Deck 3" + lift_floor_name = "Pyscology, Resleaving, Morgue, Storage" + lift_announce_str = "Arriving at Medical Deck 3." + +/area/turbolift/medical/EutheniaDeck2 + name = "Medical (Deck 2)" + lift_floor_label = "Medical Deck 2" + lift_floor_name = "Recovery, Virology, CMO Office" + lift_announce_str = "Arriving at Medical Deck 2." + +/area/turbolift/medical/EutheniaDeck1 + name = "Medical (Deck 1)" + lift_floor_label = "Medical Deck 1" + lift_floor_name = "Treatement, Surgery, Chemistry, Paramedic Office" + lift_announce_str = "Arriving at Medical Deck 1." + +/area/turbolift/medical/EutheniaDeck0 + name = "Medical (Flight Deck)" + lift_floor_label = "Medical Flight Deck" + lift_floor_name = "Medical Emergency Dock, MedEvac Shuttle" + lift_announce_str = "Arriving at Medical Flight Deck." +/** + * Cargo + */ + +/area/turbolift/cargo/EutheniaDeck4 + name = "Cargo (Deck 4)" + lift_floor_label = "Cargo Deck 4" + lift_floor_name = "Mining Operations" + lift_announce_str = "Arriving at Cargo Deck 4." +/area/turbolift/cargo/EutheniaDeck3 + name = "Cargo (Deck 3)" + lift_floor_label = "Cargo Deck 3" + lift_floor_name = "Warehouse, Supply Shuttle Dock" + lift_announce_str = "Arriving at Cargo Deck 3." + +/area/turbolift/cargo/EutheniaDeck2 + name = "Cargo (Deck 2)" + lift_floor_label = "Cargo Deck 2" + lift_floor_name = "Front Desk, QM Office" + lift_announce_str = "Arriving at Cargo Deck 2." + +/area/turbolift/cargo/EutheniaDeck1 + name = "Cargo (Deck 1)" + lift_floor_label = "Cargo Deck 1" + lift_floor_name = "Mail and Packages" + lift_announce_str = "Arriving at Cargo Deck 1." + +/area/turbolift/cargo/EutheniaDeck0 + name = "Cargo (Flight Deck)" + lift_floor_label = "Cargo Flight Deck" + lift_floor_name = "Salvage Operations" + lift_announce_str = "Arriving at Cargo Flight Deck." + + /** * Hallways */ @@ -157,6 +220,48 @@ /area/main_map/maintenance/engineering/deck4 /area/main_map/maintenance/engineering/deck4/secondary + +/** + *! Flight Deck Maint Areas + */ + +/area/main_map/maintenance/deck_zero + name = "\improper Flight Deck Maintenance" + icon_state = "maintcentral" + +/area/main_map/maintenance/deck_zero/port + name = "\improper Flight Deck Port Maintenance" + icon_state = "pmaint" + +/area/main_map/maintenance/deck_zero/starboard + name = "\improper Flight Deck Starboard Maintenance" + icon_state = "smaint" + +/area/main_map/maintenance/deck_zero/forward + name = "\improper Flight Deck Forward Maintenance" + icon_state = "fmaint" + +/area/main_map/maintenance/deck_zero/forward/port + name = "\improper Flight Deck Forward Port Maintenance" + icon_state = "fpmaint" + +/area/main_map/maintenance/deck_zero/forward/starboard + name = "\improper Flight Deck Forward Starboard Maintenance" + icon_state = "fsmaint" + +/area/main_map/maintenance/deck_zero/aft + name = "\improper Flight Deck Aft Maintenance" + icon_state = "amaint" + +/area/main_map/maintenance/deck_zero/aft/port + name = "\improper Flight Deck Aft Port Maintenance" + icon_state = "apmaint" + +/area/main_map/maintenance/deck_zero/aft/starboard + name = "\improper Flight Deck Aft Starboard Maintenance" + icon_state = "asmaint" + + /** *! Deck One Maint Areas */ diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 3498b98848..7f14e0dc78 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -33,6 +33,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station ambience = AMBIENCE_SPACE area_flags = AREA_FLAG_EXTERNAL is_outside = OUTSIDE_YES + nightshift_level = NONE /area/space/atmosalert() return @@ -1113,6 +1114,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/hallway/primary/ sound_env = LARGE_ENCLOSED ambience = AMBIENCE_GENERIC + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS /area/hallway/primary/fore name = "\improper Fore Primary Hallway" @@ -1146,6 +1148,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Central Primary Hallway - Port" icon_state = "hallC4" +/area/hallway/secondary + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS + /area/hallway/secondary/exit name = "\improper Escape Shuttle Hallway" icon_state = "escape" @@ -1291,63 +1296,77 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Bridge" icon_state = "bridge" music = "signal" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/bridge/bridge_hallway name = "Bridge Hallway" icon_state = "bridge" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_HALLWAYS /area/bridge/meeting_room name = "Heads of Staff Meeting Room" icon_state = "bridge" music = null sound_env = MEDIUM_SOFTFLOOR + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/bridge/office name = "Official On-Site Office" icon_state = "bridge" music = null sound_env = MEDIUM_SOFTFLOOR + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/bridge/hop_office name = "Head Of Personal Office" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/triumph/station/public_meeting_room name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/crew_quarters/captain name = "Command - Facility Director's Office" icon_state = "captain" sound_env = MEDIUM_SOFTFLOOR + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/hop name = "Command - HoP's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/blueshield name = "Command - Blueshield's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/hor name = "Research - RD's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/chief name = "Engineering - CE's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/hos name = "Security - HoS' Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/cmo name = "Medbay - CMO's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/courtroom name = "Courtroom" icon_state = "courtroom" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/mint name = "Mint" @@ -1368,6 +1387,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "crew_quarters" area_flags = AREA_RAD_SHIELDED ambience = AMBIENCE_GENERIC + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/crew_quarters/toilet name = "Dormitory Toilets" @@ -1652,6 +1672,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/recreation_area_hallway name = "\improper Recreation Area Hallway" icon_state = "recreation_area_hallway" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS /area/crew_quarters/recreation_area_restroom name = "\improper Recreation Area Restroom" @@ -1895,6 +1916,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Engineering" icon_state = "engineering" ambience = AMBIENCE_ENGINEERING + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/shield_gen name = "\improper Shield Generation" @@ -1905,6 +1927,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "atmos" sound_env = LARGE_ENCLOSED ambience = AMBIENCE_ATMOS + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/atmos/backup name = "\improper Backup Atmospherics" @@ -1918,48 +1941,62 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Atmospherics Storage" icon_state = "atmos_storage" sound_env = SMALL_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/atmos/processing name = "Atmospherics Processing" icon_state = "atmos" sound_env = LARGE_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/atmos/intake name = "\improper Atmospherics Intake" icon_state = "atmos" sound_env = MOUNTAINS + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/atmos/hallway name = "\improper Atmospherics Main Hallway" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/engineering/atmos/locker_room name = "\improper Engineering Atmos Locker Room" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/atmos/eva name = "\improper Engineering Atmos EVA" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/engineering/atmos/workshop + name = "\improper Atmospherics Workshop" /area/engineering/drone_fabrication name = "\improper Engineering Drone Fabrication" icon_state = "drone_fab" sound_env = SMALL_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/engine_smes name = "\improper Engineering SMES" icon_state = "engine_smes" sound_env = SMALL_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/engine_room name = "\improper Engine Room" icon_state = "engine" sound_env = LARGE_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/engine_airlock name = "\improper Engine Room Airlock" icon_state = "engine" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/engine_monitoring name = "\improper Engine Monitoring Room" icon_state = "engine_monitoring" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/engine_waste name = "\improper Engine Waste Handling" @@ -1972,6 +2009,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engineering/foyer name = "\improper Engineering Foyer" icon_state = "engineering_foyer" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/engineering/foyer/lower name = "\improper Lower Enginering Foyer" @@ -2054,6 +2092,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 1 always_unpowered = 1 ambience = AMBIENCE_SPACE + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/solar/auxport name = "\improper Fore Port Solar Array" @@ -2157,10 +2196,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Medical" icon_state = "medbay" music = 'sound/ambience/signal.ogg' + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/medical/medbay name = "\improper Medbay Hallway - Port" icon_state = "medbay" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/resleeving name = "Resleeving Lab" @@ -2170,14 +2211,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/medbay2 name = "\improper Medbay Hallway - Starboard" icon_state = "medbay2" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/medbay3 name = "\improper Medbay Hallway - Fore" icon_state = "medbay3" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/medbay4 name = "\improper Medbay Hallway - Aft" icon_state = "medbay4" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/biostorage name = "\improper Secondary Storage" @@ -2186,6 +2230,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/reception name = "\improper Medbay Reception" icon_state = "medbay" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/medbay_emt_bay name = "\improper Medical EMT Bay" @@ -2351,10 +2396,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/first_aid_station_starboard name = "\improper Starboard First-Aid Station" icon_state = "medbay2" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/first_aid_station name = "\improper Port First-Aid Station" icon_state = "medbay2" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/psych_ward name = "\improper Psych Ward" @@ -2362,13 +2409,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Security +/area/security + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + /area/security/main name = "\improper Security Office" icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/security/lobby name = "\improper Security Lobby" icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/security/brig name = "\improper Security - Brig" @@ -2403,6 +2455,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "armory" ambience = AMBIENCE_HIGHSEC area_flags = AREA_FLAG_BLUE_SHIELDED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/security/briefing_room name = "\improper Security - Briefing Room" @@ -2423,6 +2476,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/riot_control name = "\improper Security - Riot Control" icon_state = "riot_control" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/security/detectives_office name = "\improper Security - Forensic Office" @@ -2479,6 +2533,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/breakroom name = "\improper Security Breakroom" icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/security/brig/visitation name = "\improper Visitation" @@ -2519,7 +2574,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/visitor name = "\improper Security Visitor Room" icon_state = "security" - + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /* New() @@ -2602,14 +2657,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster name = "\improper Quartermasters" icon_state = "quart" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/quartermaster/hallway name = "\improper Cargo Hallway" icon_state = "quart" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/quartermaster/office name = "\improper Cargo Office" icon_state = "quartoffice" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/quartermaster/storage name = "\improper Cargo Bay" @@ -2619,6 +2677,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster/foyer name = "\improper Cargo Bay Foyer" icon_state = "quartstorage" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/quartermaster/warehouse name = "\improper Cargo Warehouse" @@ -2646,8 +2705,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster/garage name = "\improper Cargo Garage" +/area/quartermaster/cargo_shelter_dock + name = "\improper Cargo Shuttle Dock" // SCIENCE +/area/rnd + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + /area/rnd/research name = "\improper Research and Development" icon_state = "research" @@ -2655,15 +2719,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/rnd/research_foyer name = "\improper Research Foyer" icon_state = "research_foyer" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/rnd/research_foyer_auxiliary name = "\improper Research Foyer Auxiliary" icon_state = "research_foyer_aux" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/rnd/research_restroom name = "\improper Research Restroom" icon_state = "research_restroom" sound_env = SMALL_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/rnd/research_storage name = "\improper Research Storage" @@ -2731,10 +2798,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/rnd/breakroom name = "\improper Research Break Room" icon_state = "research" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/rnd/reception_desk name = "\improper Research Reception Desk" @@ -2751,6 +2820,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/rnd/hallway name = "\improper Research Lower Hallway" icon_state = "research" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/rnd/anomaly_lab name = "\improper Anomaly Lab" @@ -2951,33 +3021,41 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/storage/tools name = "Auxiliary Tool Storage" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/primary name = "Primary Tool Storage" icon_state = "primarystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/autolathe name = "Autolathe Storage" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/art name = "Art Supply Storage" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/auxillary name = "Auxillary Storage" icon_state = "auxstorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/eva name = "EVA Storage" icon_state = "eva" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/surface_eva icon_state = "storage" name = "\improper Surface EVA" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/surface_eva/external name = "\improper Surface EVA Access" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/secure name = "Secure Storage" @@ -2986,30 +3064,37 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/storage/emergency_storage/emergency name = "Starboard Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency2 name = "Port Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency3 name = "Central Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency4 name = "Civilian Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency5 name = "Dock Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency6 name = "Cargo Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/tech name = "Technical Storage" icon_state = "auxstorage" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/storage/testroom requires_power = 0 @@ -3132,6 +3217,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/constructionsite name = "\improper Construction Site" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/constructionsite/storage name = "\improper Construction Site Storage Area" @@ -3231,50 +3317,60 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/storage/eva name = "EVA Storage" icon_state = "eva" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/ai_monitored/storage/secure name = "Secure Storage" icon_state = "storage" ambience = AMBIENCE_HIGHSEC + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/ai_monitored/storage/emergency name = "Emergency Storage" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/ai_monitored/storage/emergency/eva name = "Emergency EVA" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/ai_upload name = "\improper AI Upload Chamber" icon_state = "ai_upload" ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/ai_upload_foyer name = "AI Upload Access" icon_state = "ai_foyer" sound_env = SMALL_ENCLOSED ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/ai_server_room name = "Messaging Server Room" icon_state = "ai_server" sound_env = SMALL_ENCLOSED ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/ai name = "\improper AI Chamber" icon_state = "ai_chamber" ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/ai/foyer name = "\improper AI Core Access" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/ai_cyborg_station name = "\improper Cyborg Station" icon_state = "ai_cyborg" sound_env = SMALL_ENCLOSED ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/aisat name = "\improper AI Satellite" @@ -3462,43 +3558,51 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/exploration name = "\improper Exploration Foyer" icon_state = "purple" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/exploration/excursion_dock name = "\improper Excursion Shuttle Dock" icon_state = "hangar" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/courser_dock name = "\improper Courser Shuttle Dock" icon_state = "hangar" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/explorer_prep name = "\improper Explorer Prep Room" icon_state = "locker" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/pilot_prep name = "\improper Pilot Prep Room" icon_state = "locker" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/meeting name = "\improper Explorer Meeting Room" icon_state = "northeast" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/exploration/showers name = "\improper Explorer Showers" icon_state = "restrooms" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/exploration/medical name = "\improper Exploration Med Station" icon_state = "medbay" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/pathfinder_office name = "\improper Pathfinder's Office" - + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/station/protean_nanite_room name = "\improper Nanite Chamber" icon_state = "blue" - + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES //Elevator areas // Used for creating the exchange areas. diff --git a/code/game/area/Tether_areas.dm b/code/game/area/Tether_areas.dm index d0dcba548a..95783f7463 100644 --- a/code/game/area/Tether_areas.dm +++ b/code/game/area/Tether_areas.dm @@ -58,6 +58,43 @@ lift_floor_name = "Chapel, Cargo, EVA, Gateway" lift_announce_str = "Arriving at Station Level 2." +/area/turbolift/tether/elevator_two/transit + name = "tether (midway)" + lift_floor_label = "Tether Midpoint" + lift_floor_name = "Midpoint" + lift_announce_str = "Arriving at tether midway point." + delay_time = 5 SECONDS + +/area/turbolift/t_surface/elevator_two/level1 + name = "surface (level 1)" + lift_floor_label = "Surface 1" + lift_floor_name = "Tram, Dorms, Mining, Surf. EVA" + lift_announce_str = "Arriving at Base Level 1." + +/area/turbolift/t_surface/elevator_two/level2 + name = "surface (level 2)" + lift_floor_label = "Surface 2" + lift_floor_name = "Atmos, Maintenance" + lift_announce_str = "Arriving at Base Level 2." + +/area/turbolift/t_surface/elevator_two/level3 + name = "surface (level 3)" + lift_floor_label = "Surface 3" + lift_floor_name = "Bar, Bridge, Pool, Science" + lift_announce_str = "Arriving at Base Level 3." + +/area/turbolift/t_station/elevator_two/level1 + name = "asteroid (level 1)" + lift_floor_label = "Asteroid 1" + lift_floor_name = "AI Core, Eng, Exploration, Secondary Bridge" + lift_announce_str = "Arriving at Station Level 1." + +/area/turbolift/t_station/elevator_two/level2 + name = "asteroid (level 2)" + lift_floor_label = "Asteroid 2" + lift_floor_name = "Chapel, Cargo, EVA, Gateway" + lift_announce_str = "Arriving at Station Level 2." + /area/vacant/vacant_restaurant_upper name = "\improper Vacant Restaurant" icon_state = "vacant_site" @@ -1443,6 +1480,9 @@ requires_power = FALSE +/area/tether/elevator/two + name = "\improper Tether Elevator Two" + /area/tether/midpoint name = "\improper Tether Midpoint" diff --git a/code/game/area/area.dm b/code/game/area/area.dm index d0329eb5e6..c436fc18f1 100644 --- a/code/game/area/area.dm +++ b/code/game/area/area.dm @@ -30,6 +30,11 @@ /// default initial gas mix var/initial_gas_mix = GAS_STRING_STP + //? nightshift + /// nightshift level + /// in general, nightshift must be at or above this level for it to proc on areas. + var/nightshift_level = NIGHTSHIFT_LEVEL_UNSET + //? tracking lists for machinery /// holopads - lazyinit'd var/list/obj/machinery/holopad/holopads @@ -324,6 +329,8 @@ else if(!E.density) spawn(0) E.close() + for(var/obj/machinery/floor_inflatables/i in all_doors) + i.trigger() /// Open all firedoors in the area /area/proc/firedoors_open() diff --git a/code/game/atoms/movable/movement.dm b/code/game/atoms/movable/movement.dm index 66574fc78b..f12fb2c6a2 100644 --- a/code/game/atoms/movable/movement.dm +++ b/code/game/atoms/movable/movement.dm @@ -727,8 +727,7 @@ */ /atom/movable/proc/on_changed_z_level(old_z, new_z) SEND_SIGNAL(src, COMSIG_MOVABLE_Z_CHANGED, old_z, new_z) - for(var/item in src) // Notify contents of Z-transition. This can be overridden IF we know the items contents do not care. - var/atom/movable/AM = item + for(var/atom/movable/AM as anything in src) // Notify contents of Z-transition. This can be overridden IF we know the items contents do not care. AM.on_changed_z_level(old_z, new_z) //? Anchored diff --git a/code/game/atoms/movable/throwing.dm b/code/game/atoms/movable/throwing.dm index 082fa38890..e02590964b 100644 --- a/code/game/atoms/movable/throwing.dm +++ b/code/game/atoms/movable/throwing.dm @@ -17,7 +17,7 @@ return NONE /atom/movable/throw_impacted(atom/movable/AM, datum/thrownthing/TT) - if(!anchored && (TT?.force >= (move_resist * MOVE_FORCE_PUSH_RATIO)) && !(TT.throw_flags & THROW_AT_OVERHAND)) + if(!anchored && (TT?.force >= (move_resist * MOVE_FORCE_PUSH_RATIO)) && !(TT.throw_flags & (THROW_AT_OVERHAND | THROW_AT_IS_NEAT))) step(src, AM.dir) return ..() @@ -57,7 +57,7 @@ * - A - atom that we landed on * - TT - thrownthing datum */ -/atom/proc/throw_land(atom/A, datum/thrownthing/TT) +/atom/movable/proc/throw_land(atom/A, datum/thrownthing/TT) return NONE /** diff --git a/code/game/click/observer.dm b/code/game/click/observer.dm index ac0f8a93f0..dbd40e23ae 100644 --- a/code/game/click/observer.dm +++ b/code/game/click/observer.dm @@ -99,26 +99,3 @@ */ -//! ## VR FILE MERGE ## !// -/obj/item/paicard/attack_ghost(mob/user) - . = ..() - if(src.pai != null) //Have a person in them already? - user.examinate(src) - return - var/choice = input(user, "You sure you want to inhabit this PAI?") in list("Yes", "No") - var/pai_name = input(user, "Choose your character's name", "Character Name") as text - var/actual_pai_name = sanitize_species_name(pai_name) - var/pai_key - if (isnull(pai_name)) - return - if(choice == "Yes") - pai_key = user.key - else - return - var/turf/location = get_turf(src) - var/obj/item/paicard/card = new(location) - var/mob/living/silicon/pai/pai = new(card) - qdel(src) - pai.key = pai_key - card.setPersonality(pai) - pai.SetName(actual_pai_name) diff --git a/code/game/click/other_mobs.dm b/code/game/click/other_mobs.dm index 3e68c198d3..ae111a9234 100644 --- a/code/game/click/other_mobs.dm +++ b/code/game/click/other_mobs.dm @@ -66,7 +66,7 @@ // return FALSE return TRUE -/atom/ui_status(mob/user) +/atom/ui_status(mob/user, datum/ui_state/state) . = ..() if(!can_interact(user) && !IsAdminGhost(user)) . = min(., UI_UPDATE) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 8fb8a5159b..ff5617444f 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -80,10 +80,10 @@ src.go_out() for(var/obj/O in src) if((!istype(O,/obj/item/reagent_containers)) && (!istype(O,/obj/item/circuitboard/clonescanner)) && (!istype(O,/obj/item/stock_parts)) && (!istype(O,/obj/item/stack/cable_coil))) - O.loc = get_turf(src)//Ejects items that manage to get in there (exluding the components) + O.forceMove(get_turf(src)) if(!occupant) for(var/mob/M in src)//Failsafe so you can get mobs out - M.loc = get_turf(src) + M.forceMove(get_turf(src)) /** *? Allows borgs to clone people without external assistance. @@ -193,37 +193,6 @@ occupant = null icon_state = "scanner_0" -/obj/machinery/dna_scannernew/legacy_ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - legacy_ex_act(severity) - //Foreach goto(35) - //SN src = null - qdel(src) - return - if(2.0) - if (prob(50)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - legacy_ex_act(severity) - //Foreach goto(108) - //SN src = null - qdel(src) - return - if(3.0) - if (prob(25)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - legacy_ex_act(severity) - //Foreach goto(181) - //SN src = null - qdel(src) - return - else - return - /obj/machinery/computer/scan_consolenew name = "DNA Modifier Access Console" desc = "Scan DNA." @@ -659,7 +628,7 @@ if(href_list["ejectBeaker"]) if(connected.beaker) var/obj/item/reagent_containers/glass/B = connected.beaker - B.loc = connected.loc + B.forceMove(connected.loc) connected.beaker = null return 1 @@ -684,7 +653,7 @@ if (bufferOption == "ejectDisk") if (!src.disk) return - src.disk.loc = get_turf(src) + src.disk.forceMove(get_turf(src)) src.disk = null return 1 @@ -805,7 +774,7 @@ I.buf = buf waiting_for_user_input=0 if(success) - I.loc = src.loc + I.forceMove(loc) I.name += " ([buf.name])" //src.temphtml = "Injector created." src.injector_ready = 0 diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index 2225991405..24bfde902b 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -16,7 +16,7 @@ var/list/implants = list() //Try to preserve implants. for(var/obj/item/implant/W in H) implants += W - W.loc = null + W.moveToNullspace() if(!connected) for(var/obj/item/W in (H.contents-implants)) @@ -55,14 +55,14 @@ for(var/obj/T in (M.contents-implants)) qdel(T) - O.loc = M.loc + O.forceMove(M.loc) if(M.mind) M.mind.transfer(O) //transfer our mind to the cute little monkey if (connected) //inside dna thing var/obj/machinery/dna_scannernew/C = connected - O.loc = C + O.forceMove(C) C.occupant = O connected = null O.real_name = "monkey ([copytext(md5(M.real_name), 2, 6)])" @@ -72,7 +72,7 @@ O.set_stat(M.stat) O.a_intent = INTENT_HARM for (var/obj/item/implant/I in implants) - I.loc = O + I.forceMove(O) I.implanted = O // O.update_icon = 1 //queue a full icon update at next life() call qdel(M) @@ -87,7 +87,7 @@ var/list/implants = list() //Still preserving implants for(var/obj/item/implant/W in Mo) implants += W - W.loc = null + W.moveToNullspace() if(!connected) for(var/obj/item/W in (Mo.contents-implants)) Mo.drop_from_inventory(W) @@ -125,15 +125,14 @@ // for(var/obj/T in M) // qdel(T) - - O.loc = M.loc + O.forceMove(M.loc) if(M.mind) M.mind.transfer(O) //transfer our mind to the human if (connected) //inside dna thing var/obj/machinery/dna_scannernew/C = connected - O.loc = C + O.forceMove(C) C.occupant = O connected = null @@ -156,7 +155,7 @@ O.adjustOxyLoss(M.getOxyLoss()) O.set_stat(M.stat) for (var/obj/item/implant/I in implants) - I.loc = O + I.forceMove(O) I.implanted = O // O.update_icon = 1 //queue a full icon update at next life() call qdel(M) diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index bda5b29080..f442501cbe 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -54,9 +54,11 @@ src.visible_message("[src] stabs [T] with the proboscis!") to_chat(T, "You feel a sharp stabbing pain!") add_attack_logs(src,T,"Absorbed (changeling)") - var/obj/item/organ/external/affecting = T.get_organ(src.zone_sel.selecting) - if(affecting.take_damage(39,0,1,0,"large organic needle")) - T:UpdateDamageIcon() + T.take_targeted_damage( + brute = 39, + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_REDIRECT, + weapon_descriptor = "large biological needle", + ) feedback_add_details("changeling_powers","A[stage]") if(!do_mob(src, T, 150) || G.state != GRAB_KILL) diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index fec2083c9f..4a8a8cee4a 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -131,7 +131,7 @@ icon_state = "lingboots" armor_type = /datum/armor/changeling/chitin siemens_coefficient = 0.3 - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE diff --git a/code/game/gamemodes/changeling/powers/lesser_form.dm b/code/game/gamemodes/changeling/powers/lesser_form.dm index cf301b6a33..211f4c7708 100644 --- a/code/game/gamemodes/changeling/powers/lesser_form.dm +++ b/code/game/gamemodes/changeling/powers/lesser_form.dm @@ -92,7 +92,7 @@ for(var/obj/T in C) qdel(T) - O.loc = C.loc + O.forceMove(C.loc) O.UpdateAppearance() domutcheck(O, null) @@ -102,7 +102,7 @@ O.adjustFireLoss(C.getFireLoss()) O.set_stat(C.stat) for (var/obj/item/implant/I in implants) - I.loc = O + I.forceMove(O) I.implanted = O C.mind.transfer(O) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 0e293510bf..4520868c69 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -61,7 +61,7 @@ inv_hide_flags = HIDEFACE body_cover_flags = HEAD armor_type = /datum/armor/cult/robes - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 204aa61a5f..d0fb469fd4 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -303,7 +303,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," if(iscultist(target)) return NONE add_attack_logs(user, L, "Hit with [name]") - L.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit + L.take_random_targeted_damage(brute = 0, burn = rand(5,20)) //really lucky - 5 hits for a crit for(var/mob/O in viewers(L, null)) O.show_message("\The [user] beats \the [L] with \the [src]!", 1) to_chat(target, "You feel searing heat inside!") diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 00c7ab770e..0375200cba 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -283,7 +283,7 @@ var/list/sacrificed = list() for(var/obj/item/organ/E in H.bad_external_organs) var/obj/item/organ/external/affected = E // fix bones - if((affected.damage < affected.min_broken_damage * config_legacy.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN // fix IB affected.cure_specific_wound(/datum/wound/internal_bleeding, all = TRUE) @@ -434,7 +434,7 @@ var/list/sacrificed = list() L.ajourn=0 return else - L.take_organ_damage(3, 0) + L.take_random_targeted_damage(brute = 3, burn = 0) sleep(100) return fizzle() @@ -488,7 +488,7 @@ var/list/sacrificed = list() log_and_message_admins("used a manifest rune.") var/mob/living/user = usr while(this_rune && user && user.stat==CONSCIOUS && user.client && user.loc==this_rune.loc) - user.take_organ_damage(1, 0) + user.take_random_targeted_damage(brute = 1) sleep(30) if(D) D.visible_message("[D] slowly dissipates into dust and bones.", \ @@ -793,7 +793,7 @@ var/list/sacrificed = list() usr.say("Khari[pick("'","`")]d! Eske'te tannin!") src.density = !src.density var/mob/living/user = usr - user.take_organ_damage(2, 0) + user.take_random_targeted_damage(brute = 2) if(src.density) to_chat(usr, "Your blood flows into the rune, and you feel that the very space over the rune thickens.") else diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 253a9206c1..2f0c72a15d 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -38,7 +38,7 @@ if("supply") supply() var/mob/living/carbon/human/H = ishuman(user)? user : null - H?.take_organ_damage(5, 0) + H?.take_random_targeted_damage(brute = 5, burn = 0) if(src && src.imbue!="supply" && src.imbue!="runestun") if(delete) qdel(src) @@ -50,7 +50,7 @@ if(isliving(user) && iscultist(user)) var/mob/living/L = user if(imbue == "runestun") - L.take_organ_damage(5, 0) + L.take_random_targeted_damage(brute = 5, burn = 0) call(TYPE_PROC_REF(/obj/effect/rune, runestun))(target) qdel(src) return CLICKCHAIN_DO_NOT_PROPAGATE diff --git a/code/game/gamemodes/technomancer/devices/boots_of_speed.dm b/code/game/gamemodes/technomancer/devices/boots_of_speed.dm index a000ae841c..873451e389 100644 --- a/code/game/gamemodes/technomancer/devices/boots_of_speed.dm +++ b/code/game/gamemodes/technomancer/devices/boots_of_speed.dm @@ -13,7 +13,7 @@ siemens_coefficient = 0.6 slowdown = -1 - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE diff --git a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm index 502f070768..00630d77e3 100644 --- a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm +++ b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm @@ -15,9 +15,9 @@ icon_state = "regen" item_state = "graygloves" siemens_coefficient = 0 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/regen/equipped(mob/user, slot, flags) diff --git a/code/game/gamemodes/technomancer/spells/mend_organs.dm b/code/game/gamemodes/technomancer/spells/mend_organs.dm index 190c541f99..296afcc974 100644 --- a/code/game/gamemodes/technomancer/spells/mend_organs.dm +++ b/code/game/gamemodes/technomancer/spells/mend_organs.dm @@ -47,7 +47,7 @@ for(var/obj/item/organ/E in H.bad_external_organs) // Fix bones var/obj/item/organ/external/affected = E - if((affected.damage < affected.min_broken_damage * config_legacy.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN // fix IB diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index f29cacf09d..a79921b437 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -118,6 +118,8 @@ /// Can be anchored / unanchored by players without deconstructing by default with a wrench. null for off, number for time needed. // todo: proc for allow / disallow, refactor, unify with can_be_unanchored var/default_unanchor + /// default deconstruct requires panel open + var/default_deconstruct_requires_panel_open = TRUE /// tool used for deconstruction var/tool_deconstruct = TOOL_CROWBAR /// tool used for panel open diff --git a/code/game/machinery/_machinery_construction.dm b/code/game/machinery/_machinery_construction.dm index 025d3d1b21..2421f81633 100644 --- a/code/game/machinery/_machinery_construction.dm +++ b/code/game/machinery/_machinery_construction.dm @@ -3,7 +3,7 @@ /obj/machinery/dynamic_tool_query(obj/item/I, datum/event_args/actor/clickchain/e_args, list/hint_images = list()) . = list() - if(tool_deconstruct && !isnull(default_deconstruct) && panel_open) + if(tool_deconstruct && !isnull(default_deconstruct) && (!default_deconstruct_requires_panel_open || panel_open)) LAZYSET(.[tool_deconstruct], "deconstruct", dyntool_image_backward(tool_deconstruct)) if(tool_unanchor && !isnull(default_unanchor)) LAZYSET(.[tool_unanchor], anchored? "unanchor" : "anchor", anchored? dyntool_image_backward(tool_unanchor) : dyntool_image_forward(tool_unanchor)) @@ -15,7 +15,7 @@ if(INTERACTING_WITH_FOR(e_args.performer, src, INTERACTING_FOR_CONSTRUCTION)) return CLICKCHAIN_DO_NOT_PROPAGATE START_INTERACTING_WITH(e_args.performer, src, INTERACTING_FOR_CONSTRUCTION) - if(function == tool_deconstruct && !isnull(default_deconstruct)) + if(function == tool_deconstruct && !isnull(default_deconstruct) && (!default_deconstruct_requires_panel_open || panel_open)) if(default_deconstruction_dismantle(I, e_args, flags = flags)) . = CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE . = CLICKCHAIN_DO_NOT_PROPAGATE diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 8a232b6d31..44618bf10b 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -108,7 +108,7 @@ ui = new(user, src, "GeneralAtmoControl", name) ui.open() -/obj/machinery/computer/general_air_control/ui_data(mob/user) +/obj/machinery/computer/general_air_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/sensors_ui[0] if(sensors.len) @@ -144,7 +144,7 @@ var/pressure_setting = ONE_ATMOSPHERE * 45 circuit = /obj/item/circuitboard/air_management/tank_control -/obj/machinery/computer/general_air_control/large_tank_control/ui_data(mob/user) +/obj/machinery/computer/general_air_control/large_tank_control/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["tanks"] = 1 @@ -178,7 +178,7 @@ else ..(signal) -/obj/machinery/computer/general_air_control/large_tank_control/ui_act(action, params) +/obj/machinery/computer/general_air_control/large_tank_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -243,7 +243,7 @@ var/pressure_setting = 100 circuit = /obj/item/circuitboard/air_management/supermatter_core -/obj/machinery/computer/general_air_control/supermatter_core/ui_data(mob/user) +/obj/machinery/computer/general_air_control/supermatter_core/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["core"] = 1 @@ -279,7 +279,7 @@ else ..(signal) -/obj/machinery/computer/general_air_control/supermatter_core/ui_act(action, params) +/obj/machinery/computer/general_air_control/supermatter_core/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -372,7 +372,7 @@ ..() -/obj/machinery/computer/general_air_control/fuel_injection/ui_data(mob/user) +/obj/machinery/computer/general_air_control/fuel_injection/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["fuel"] = 1 data["automation"] = automation @@ -394,7 +394,7 @@ else ..(signal) -/obj/machinery/computer/general_air_control/fuel_injection/ui_act(action, params) +/obj/machinery/computer/general_air_control/fuel_injection/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 706e856847..6e870364fb 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -151,7 +151,7 @@ beaker = null update_appearance() -/obj/machinery/biogenerator/ui_status(mob/user) +/obj/machinery/biogenerator/ui_status(mob/user, datum/ui_state/state) if(machine_stat & BROKEN || panel_open) return UI_CLOSE return ..() @@ -162,7 +162,7 @@ ui = new(user, src, "Biogenerator", name) ui.open() -/obj/machinery/biogenerator/ui_data(mob/user) +/obj/machinery/biogenerator/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["build_eff"] = build_eff @@ -172,7 +172,7 @@ return data -/obj/machinery/biogenerator/ui_static_data(mob/user) +/obj/machinery/biogenerator/ui_static_data(mob/user, datum/tgui/ui) var/list/static_data[0] // Available items - in static data because we don't wanna compute this list every time! It hardly changes. @@ -186,7 +186,7 @@ return static_data -/obj/machinery/biogenerator/ui_act(action, list/params) +/obj/machinery/biogenerator/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/game/machinery/bomb_tester.dm b/code/game/machinery/bomb_tester.dm index ac36e0354b..070d81a1ff 100644 --- a/code/game/machinery/bomb_tester.dm +++ b/code/game/machinery/bomb_tester.dm @@ -117,7 +117,7 @@ ui = new(user, src, "BombTester", name) ui.open() -/obj/machinery/bomb_tester/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/bomb_tester/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["simulating"] = simulating diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 6ac42003ac..0ccf4f104f 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -23,6 +23,59 @@ return TRUE playsound(src, 'sound/machines/button.ogg', 100, TRUE) +/obj/machinery/button/windowtint + name = "window tint control" + icon = 'icons/obj/power.dmi' + icon_state = "light0" + desc = "A remote control switch for polarized windows." + var/range = 7 + +/obj/machinery/button/windowtint/attack_hand(mob/user, list/params) + if (..()) + return TRUE + else + toggle_tint() + +/obj/machinery/button/windowtint/proc/toggle_tint() + use_power(5) + + active = !active + update_appearance() + + for (var/obj/structure/window/reinforced/polarized/target_window in range(src, range)) + if (target_window.id == id || !target_window.id) + INVOKE_ASYNC(target_window, TYPE_PROC_REF(/obj/structure/window/reinforced/polarized, toggle)) + +/obj/machinery/button/windowtint/power_change() + ..() + if (active && !powered(power_channel)) + toggle_tint() + +/obj/machinery/button/windowtint/update_icon_state() + . = ..() + icon_state = "light[active]" + +/obj/machinery/button/windowtint/attackby(obj/item/object, mob/user) + if (istype(object, /obj/item/multitool)) + var/obj/item/multitool/MT = object + if (!id) + // If no ID is set yet (newly built button?) let them select an ID for first-time use! + var/new_id = tgui_input_text( + user = user, + message = "Enter the ID for the window.", + title = name, + ) + if (new_id && user.get_active_held_item() != object && in_range(src, user)) + id = new_id + to_chat(user, SPAN_NOTICE("The new ID of \the [src] is [id]")) + if (id) + // It already has an ID (or they just set one), buffer it for copying to windows. + to_chat(user, SPAN_NOTICE("You store \the [src] in \the [MT]'s buffer!")) + MT.connectable = src + MT.update_appearance() + return TRUE + return ..() + /obj/machinery/button/windowtint/multitint name = "tint control" desc = "A remote control switch for polarized windows and doors." @@ -37,8 +90,7 @@ if(W.id == src.id || !W.id) spawn(0) W.toggle() - for(var/obj/machinery/door/D in in_range) - if(D.icon_tinted) - if(D.id_tint == src.id || !D.id_tint) - spawn(0) - D.toggle() + for(var/obj/machinery/door/airlock/D in in_range) + if(D.glass && (D.id_tint == src.id)) + spawn(0) + D.toggle() diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 8e4958d14a..6a59c7a28a 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -1,7 +1,8 @@ +CREATE_WALL_MOUNTING_TYPES(/obj/machinery/camera) /obj/machinery/camera name = "security camera" desc = "It's used to monitor rooms." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/machinery/security_camera.dmi' icon_state = "camera" use_power = USE_POWER_ACTIVE idle_power_usage = 5 @@ -264,23 +265,6 @@ else icon_state = initial(icon_state) -/obj/machinery/camera/setDir(ndir) - . = ..() - base_pixel_x = 0 - base_pixel_y = 0 - var/turf/T = get_step(get_turf(src), turn(src.dir, 180)) - for(var/obj/O in T.contents) - if(O.density) - switch(dir) - if(SOUTH) - base_pixel_y = 21 - if(WEST) - base_pixel_x = 10 - if(EAST) - base_pixel_x = -10 - break - reset_pixel_offsets() - /obj/machinery/camera/proc/triggerCameraAlarm(duration = 0) alarm_on = 1 camera_alarm.triggerAlarm(loc, src, duration) @@ -312,24 +296,6 @@ see = hear(view_range, pos) return see -/atom/proc/auto_turn() - //Automatically turns based on nearby walls. - var/turf/simulated/wall/T = null - for(var/i = 1, i <= 8; i += i) - T = get_ranged_target_turf(src, i, 1) - if(istype(T)) - //If someone knows a better way to do this, let me know. -Giacom - switch(i) - if(NORTH) - src.setDir(SOUTH) - if(SOUTH) - src.setDir(NORTH) - if(WEST) - src.setDir(EAST) - if(EAST) - src.setDir(WEST) - break - //Return a working camera that can see a given mob //or null if none /proc/seen_by_camera(var/mob/M) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index ba756f64f2..9bff46e983 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -1,7 +1,7 @@ /obj/item/camera_assembly name = "camera assembly" desc = "A pre-fabricated security camera kit, ready to be assembled and mounted to a surface." - icon = 'icons/obj/monitors_vr.dmi' + icon = 'icons/machinery/security_camera.dmi' icon_state = "cameracase" w_class = ITEMSIZE_SMALL anchored = 0 @@ -35,7 +35,7 @@ anchored = 1 state = 1 update_icon() - auto_turn() + auto_orient_wallmount_single() return if(1) @@ -95,14 +95,10 @@ input = sanitizeSafe(input(usr, "How would you like to name the camera?", "Set Camera Name", camera_name ? camera_name : temptag), MAX_NAME_LEN) state = 4 - var/obj/machinery/camera/C = new(src.loc) - src.loc = C + var/obj/machinery/camera/auto_mount/C = new(src.loc) + forceMove(C) C.assembly = src - - C.auto_turn() - C.replace_networks(uniqueList(tempnetwork)) - C.c_tag = input for(var/i = 5; i >= 0; i -= 1) diff --git a/code/game/machinery/colormate.dm b/code/game/machinery/colormate.dm index 571635597c..1bb5aa7e0d 100644 --- a/code/game/machinery/colormate.dm +++ b/code/game/machinery/colormate.dm @@ -137,7 +137,7 @@ ui.set_autoupdate(FALSE) //This might be a bit intensive, better to not update it every few ticks ui.open() -/obj/machinery/gear_painter/ui_data(mob/user) +/obj/machinery/gear_painter/ui_data(mob/user, datum/tgui/ui) . = list() .["activemode"] = active_mode .["matrixcolors"] = list( @@ -167,7 +167,7 @@ else .["item"] = null -/obj/machinery/gear_painter/ui_act(action, params) +/obj/machinery/gear_painter/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 94e50904ce..e73cb84232 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -60,7 +60,7 @@ ui = new(user, src, "OperatingComputer", "Patient Monitor") ui.open() -/obj/machinery/computer/operating/ui_data(mob/user) +/obj/machinery/computer/operating/ui_data(mob/user, datum/tgui/ui) var/data[0] var/mob/living/carbon/human/occupant if(table) @@ -132,7 +132,7 @@ return data -/obj/machinery/computer/operating/ui_act(action, params) +/obj/machinery/computer/operating/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 123ea62006..ff694a8bba 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -59,7 +59,7 @@ ui = new(user, src, "AiRestorer", name) ui.open() -/obj/machinery/computer/aifixer/ui_data(mob/user) +/obj/machinery/computer/aifixer/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["ejectable"] = FALSE @@ -80,7 +80,7 @@ return data -/obj/machinery/computer/aifixer/ui_act(action, params) +/obj/machinery/computer/aifixer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if(!occupier) diff --git a/code/game/machinery/computer/arcade/claw_machine.dm b/code/game/machinery/computer/arcade/claw_machine.dm index 1ea2dcc61f..9d0e3bc741 100644 --- a/code/game/machinery/computer/arcade/claw_machine.dm +++ b/code/game/machinery/computer/arcade/claw_machine.dm @@ -174,7 +174,7 @@ ui.autoupdate = TRUE ui.open() -/obj/machinery/computer/arcade/clawmachine/ui_data(mob/user) +/obj/machinery/computer/arcade/clawmachine/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["wintick"] = wintick @@ -184,7 +184,7 @@ return data -/obj/machinery/computer/arcade/clawmachine/ui_act(action, params) +/obj/machinery/computer/arcade/clawmachine/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm index 49fb5b7480..c2cb41cefa 100644 --- a/code/game/machinery/computer/arcade/orion.dm +++ b/code/game/machinery/computer/arcade/orion.dm @@ -156,7 +156,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) get_asset_datum(/datum/asset/spritesheet/moods), ) -/obj/machinery/computer/arcade/orion_trail/ui_data(mob/user) +/obj/machinery/computer/arcade/orion_trail/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["gamestatus"] = gameStatus @@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) return data -/obj/machinery/computer/arcade/orion_trail/ui_static_data(mob/user) +/obj/machinery/computer/arcade/orion_trail/ui_static_data(mob/user, datum/tgui/ui) var/list/static_data = list() static_data["gamename"] = name static_data["emagged"] = obj_flags & OBJ_EMAGGED @@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) static_data["settlermoods"] = settlermoods return static_data -/obj/machinery/computer/arcade/orion_trail/ui_act(action, list/params) +/obj/machinery/computer/arcade/orion_trail/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 3a54262c39..d22cfb98a8 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -28,7 +28,7 @@ var/global/list/minor_air_alarms = list() ui = new(user, src, "AtmosAlertConsole", name) ui.open() -/obj/machinery/computer/atmos_alert/ui_data(mob/user) +/obj/machinery/computer/atmos_alert/ui_data(mob/user, datum/tgui/ui) . = ..() var/list/major_alarms = list() var/list/minor_alarms = list() @@ -58,7 +58,7 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert/proc/on_alarm_update() update_icon() -/obj/machinery/computer/atmos_alert/ui_act(action, params) +/obj/machinery/computer/atmos_alert/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/command/card.dm b/code/game/machinery/computer/command/card.dm index 916d9cdf71..2428138350 100644 --- a/code/game/machinery/computer/command/card.dm +++ b/code/game/machinery/computer/command/card.dm @@ -21,7 +21,7 @@ QDEL_NULL(tgui_cardmod) return ..() -/obj/machinery/computer/card/ui_module_route(action, list/params, datum/tgui/ui, id) +/obj/machinery/computer/card/ui_route(action, list/params, datum/tgui/ui, id) . = ..() if(.) return @@ -29,14 +29,6 @@ if("modify") return tgui_cardmod.ui_act(action, params, ui) -/obj/machinery/computer/card/ui_module_data(mob/user, datum/tgui/ui, datum/ui_state/state) - . = ..() - .["modify"] = tgui_cardmod.data(user, editing, authing) - -/obj/machinery/computer/card/ui_module_static(mob/user, datum/tgui/ui, datum/ui_state/state) - . = ..() - .["modify"] = tgui_cardmod.static_data(user, editing, authing) - /** * for later use: authorized to change slots */ @@ -116,16 +108,17 @@ ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "IdentificationComputer", name) + ui.register_module(tgui_cardmod, "modify") ui.open() -/obj/machinery/computer/card/ui_static_data(mob/user) +/obj/machinery/computer/card/ui_static_data(mob/user, datum/tgui/ui) . = ..() //? manifest // todo: refactor PDA_Manifest and CrewManifest.js data_core.get_manifest_list() .["manifest"] = GLOB.PDA_Manifest -/obj/machinery/computer/card/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/card/ui_data(mob/user, datum/tgui/ui) . = ..() //? general diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index c9ab693d76..cde5b1d9c1 100755 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -115,7 +115,7 @@ deltimer(print_timer) print_timer = null -/obj/machinery/computer/guestpass/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/guestpass/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["access"] = SSjob.tgui_access_data() .["allowed"] = allowed_accesses() @@ -124,7 +124,7 @@ .["durationMin"] = min_duration .["auth"] = tgui_inserted_card() -/obj/machinery/computer/guestpass/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/guestpass/ui_data(mob/user, datum/tgui/ui) . = ..() .["guestName"] = guest_name .["guestReason"] = guest_reason diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 53e2f84637..1867b9da43 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -116,7 +116,7 @@ ui.set_autoupdate(FALSE) -/obj/machinery/computer/med_data/ui_data(mob/user) +/obj/machinery/computer/med_data/ui_data(mob/user, datum/tgui/ui) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -202,7 +202,7 @@ data["modal"] = ui_modal_data(src) return data -/obj/machinery/computer/med_data/ui_act(action, params) +/obj/machinery/computer/med_data/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/misc/bioscan.dm b/code/game/machinery/computer/misc/bioscan.dm index 73d22e9764..3811989d5f 100644 --- a/code/game/machinery/computer/misc/bioscan.dm +++ b/code/game/machinery/computer/misc/bioscan.dm @@ -25,7 +25,7 @@ ui = new(user, src, "BioscanConsole") ui.open() -/obj/machinery/computer/bioscan/ui_static_data(mob/user) +/obj/machinery/computer/bioscan/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["scan"] = buffer .["antennas"] = ui_antenna_data() @@ -46,12 +46,12 @@ "y" = T.y, )) -/obj/machinery/computer/bioscan/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/bioscan/ui_data(mob/user, datum/tgui/ui) . = ..() .["scan_ready"] = !on_cooldown() .["network"] = network_key || "" -/obj/machinery/computer/bioscan/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/bioscan/ui_act(action, list/params, datum/tgui/ui) . = ..() switch(action) if("scan") diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 3454c1ab93..9171a6cf61 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -27,7 +27,7 @@ ui = new(user, src, "PrisonerManagement", name) ui.open() -/obj/machinery/computer/prisoner/ui_data(mob/user) +/obj/machinery/computer/prisoner/ui_data(mob/user, datum/tgui/ui) var/list/chemImplants = list() var/list/trackImplants = list() if(screen) @@ -64,7 +64,7 @@ return list("locked" = !screen, "chemImplants" = chemImplants, "trackImplants" = trackImplants) -/obj/machinery/computer/prisoner/ui_act(action, list/params) +/obj/machinery/computer/prisoner/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 818dd977ac..477ab3ec77 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -121,7 +121,7 @@ ui = new(user, src, "RoboticsControlConsole", name) ui.open() -/obj/machinery/computer/robotics/ui_data(mob/user) +/obj/machinery/computer/robotics/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["auth"] = is_authenticated(user) data["can_hack"] = can_hack_any(user) @@ -150,7 +150,7 @@ data["show_detonate_all"] = (data["auth"] && length(data["cyborgs"]) > 0 && ishuman(user)) return data -/obj/machinery/computer/robotics/ui_act(action, params) +/obj/machinery/computer/robotics/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE . = FALSE diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 10cdd39ca8..edfeb3565c 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -101,7 +101,7 @@ ui.set_autoupdate(FALSE) -/obj/machinery/computer/secure_data/ui_data(mob/user) +/obj/machinery/computer/secure_data/ui_data(mob/user, datum/tgui/ui) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -185,7 +185,7 @@ data["modal"] = ui_modal_data(src) return data -/obj/machinery/computer/secure_data/ui_act(action, params) +/obj/machinery/computer/secure_data/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 88b58a19ec..e026411a30 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -80,7 +80,7 @@ ui.open() ui.set_autoupdate(FALSE) -/obj/machinery/computer/skills/ui_data(mob/user) +/obj/machinery/computer/skills/ui_data(mob/user, datum/tgui/ui) var/data[0] data["temp"] = temp @@ -134,7 +134,7 @@ data["modal"] = ui_modal_data(src) return data -/obj/machinery/computer/skills/ui_act(action, params) +/obj/machinery/computer/skills/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 1b8cdfdd51..a9aa2308ff 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -77,7 +77,7 @@ ui = new(user, src, "TimeClock", name) ui.open() -/obj/machinery/computer/timeclock/ui_data(mob/user) +/obj/machinery/computer/timeclock/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() // Okay, data for showing the user's OWN PTO stuff diff --git a/code/game/machinery/doors/airlock/airlock.dm b/code/game/machinery/doors/airlock/airlock.dm index c89103137b..f587a639b8 100644 --- a/code/game/machinery/doors/airlock/airlock.dm +++ b/code/game/machinery/doors/airlock/airlock.dm @@ -100,9 +100,8 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( var/color_fill_file = 'icons/obj/doors/station/fill_color.dmi' var/stripe_file = 'icons/obj/doors/station/stripe.dmi' var/stripe_fill_file = 'icons/obj/doors/station/fill_stripe.dmi' - var/glass_file = 'icons/obj/doors/station/fill_glass.dmi' + //var/glass_file = 'icons/obj/doors/station/fill_glass.dmi' var/bolts_file = 'icons/obj/doors/station/lights_bolts.dmi' - var/deny_file = 'icons/obj/doors/station/lights_deny.dmi' var/lights_file = 'icons/obj/doors/station/lights_green.dmi' var/panel_file = 'icons/obj/doors/station/panel.dmi' var/sparks_damaged_file = 'icons/obj/doors/station/sparks_damaged.dmi' @@ -115,7 +114,8 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( /// Bandaid around a problem. var/last_spark = 0 - + var/tinted + var/id_tint /obj/machinery/door/airlock/proc/set_airlock_overlays(state) var/icon/color_overlay @@ -138,26 +138,21 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( color_overlay = new(color_file) color_overlay.Blend(door_color, ICON_MULTIPLY) GLOB.airlock_icon_cache["[ikey]"] = color_overlay - if(glass) - if (window_color && window_color != "none") - var/ikey = "[airlock_type]-[window_color]-windowcolor" - filling_overlay = GLOB.airlock_icon_cache["[ikey]"] - if (!filling_overlay) - filling_overlay = new(glass_file) + + if(door_color && !(door_color == "none")) + var/ikey = "[airlock_type]-[door_color]-fillcolor-[glass]" + filling_overlay = GLOB.airlock_icon_cache["[ikey]"] + if(!filling_overlay) + filling_overlay = new(fill_file) + if(!glass || tinted) + filling_overlay.Blend(door_color, ICON_MULTIPLY) + else filling_overlay.Blend(window_color, ICON_MULTIPLY) - GLOB.airlock_icon_cache["[ikey]"] = filling_overlay - else - filling_overlay = glass_file + GLOB.airlock_icon_cache["[ikey]"] = filling_overlay else - if(door_color && !(door_color == "none")) - var/ikey = "[airlock_type]-[door_color]-fillcolor" - filling_overlay = GLOB.airlock_icon_cache["[ikey]"] - if(!filling_overlay) - filling_overlay = new(color_fill_file) - filling_overlay.Blend(door_color, ICON_MULTIPLY) - GLOB.airlock_icon_cache["[ikey]"] = filling_overlay - else - filling_overlay = fill_file + filling_overlay = fill_file + + if(stripe_color && !(stripe_color == "none")) var/ikey = "[airlock_type]-[stripe_color]-stripe" stripe_overlay = GLOB.airlock_icon_cache["[ikey]"] @@ -180,11 +175,6 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( lights_overlay = bolts_file set_light(1, 2, l_color = COLOR_RED_LIGHT) - if(AIRLOCK_DENY) - if(lights) - lights_overlay = deny_file - set_light(1, 2, l_color = COLOR_RED_LIGHT) - if(AIRLOCK_EMAG) sparks_overlay = emag_file @@ -223,6 +213,7 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( sparks_overlay, damage_overlay, )) + compile_overlays() /obj/machinery/door/airlock/attack_generic(var/mob/living/user, var/damage) // todo: refactor @@ -559,7 +550,7 @@ About the new airlock wires panel: ui.open() return TRUE -/obj/machinery/door/airlock/ui_data(mob/user) +/obj/machinery/door/airlock/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/power = list() @@ -666,14 +657,14 @@ About the new airlock wires panel: src.attack_alien(user) return - if(src.p_open) + if(src.panel_open) user.set_machine(src) wires.Interact(user) else ..(user) return -/obj/machinery/door/airlock/ui_act(action, params) +/obj/machinery/door/airlock/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if(!user_allowed(usr)) @@ -774,7 +765,7 @@ About the new airlock wires panel: open() /obj/machinery/door/airlock/proc/can_remove_electronics() - return src.p_open && (operating < 0 || (!operating && welded && !src.arePowerSystemsOn() && density && (!src.locked || (machine_stat & BROKEN)))) + return src.panel_open && (operating < 0 || (!operating && welded && !src.arePowerSystemsOn() && density && (!src.locked || (machine_stat & BROKEN)))) /obj/machinery/door/airlock/attackby(obj/item/C, mob/user as mob) //TO_WORLD("airlock attackby src [src] obj [C] mob [user]") @@ -801,14 +792,14 @@ About the new airlock wires panel: else return else if(C.is_screwdriver()) - if (src.p_open) + if (src.panel_open) if (machine_stat & BROKEN) to_chat(usr, "The panel is broken and cannot be closed.") else - src.p_open = 0 + src.panel_open = 0 playsound(src, C.tool_sound, 50, 1) else - src.p_open = 1 + src.panel_open = 1 playsound(src, C.tool_sound, 50, 1) src.update_icon() else if(C.is_wirecutter()) @@ -869,7 +860,7 @@ About the new airlock wires panel: ..() /obj/machinery/door/airlock/atom_break() - src.p_open = 1 + src.panel_open = 1 if (secured_wires) lock() . = ..() @@ -927,6 +918,16 @@ About the new airlock wires panel: LEGACY_EX_ACT(killthis, 2, null)//Smashin windows return ..() +/obj/machinery/door/airlock/set_opacity_on_close() + if(visible) + if(glass) + if(tinted) + set_opacity(1) + else + set_opacity(0) + else + set_opacity(1) + /obj/machinery/door/airlock/can_open(var/forced=0) if(!forced) if(!arePowerSystemsOn() || wires.is_cut(WIRE_OPEN_DOOR)) @@ -1178,6 +1179,19 @@ About the new airlock wires panel: src.lock() return +/obj/machinery/door/airlock/proc/toggle() + if(!glass) + return + tinted = !tinted + if(tinted) + icon = initial(icon) + if(!operating && density) + set_opacity(1) + else + if(!operating) + set_opacity(0) + + set_airlock_overlays(src.state) /obj/machinery/door/airlock/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) diff --git a/code/game/machinery/doors/airlock/airlock_control.dm b/code/game/machinery/doors/airlock/airlock_control.dm index 90960165da..5ecef8d2e2 100644 --- a/code/game/machinery/doors/airlock/airlock_control.dm +++ b/code/game/machinery/doors/airlock/airlock_control.dm @@ -163,7 +163,9 @@ var/on = 1 var/alert = 0 - var/previousPressure + var/previous_pressure + var/previous_phoron + var/previous_temperature /obj/machinery/airlock_sensor/update_icon() if(on) @@ -183,21 +185,39 @@ radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) flick("airlock_sensor_cycle", src) +// Checks the change of the values, if the change is sufficently large on any of them, send a new signal +/obj/machinery/airlock_sensor/proc/delta_check(var/new_pressure, var/new_phoron, var/new_temperature) + if(previous_pressure == null || previous_phoron == null || previous_temperature == null) + return 1 + if(abs(new_pressure - previous_pressure) > 0.1) + return 1 + if(abs(new_phoron - previous_phoron) > 0.1) + return 1 + if(abs(previous_temperature - previous_temperature) > 0.1) + return 1 + return 0 + /obj/machinery/airlock_sensor/process(delta_time) if(on) var/datum/gas_mixture/air_sample = return_air() var/pressure = round(air_sample.return_pressure(),0.1) + var/phoron = (GAS_ID_PHORON in air_sample.gas) ? round(air_sample.gas[GAS_ID_PHORON], 0.1) : 0 + var/temperature = round(air_sample.temperature, 0.1) - if(abs(pressure - previousPressure) > 0.001 || previousPressure == null) + if(delta_check(pressure, phoron, temperature)) var/datum/signal/signal = new signal.transmission_method = TRANSMISSION_RADIO //radio signal signal.data["tag"] = id_tag signal.data["timestamp"] = world.time signal.data["pressure"] = num2text(pressure) + signal.data["phoron"] = num2text(phoron) + signal.data["temperature"] = num2text(temperature) radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) - previousPressure = pressure + previous_pressure = pressure + previous_phoron = phoron + previous_temperature = temperature alert = (pressure < ONE_ATMOSPHERE*0.8) @@ -218,10 +238,10 @@ return ..() /obj/machinery/airlock_sensor/airlock_interior - command = "cycle_interior" + command = "cycle_int" /obj/machinery/airlock_sensor/airlock_exterior - command = "cycle_exterior" + command = "cycle_ext" // Return the air from the turf in "front" of us (Used in shuttles, so it can be in the shuttle area but sense outside it) /obj/machinery/airlock_sensor/airlock_exterior/shuttle/return_air() @@ -292,8 +312,8 @@ /obj/machinery/access_button/airlock_interior frequency = 1379 - command = "cycle_interior" + command = "cycle_int" /obj/machinery/access_button/airlock_exterior frequency = 1379 - command = "cycle_exterior" + command = "cycle_ext" diff --git a/code/game/machinery/doors/airlock/airlock_electronics.dm b/code/game/machinery/doors/airlock/airlock_electronics.dm index 398eef26b6..987aecfb27 100644 --- a/code/game/machinery/doors/airlock/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock/airlock_electronics.dm @@ -16,11 +16,11 @@ ui = new(user, src, "AirlockElectronics") ui.open() -/obj/item/airlock_electronics/ui_static_data(mob/user) +/obj/item/airlock_electronics/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["access"] = SSjob.tgui_access_data() -/obj/item/airlock_electronics/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/airlock_electronics/ui_data(mob/user, datum/tgui/ui) . = ..() .["req_access"] = conf_req_access || list() .["req_one_access"] = conf_req_one_access || list() diff --git a/code/game/machinery/doors/airlock/airlock_subtypes.dm b/code/game/machinery/doors/airlock/airlock_subtypes.dm index fba2e5a6eb..4c77563600 100644 --- a/code/game/machinery/doors/airlock/airlock_subtypes.dm +++ b/code/game/machinery/doors/airlock/airlock_subtypes.dm @@ -96,13 +96,15 @@ fill_file = 'icons/obj/doors/external/fill_steel.dmi' color_file = 'icons/obj/doors/external/color.dmi' color_fill_file = 'icons/obj/doors/external/fill_color.dmi' - glass_file = 'icons/obj/doors/external/fill_glass.dmi' bolts_file = 'icons/obj/doors/external/lights_bolts.dmi' - deny_file = 'icons/obj/doors/external/lights_deny.dmi' lights_file = 'icons/obj/doors/external/lights_green.dmi' emag_file = 'icons/obj/doors/external/emag.dmi' door_color = COLOR_NT_RED +/obj/machinery/door/airlock/external/glass + name = "External Glass Airlock" + fill_file = 'icons/obj/doors/external/fill_glass.dmi' + /obj/machinery/door/airlock/external/glass/bolted window_color = GLASS_COLOR icon_state = "door_locked" // So it looks visibly bolted in map editor @@ -116,12 +118,10 @@ name = "External Airlock" airlock_type = "GExternal" icon = 'icons/obj/doors/external/door.dmi' - fill_file = 'icons/obj/doors/external/fill_steel.dmi' + fill_file = 'icons/obj/doors/external/fill_glass.dmi' color_file = 'icons/obj/doors/external/color.dmi' color_fill_file = 'icons/obj/doors/external/fill_color.dmi' - glass_file = 'icons/obj/doors/external/fill_glass.dmi' bolts_file = 'icons/obj/doors/external/lights_bolts.dmi' - deny_file = 'icons/obj/doors/external/lights_deny.dmi' lights_file = 'icons/obj/doors/external/lights_green.dmi' emag_file = 'icons/obj/doors/external/emag.dmi' opacity = FALSE @@ -143,7 +143,9 @@ explosion_resistance = 5 opacity = FALSE glass = TRUE + tinted = FALSE window_color = GLASS_COLOR + fill_file = 'icons/obj/doors/station/fill_glass.dmi' /obj/machinery/door/airlock/centcom name = "Centcom Airlock" @@ -174,6 +176,7 @@ close_sound_powered = 'sound/machines/door/vault1c.ogg' icon = 'icons/obj/doors/vault/door.dmi' fill_file = 'icons/obj/doors/vault/fill_steel.dmi' + panel_file = 'icons/obj/doors/vault/panel.dmi' heat_resistance = 6000 /obj/machinery/door/airlock/vault/bolted @@ -201,7 +204,6 @@ stripe_file = 'icons/obj/doors/hatch/stripe.dmi' stripe_fill_file = 'icons/obj/doors/hatch/fill_stripe.dmi' bolts_file = 'icons/obj/doors/hatch/lights_bolts.dmi' - deny_file = 'icons/obj/doors/hatch/lights_deny.dmi' lights_file = 'icons/obj/doors/hatch/lights_green.dmi' panel_file = 'icons/obj/doors/hatch/panel.dmi' welded_file = 'icons/obj/doors/hatch/welded.dmi' @@ -224,7 +226,6 @@ stripe_file = 'icons/obj/doors/hatch/stripe.dmi' stripe_fill_file = 'icons/obj/doors/hatch/fill_stripe.dmi' bolts_file = 'icons/obj/doors/hatch/lights_bolts.dmi' - deny_file = 'icons/obj/doors/hatch/lights_deny.dmi' lights_file = 'icons/obj/doors/hatch/lights_green.dmi' panel_file = 'icons/obj/doors/hatch/panel.dmi' welded_file = 'icons/obj/doors/hatch/welded.dmi' diff --git a/code/game/machinery/doors/airlock/airlock_vr.dm b/code/game/machinery/doors/airlock/airlock_vr.dm index 858ce86170..114dec9f56 100644 --- a/code/game/machinery/doors/airlock/airlock_vr.dm +++ b/code/game/machinery/doors/airlock/airlock_vr.dm @@ -23,12 +23,9 @@ /obj/machinery/door/airlock/glass/security/polarized name = "Electrochromic Security Airlock" - icon_tinted = 'icons/obj/doors/Doorsectinted_vr.dmi' /obj/machinery/door/airlock/glass/medical/polarized name = "Electrochromic Medical Airlock" - icon_tinted = 'icons/obj/doors/doormedtinted_vr.dmi' /obj/machinery/door/airlock/glass/command/polarized name = "Electrochormic Command Airlock" - icon_tinted = 'icons/obj/doors/Doorcomtinted_vr.dmi' diff --git a/code/game/machinery/doors/airlock/phoronlocks.dm b/code/game/machinery/doors/airlock/phoronlocks.dm index 28400e95cb..54fe5e4b89 100644 --- a/code/game/machinery/doors/airlock/phoronlocks.dm +++ b/code/game/machinery/doors/airlock/phoronlocks.dm @@ -17,38 +17,19 @@ icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_sensor_off" name = "phoronlock sensor" - var/previousPhoron - -/obj/machinery/airlock_sensor/phoron/process() - if(on) - var/datum/gas_mixture/air_sample = return_air() - var/pressure = round(air_sample.return_pressure(), 0.1) - var/phoron = (GAS_ID_PHORON in air_sample.gas) ? round(air_sample.gas[GAS_ID_PHORON], 0.1) : 0 - - if(abs(pressure - previousPressure) > 0.1 || previousPressure == null || abs(phoron - previousPhoron) > 0.1 || previousPhoron == null) - var/datum/signal/signal = new - signal.transmission_method = TRANSMISSION_RADIO //radio signal - signal.data["tag"] = id_tag - signal.data["timestamp"] = world.time - signal.data["pressure"] = num2text(pressure) - signal.data["phoron"] = num2text(phoron) - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) - previousPressure = pressure - previousPhoron = phoron - alert = (pressure < ONE_ATMOSPHERE*0.8) || (phoron > 0.5) - update_icon() /obj/machinery/airlock_sensor/phoron/airlock_interior - command = "cycle_interior" + command = "cycle_int" /obj/machinery/airlock_sensor/phoron/airlock_exterior - command = "cycle_exterior" + command = "cycle_ext" // Radio remote control /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary var/frequency = 0 var/datum/radio_frequency/radio_connection + scrubbing_ids = list("phoron", "co2") /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize(mapload) . = ..() @@ -116,9 +97,6 @@ // // PHORON LOCK CONTROLLER // -/obj/machinery/embedded_controller/radio/airlock/phoron - var/tag_scrubber - /obj/machinery/embedded_controller/radio/airlock/phoron/Initialize(mapload) . = ..() program = new/datum/computer/file/embedded_program/airlock/phoron(src) @@ -127,11 +105,13 @@ /obj/machinery/embedded_controller/radio/airlock/phoron name = "Phoron Lock Controller" valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "secure") + var/tag_scrubber -/obj/machinery/embedded_controller/radio/airlock/phoron/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/phoron/ui_data(mob/user, datum/tgui/ui) . = list( "chamber_pressure" = program.memory["chamber_sensor_pressure"], "chamber_phoron" = program.memory["chamber_sensor_phoron"], + "chamber_temperature" = round(program.memory["chamber_sensor_temperature"] - 273.15, 0.1), "exterior_status" = program.memory["exterior_status"], "interior_status" = program.memory["interior_status"], "processing" = program.memory["processing"], @@ -144,15 +124,6 @@ //Handles the control of airlocks -#define STATE_IDLE 0 -#define STATE_PREPARE 1 -#define STATE_CLEAN 16 -#define STATE_PRESSURIZE 17 - -#define TARGET_NONE 0 -#define TARGET_INOPEN -1 -#define TARGET_OUTOPEN -2 - /datum/computer/file/embedded_program/airlock/phoron var/tag_scrubber @@ -164,6 +135,7 @@ memory["external_sensor_pressure"] = 82.4 memory["external_sensor_phoron"] = (82.4*CELL_VOLUME) / (8.134 * 234) // n = pv/rt memory["internal_sensor_phoron"] = 0 + memory["target_temperature"] = T20C memory["scrubber_status"] = "unknown" memory["target_phoron"] = 0.1 memory["secure"] = 1 @@ -178,14 +150,19 @@ if(..()) return 1 if(receive_tag==tag_chamber_sensor) - memory["chamber_sensor_phoron"] = text2num(signal.data["phoron"]) - memory["chamber_sensor_pressure"] = text2num(signal.data["pressure"]) + memory["chamber_sensor_phoron"] = round(text2num(signal.data["phoron"]), 0.1) + memory["chamber_sensor_pressure"] = round(text2num(signal.data["pressure"]), 0.1) + memory["chamber_sensor_temperature"] = round(text2num(signal.data["temperature"]), 0.1) else if(receive_tag==tag_exterior_sensor) - memory["external_sensor_phoron"] = text2num(signal.data["phoron"]) + memory["external_sensor_phoron"] = round(text2num(signal.data["phoron"]), 0.1) + memory["external_sensor_pressure"] = round(text2num(signal.data["pressure"]), 0.1) + memory["external_sensor_temperature"] = round(text2num(signal.data["temperature"]), 0.1) else if(receive_tag==tag_interior_sensor) - memory["internal_sensor_phoron"] = text2num(signal.data["phoron"]) + memory["internal_sensor_phoron"] = round(text2num(signal.data["phoron"]), 0.1) + memory["internal_sensor_pressure"] = round(text2num(signal.data["pressure"]), 0.1) + memory["internal_sensor_temperature"] = round(text2num(signal.data["temperature"]), 0.1) else if(receive_tag==tag_scrubber) if(signal.data["power"]) @@ -198,88 +175,60 @@ // But lets evaluate how it actually works in the game. /datum/computer/file/embedded_program/airlock/phoron/process() switch(state) - if(STATE_IDLE) - if(target_state == TARGET_INOPEN) - // TODO - Check if okay to just open immediately - close_doors() - state = STATE_PREPARE - else if(target_state == TARGET_OUTOPEN) - close_doors() - state = STATE_PREPARE - // else if(memory["scrubber_status"] != "off") - // signalScrubber(tag_scrubber, 0) // Keep scrubbers off while idle - // else if(memory["pump_status"] != "off") - // signalPump(tag_airpump, 0) // Keep vent pump off while idle - - if(STATE_PREPARE) - if (check_doors_secured()) - if(target_state == TARGET_INOPEN) - playsound(master, 'sound/AI/airlockin.ogg', 100, 0) - if(memory["chamber_sensor_phoron"] > memory["target_phoron"]) - state = STATE_CLEAN - signalScrubber(tag_scrubber, 1) // Start cleaning - signalPump(tag_airpump, 1, 1, memory["target_pressure"]) // And pressurizng to offset losses - else // We can go directly to pressurize - state = STATE_PRESSURIZE - signalPump(tag_airpump, 1, 1, memory["target_pressure"]) // Send a signal to start pressurizing - // We must be cycling outwards! Shut down the pumps and such! - else if(memory["scrubber_status"] != "off") - signalScrubber(tag_scrubber, 0) - else if(memory["pump_status"] != "off") - signalPump(tag_airpump, 0) - else - playsound(master, 'sound/AI/airlockout.ogg', 100, 0) - cycleDoors(target_state) - state = STATE_IDLE - target_state = TARGET_NONE - - if(STATE_CLEAN) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) - if(!check_doors_secured()) - //the airlock will not allow itself to continue to cycle when any of the doors are forced open. - stop_cycling() - else if(memory["chamber_sensor_phoron"] <= memory["target_phoron"]) - // Okay, we reached target phoron! Turn off the scrubber + if(STATE_UNDEFINED) + return + if(STATE_CLOSED)//First the three stable states: + return + if(STATE_OPEN_IN) + return + if(STATE_OPEN_OUT) + return + if(STATE_CYCLING_IN)//Now the changing states: + if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + else if(fuzzy_smaller_check(memory["target_phoron"], memory["chamber_sensor_phoron"], 0))//target phoron is already 0.1 + signalScrubber(tag_scrubber, 1) // Start cleaning + signalPump(tag_airpump, 1, 1, memory["target_pressure"]) // And pressurizng to offset losses + memory["processing"] = TRUE + else if(fuzzy_smaller_check(memory["chamber_sensor_temperature"], memory["target_temperature"])) + signalScrubber(tag_scrubber, 1)//the scrubbers also work as heats because fuck making sense + memory["processing"] = TRUE + else if(fuzzy_smaller_check(memory["chamber_sensor_pressure"], memory["internal_sensor_pressure"])) + signalScrubber(tag_scrubber, 0) // stop cleaning + signalPump(tag_airpump, 1, 1, memory["target_pressure"]) // continue pressurizng to offset losses + memory["processing"] = TRUE + else // both phoron and pressure levels are acceptable + toggleDoor(memory["interior_status"],tag_interior_door, 1, "open") signalScrubber(tag_scrubber, 0) - // And proceed to finishing pressurization - state = STATE_PRESSURIZE - - if(STATE_PRESSURIZE) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) - if(!check_doors_secured()) - //the airlock will not allow itself to continue to cycle when any of the doors are forced open. - stop_cycling() - else if(memory["chamber_sensor_pressure"] >= memory["target_pressure"] * 0.95) - signalPump(tag_airpump, 0) // send a signal to stop pumping. No need to wait for it tho. - cycleDoors(target_state) - playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) - state = STATE_IDLE - target_state = TARGET_NONE - - memory["processing"] = (state != target_state) + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_IN + memory["processing"] = FALSE + if(STATE_CYCLING_OUT) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else if((memory["chamber_sensor_pressure"] - memory["external_sensor_pressure"]) > 1 ) + signalPump(tag_airpump, 1, 0, memory["external_sensor_pressure"]) // siphon air out to avoid being pulled from your feet + memory["processing"] = TRUE + else if(memory["interior_status"]["state"] == "open") //double check + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else // pressure levels are acceptable and interior doors are closed + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "open") + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_OUT + memory["processing"] = FALSE + if(STATE_SEALING) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + memory["processing"] = TRUE + else if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + memory["processing"] = TRUE + else + state = STATE_CLOSED + memory["processing"] = FALSE return 1 -/datum/computer/file/embedded_program/airlock/phoron/stop_cycling() - state = STATE_IDLE - target_state = TARGET_NONE - signalPump(tag_airpump, 0) - signalScrubber(tag_scrubber, 0) - -/datum/computer/file/embedded_program/airlock/phoron/proc/signalScrubber(var/tag, var/power) - var/datum/signal/signal = new - signal.data = list( - "tag" = tag, - "sigtype" = "command", - "power" = "[power]", - ) - post_signal(signal) - - -#undef STATE_IDLE -#undef STATE_PREPARE -#undef STATE_CLEAN -#undef STATE_PRESSURIZE +/datum/computer/file/embedded_program/airlock/phoron/stop_everything() + . = ..() + signalScrubber(tag_scrubber, 0)//Turn off scrubbers -#undef TARGET_NONE -#undef TARGET_INOPEN -#undef TARGET_OUTOPEN diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 6380048ff7..645acadfb2 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -27,10 +27,9 @@ var/closed_layer = DOOR_CLOSED_LAYER var/visible = 1 - var/p_open = 0//[bool]is the door open? var/operating = 0//[bool]Is the door opening or closing? var/autoclose = 0//[bool]should the door close automaticly - var/glass = 0 + var/glass = 0 //[bool] is the door see-through? var/normalspeed = 1 var/heat_resistance = 1000 // For glass airlocks/opacity firedoors var/air_properties_vary_with_direction = 0 @@ -46,9 +45,7 @@ var/atom/movable/overlay/c_animation = null var/reinforcing = 0 - var/tintable = 0 - var/icon_tinted - var/id_tint + /obj/machinery/door/Initialize(mapload, newdir) . = ..() @@ -100,7 +97,7 @@ /obj/machinery/door/Bumped(atom/AM) . = ..() - if(p_open || operating) + if(panel_open || operating) return if(ismob(AM)) var/mob/M = AM @@ -311,12 +308,12 @@ /obj/machinery/door/proc/do_animate(animation) switch(animation) if(DOOR_ANIMATION_OPEN) - if(p_open) + if(panel_open) flick("o_doorc0", src) else flick("doorc0", src) if(DOOR_ANIMATION_CLOSE) - if(p_open) + if(panel_open) flick("o_doorc1", src) else flick("doorc1", src) @@ -368,8 +365,8 @@ update_nearby_tiles() sleep(7) update_icon() - if(visible && !glass) - set_opacity(1) //caaaaarn! + set_opacity_on_close() + rad_insulation = initial(rad_insulation) operating = 0 @@ -380,6 +377,10 @@ return 1 +/obj/machinery/door/proc/set_opacity_on_close() + if(visible && !glass) + set_opacity(1) + /obj/machinery/door/proc/toggle_open(var/forced) if(density) open(forced) diff --git a/code/game/machinery/doors/door_timer.dm b/code/game/machinery/doors/door_timer.dm index 6b85947e5c..e45245f39a 100644 --- a/code/game/machinery/doors/door_timer.dm +++ b/code/game/machinery/doors/door_timer.dm @@ -212,7 +212,7 @@ ui = new(user, src, "BrigTimer", name) ui.open() -/obj/machinery/door_timer/ui_data() +/obj/machinery/door_timer/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/time_left = time_left(seconds = TRUE) data["seconds"] = round(time_left % 60) @@ -229,7 +229,7 @@ break return data -/obj/machinery/door_timer/ui_act(action, params) +/obj/machinery/door_timer/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/game/machinery/doors/door_vr.dm b/code/game/machinery/doors/door_vr.dm index e2d1eae616..dee9c5e42e 100644 --- a/code/game/machinery/doors/door_vr.dm +++ b/code/game/machinery/doors/door_vr.dm @@ -61,30 +61,3 @@ return TRUE return FALSE - -/obj/machinery/door/proc/toggle() - if(glass) - icon = icon_tinted - glass = 0 - if(!operating && density) - set_opacity(1) - else - icon = initial(icon) - glass = 1 - if(!operating) - set_opacity(0) - -/obj/machinery/button/windowtint/doortint - name = "door tint control" - desc = "A remote control switch for polarized glass doors." - -/obj/machinery/button/windowtint/doortint/toggle_tint() - use_power(5) - active = !active - update_icon() - - for(var/obj/machinery/door/D in range(src,range)) - if(D.icon_tinted && (D.id_tint == src.id || !D.id_tint)) - spawn(0) - D.toggle() - return diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index fff8d5df94..ced37e6c7f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -7,8 +7,7 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( /obj/structure/window/reinforced/polarized/full, /obj/structure/wall_frame/prepainted/, /obj/structure/wall_frame, - /obj/machinery/door/airlock/multi_tile, - /obj/machinery/door/airlock))) + /obj/machinery/door))) //comedy. /// kPa #define FIREDOOR_MAX_PRESSURE_DIFF 25 /// °C @@ -52,12 +51,10 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( var/next_process_time = 0 var/low_profile = FALSE - var/hatch_open = 0 - power_channel = ENVIRON use_power = USE_POWER_IDLE idle_power_usage = 5 - autoset_dir = FALSE + autoset_dir = TRUE var/list/tile_info[4] var/list/dir_alerts[4] // 4 dirs, bitflags @@ -88,7 +85,32 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( return INITIALIZE_HINT_LATELOAD /obj/machinery/door/firedoor/LateInitialize() - setDir(dir) + . = ..() + if(autoset_dir) + for (var/cardinal in GLOB.cardinal) + var/turf/step_turf = get_step(src, cardinal) + if (step_turf.density == TRUE) + switch(cardinal) + if(EAST) + setDir(SOUTH) + if(WEST) + setDir(SOUTH) + if(NORTH) + setDir(WEST) + if(SOUTH) + setDir(WEST) + for(var/atom/thing as anything in step_turf) + if(thing.type in GLOB.firelock_align_types) + switch(cardinal) + if(EAST) + setDir(SOUTH) + if(WEST) + setDir(SOUTH) + if(NORTH) + setDir(WEST) + if(SOUTH) + setDir(WEST) + break /obj/machinery/door/firedoor/Destroy() for(var/area/A in areas_added) @@ -135,7 +157,7 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( . += "These people have opened \the [src] during an alert: [users_to_open_string]." /obj/machinery/door/firedoor/Bumped(atom/AM) - if(p_open || operating) + if(panel_open || operating) return if(!density) return ..() @@ -279,21 +301,21 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( return if(density && C.is_screwdriver()) - hatch_open = !hatch_open + panel_open = !panel_open playsound(src, C.tool_sound, 50, 1) - user.visible_message("[user] has [hatch_open ? "opened" : "closed"] \the [src] maintenance hatch.", - "You have [hatch_open ? "opened" : "closed"] the [src] maintenance hatch.") + user.visible_message("[user] has [panel_open ? "opened" : "closed"] \the [src] maintenance hatch.", + "You have [panel_open ? "opened" : "closed"] the [src] maintenance hatch.") update_icon() return if(blocked && C.is_crowbar() && !repairing) - if(!hatch_open) + if(!panel_open) to_chat(user, "You must open the maintenance hatch first!") else user.visible_message("[user] is removing the electronics from \the [src].", "You start to remove the electronics from [src].") if(do_after(user,30)) - if(blocked && density && hatch_open) + if(blocked && density && panel_open) playsound(src, C.tool_sound, 50, 1) user.visible_message("[user] has removed the electronics from \the [src].", "You have removed the electronics from [src].") @@ -425,8 +447,8 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( return ..() /obj/machinery/door/firedoor/open(var/forced = 0) - if(hatch_open) - hatch_open = 0 + if(panel_open) + panel_open = 0 visible_message("The maintenance hatch of \the [src] closes.") update_icon() @@ -444,10 +466,10 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( /obj/machinery/door/firedoor/do_animate(animation) switch(animation) - if("opening") + if(DOOR_ANIMATION_OPEN) flick("opening", src) playsound(src, 'sound/machines/firelockopen.ogg', 37, 1) - if("closing") + if(DOOR_ANIMATION_CLOSE) playsound(src, 'sound/machines/firelockclose.ogg', 37, 1) flick("closing", src) return @@ -486,42 +508,6 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( return -/obj/machinery/door/firedoor/setDir(ndir) - for(var/D in GLOB.cardinal) - var/turf/T = get_step(src, D) - for(var/obj/A in T.contents) - if(A.type in GLOB.firelock_align_types) //this is mainly for the cases where mappers can't manually align firelocks, i.e window spawners. - switch(D) - if(NORTH) - dir = WEST - break - if(EAST) - dir = SOUTH - break - if(SOUTH) - dir = WEST - break - if(WEST) - dir = SOUTH - break - if(T.density) - switch(D) - if(NORTH) - dir = WEST - break - if(EAST) - dir = SOUTH - break - if(SOUTH) - dir = WEST - break - if(WEST) - dir = SOUTH - break - ..() - - - /obj/machinery/door/firedoor/border_only /* icon = 'icons/obj/doors/edge_Doorfire.dmi' diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index f561aecd4e..d1c58efa04 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -12,10 +12,9 @@ fill_file = 'icons/obj/doors/double/fill_steel.dmi' color_file = 'icons/obj/doors/double/color.dmi' color_fill_file = 'icons/obj/doors/double/fill_color.dmi' - glass_file = 'icons/obj/doors/double/fill_glass.dmi' bolts_file = 'icons/obj/doors/double/lights_bolts.dmi' - deny_file = 'icons/obj/doors/double/lights_deny.dmi' lights_file = 'icons/obj/doors/double/lights_green.dmi' + panel_file = 'icons/obj/doors/double/panel.dmi' emag_file = 'icons/obj/doors/double/emag.dmi' stripe_file = 'icons/obj/doors/double/stripe.dmi' stripe_fill_file = 'icons/obj/doors/double/fill_stripe.dmi' @@ -42,26 +41,6 @@ . = ..() SetBounds() -/obj/machinery/door/airlock/multi_tile/open() - . = ..() - - if(filler1) - filler1.set_opacity(opacity) - if(filler2) - filler2.set_opacity(opacity) - - return . - -/obj/machinery/door/airlock/multi_tile/close() - . = ..() - - if(filler1) - filler1.set_opacity(opacity) - if(filler2) - filler2.set_opacity(opacity) - - return . - /obj/machinery/door/airlock/multi_tile/proc/SetBounds() if(width > 1) if(dir in list(EAST, WEST)) @@ -95,7 +74,11 @@ glass = 1 assembly_type = /obj/structure/door_assembly/multi_tile window_color = GLASS_COLOR + fill_file = 'icons/obj/doors/double/fill_glass.dmi' +/obj/machinery/door/airlock/multi_tile/set_opacity(var/new_opacity) + filler1.set_opacity(new_opacity) + filler2.set_opacity(new_opacity) /obj/machinery/door/airlock/multi_tile/metal name = "Airlock" diff --git a/code/game/machinery/doors/multi_tile_vr.dm b/code/game/machinery/doors/multi_tile_vr.dm index a18727c6ab..09947ad05f 100644 --- a/code/game/machinery/doors/multi_tile_vr.dm +++ b/code/game/machinery/doors/multi_tile_vr.dm @@ -1,6 +1,5 @@ /obj/machinery/door/airlock/multi_tile/glass/polarized name = "Electrochromic Glass Airlock" - icon_tinted = 'icons/obj/doors/Door2x1tinted_vr.dmi' /obj/machinery/door/airlock/multi_tile/glass/polarized/Initialize(mapload) . = ..() diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index f83bc4bcfb..31fb444e1c 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -25,7 +25,7 @@ //dummy_terminals.Cut() return ..() -/obj/machinery/embedded_controller/radio/airlock/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/obj/machinery/embedded_controller/radio/airlock/ui_status(mob/user, datum/ui_state/state) . = ..() if(!allowed(user)) return min(UI_UPDATE, .) @@ -34,7 +34,7 @@ /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller name = "Advanced Airlock Controller" -/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user, datum/tgui/ui) . = list( "chamber_pressure" = round(program.memory["chamber_sensor_pressure"]), "external_pressure" = round(program.memory["external_sensor_pressure"]), @@ -52,7 +52,7 @@ tag_secure = 1 valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort") -/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user, datum/tgui/ui) . = list( "chamber_pressure" = round(program.memory["chamber_sensor_pressure"]), "exterior_status" = program.memory["exterior_status"], @@ -68,7 +68,8 @@ name = "Access Controller" tag_secure = 1 - valid_actions = list("cycle_ext_door", "cycle_int_door", "force_ext", "force_int") + valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int") + program = /datum/computer/file/embedded_program/airlock/access_controll /obj/machinery/embedded_controller/radio/airlock/access_controller/update_icon() @@ -80,7 +81,7 @@ else icon_state = "access_control_off" -/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user, datum/tgui/ui) . = list( "exterior_status" = program.memory["exterior_status"], "interior_status" = program.memory["interior_status"], diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index 2d017876ab..6a2f46f4aa 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -15,6 +15,12 @@ tag_secure = 1 valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "toggle_override") +/obj/machinery/embedded_controller/radio/airlock/docking_port/process() + airlock_program?.process() + docking_program?.process() + + update_icon() + /obj/machinery/embedded_controller/radio/airlock/docking_port/Initialize(mapload) . = ..() airlock_program = new/datum/computer/file/embedded_program/airlock/docking(src) @@ -35,7 +41,7 @@ else ..() -/obj/machinery/embedded_controller/radio/airlock/docking_port/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/docking_port/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/airlock/docking_program = program var/datum/computer/file/embedded_program/airlock/docking/airlock_program = docking_program.airlock_program @@ -84,28 +90,26 @@ //tell the docking port to start getting ready for docking - e.g. pressurize /datum/computer/file/embedded_program/docking/airlock/prepare_for_docking() - airlock_program.begin_dock_cycle() + airlock_program.state = STATE_CYCLING_IN //are we ready for docking? /datum/computer/file/embedded_program/docking/airlock/ready_for_docking() - return !airlock_program || airlock_program.done_cycling() + return airlock_program.state == STATE_OPEN_IN //we are docked, open the doors or whatever. /datum/computer/file/embedded_program/docking/airlock/finish_docking() airlock_program.enable_mech_regulation() airlock_program.open_doors() +// TODO IMPLEMENT THESE procs that return 0 + //tell the docking port to start getting ready for undocking - e.g. close those doors. /datum/computer/file/embedded_program/docking/airlock/prepare_for_undocking() - airlock_program.stop_cycling() - airlock_program.close_doors() - airlock_program.disable_mech_regulation() + airlock_program.state = STATE_SEALING //are we ready for undocking? /datum/computer/file/embedded_program/docking/airlock/ready_for_undocking() - var/ext_closed = airlock_program.check_exterior_door_secured() - var/int_closed = airlock_program.check_interior_door_secured() - return (ext_closed || int_closed) + return airlock_program.state == STATE_CLOSED /////////////////////////////////////////////////////////////////////////////// //An airlock controller to be used by the airlock-based docking port controller. @@ -128,10 +132,6 @@ toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open") toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open") -/datum/computer/file/embedded_program/airlock/docking/cycleDoors(var/target) - if (master_prog.undocked() || master_prog.override_enabled) //only allow the port to be used as an airlock if nothing is docked here or the override is enabled - ..(target) - /*** DEBUG VERBS *** /datum/computer/file/embedded_program/docking/proc/print_state() diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm index a0ff624e8d..375d6a02f6 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm @@ -15,7 +15,7 @@ for (var/i = 1; i <= tags.len; i++) child_names[tags[i]] = names[i] -/obj/machinery/embedded_controller/radio/docking_port_multi/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/docking_port_multi/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/multi/docking_program = program // Cast to proper type var/list/airlocks[child_names.len] @@ -29,7 +29,7 @@ "internalTemplateName" = "DockingConsoleMulti", ) -/obj/machinery/embedded_controller/radio/docking_port_multi/ui_act(action, params) +/obj/machinery/embedded_controller/radio/docking_port_multi/ui_act(action, list/params, datum/tgui/ui) . = ..() return //Apparently we swallow all input (this is corrected legacy code) @@ -43,7 +43,7 @@ valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "toggle_override") -/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/airlock/multi_docking/airlock_program = program // Cast to proper type . = list( diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm index 2878f5e220..c2ccc1ccee 100644 --- a/code/game/machinery/embedded_controller/airlock_program.dm +++ b/code/game/machinery/embedded_controller/airlock_program.dm @@ -1,18 +1,9 @@ //Handles the control of airlocks -#define STATE_IDLE 0 -#define STATE_PREPARE 1 -#define STATE_DEPRESSURIZE 2 -#define STATE_PRESSURIZE 3 +/// Never try to pump to pure vacuum, its not happening. +#define MIN_TARGET_PRESSURE (ONE_ATMOSPHERE * 0.01) -#define TARGET_NONE 0 -#define TARGET_INOPEN -1 -#define TARGET_OUTOPEN -2 -/// Never try to pump to pure vacuum, its not happening. -#define MIN_TARGET_PRESSURE (ONE_ATMOSPHERE * 0.05) -/// Skip cycling airlock (just open the doors) if pressures are within this range. -#define SKIPCYCLE_MARGIN 1 /datum/computer/file/embedded_program/airlock var/tag_exterior_door var/tag_interior_door @@ -23,12 +14,10 @@ var/tag_airlock_mech_sensor var/tag_shuttle_mech_sensor - var/state = STATE_IDLE - var/target_state = TARGET_NONE + var/state = STATE_CLOSED - var/cycle_to_external_air = 0 - var/tag_pump_out_external - var/tag_pump_out_internal + //var/tag_pump_out_external not part of basic airlocks + //var/tag_pump_out_internal /datum/computer/file/embedded_program/airlock/New(var/obj/machinery/embedded_controller/M) ..(M) @@ -45,10 +34,6 @@ if (istype(M, /obj/machinery/embedded_controller/radio/airlock)) //if our controller is an airlock controller than we can auto-init our tags var/obj/machinery/embedded_controller/radio/airlock/controller = M - cycle_to_external_air = controller.cycle_to_external_air - if(cycle_to_external_air) - tag_pump_out_external = "[id_tag]_pump_out_external" - tag_pump_out_internal = "[id_tag]_pump_out_internal" tag_exterior_door = controller.tag_exterior_door? controller.tag_exterior_door : "[id_tag]_outer" tag_interior_door = controller.tag_interior_door? controller.tag_interior_door : "[id_tag]_inner" tag_airpump = controller.tag_airpump? controller.tag_airpump : "[id_tag]_pump" @@ -85,79 +70,49 @@ memory["interior_status"]["state"] = signal.data["door_status"] memory["interior_status"]["lock"] = signal.data["lock_status"] - else if(receive_tag==tag_airpump || receive_tag==tag_pump_out_internal) + else if(receive_tag==tag_airpump) if(signal.data["power"]) memory["pump_status"] = signal.data["direction"] else memory["pump_status"] = "off" else if(receive_tag==id_tag) - if(istype(master, /obj/machinery/embedded_controller/radio/airlock/access_controller)) - switch(signal.data["command"]) - if("cycle_exterior") - receive_user_command("cycle_ext_door") - if("cycle_interior") - receive_user_command("cycle_int_door") - if("cycle") - if(memory["interior_status"]["state"] == "open") //handle backwards compatibility - receive_user_command("cycle_ext") - else - receive_user_command("cycle_int") - else - switch(signal.data["command"]) - if("cycle_exterior") - receive_user_command("cycle_ext") - if("cycle_interior") - receive_user_command("cycle_int") - if("cycle") - if(memory["interior_status"]["state"] == "open") //handle backwards compatibility - receive_user_command("cycle_ext") - else - receive_user_command("cycle_int") - + receive_user_command(signal.data["command"]) /datum/computer/file/embedded_program/airlock/receive_user_command(command) - var/shutdown_pump = 0 . = TRUE switch(command) if("cycle_ext") - //If airlock is already cycled in this direction, just toggle the doors. - if(!memory["purge"] && abs(memory["external_sensor_pressure"] - memory["chamber_sensor_pressure"]) <= SKIPCYCLE_MARGIN) - toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "toggle") - //only respond to these commands if the airlock isn't already doing something - //prevents the controller from getting confused and doing strange things - else if(state == target_state) - begin_cycle_out() - + state = STATE_CYCLING_OUT + memory["processing"] = TRUE if("cycle_int") - if(!memory["purge"] && abs(memory["internal_sensor_pressure"] - memory["chamber_sensor_pressure"]) <= SKIPCYCLE_MARGIN) - toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "toggle") - else if(state == target_state) - begin_cycle_in() - - if("cycle_ext_door") - cycleDoors(TARGET_OUTOPEN) - - if("cycle_int_door") - cycleDoors(TARGET_INOPEN) - - if("abort") - stop_cycling() - + state = STATE_CYCLING_IN + memory["processing"] = TRUE + if("secure") + state = STATE_SEALING + memory["processing"] = TRUE if("force_ext") - toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "toggle") - + state = STATE_UNDEFINED + memory["processing"] = FALSE + if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + else if(memory["exterior_status"]["state"] == "closed") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "open") if("force_int") - toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "toggle") - + state = STATE_UNDEFINED + memory["processing"] = FALSE + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else if(memory["interior_status"]["state"] == "closed") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "open") + if("abort") + stop_everything() if("purge") - memory["purge"] = !memory["purge"] - if(memory["purge"]) - close_doors() - state = STATE_PREPARE - target_state = TARGET_NONE - - if("secure") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + signalPump(tag_airpump, 1, 0, MIN_TARGET_PRESSURE) + state = STATE_UNDEFINED + if("bypass") memory["secure"] = !memory["secure"] if(memory["secure"]) signalDoor(tag_interior_door, "lock") @@ -168,152 +123,65 @@ else . = FALSE - if(shutdown_pump) - signalPump(tag_airpump, 0) //send a signal to stop pressurizing - if(cycle_to_external_air) - signalPump(tag_pump_out_internal, 0) - signalPump(tag_pump_out_external, 0) - - - /datum/computer/file/embedded_program/airlock/process() - if(!state) //Idle - if(target_state) - switch(target_state) - if(TARGET_INOPEN) - memory["target_pressure"] = memory["internal_sensor_pressure"] - if(TARGET_OUTOPEN) - memory["target_pressure"] = memory["external_sensor_pressure"] - - //lock down the airlock before activating pumps - close_doors() - - state = STATE_PREPARE - else - //make sure to return to a sane idle state - if(memory["pump_status"] != "off") //send a signal to stop pumping - signalPump(tag_airpump, 0) - if(cycle_to_external_air) - signalPump(tag_pump_out_internal, 0) - signalPump(tag_pump_out_external, 0) - - if ((state == STATE_PRESSURIZE || state == STATE_DEPRESSURIZE) && !check_doors_secured()) - //the airlock will not allow itself to continue to cycle when any of the doors are forced open. - stop_cycling() - switch(state) - if(STATE_PREPARE) - if (check_doors_secured()) - var/chamber_pressure = memory["chamber_sensor_pressure"] - var/target_pressure = memory["target_pressure"] - - if(memory["purge"]) - //purge apparently means clearing the airlock chamber to vacuum (then refilling, handled later) - target_pressure = 0 - state = STATE_DEPRESSURIZE - playsound(master, 'sound/AI/airlockout.ogg', 100, 0) //TODO: Remove all of Virgo's TTS. Doesn't match anything. - if(!cycle_to_external_air || target_state == TARGET_OUTOPEN) // if going outside, pump internal air into air tank - signalPump(tag_airpump, 1, 0, target_pressure) //send a signal to start depressurizing - else - signalPump(tag_pump_out_internal, 1, 0, target_pressure) // if going inside, pump external air out of the airlock - signalPump(tag_pump_out_external, 1, 1, 15000) // make sure the air is actually going outside - - else if(chamber_pressure <= target_pressure) - state = STATE_PRESSURIZE - playsound(master, 'sound/AI/airlockin.ogg', 100, 0) - if(!cycle_to_external_air || target_state == TARGET_INOPEN) // if going inside, pump air into airlock - signalPump(tag_airpump, 1, 1, target_pressure) //send a signal to start pressurizing - else - signalPump(tag_pump_out_internal, 1, 1, target_pressure) // if going outside, fill airlock with external air - signalPump(tag_pump_out_external, 1, 0, 0) - - else if(chamber_pressure > target_pressure) - if(!cycle_to_external_air) - state = STATE_DEPRESSURIZE - playsound(master, 'sound/AI/airlockout.ogg', 100, 0) - signalPump(tag_airpump, 1, 0, target_pressure) //send a signal to start depressurizing - else - memory["purge"] = 1 // should always purge first if using external air, chamber pressure should never be higher than target pressure here - //Make sure the airlock isn't aiming for pure vacuum - an impossibility - memory["target_pressure"] = max(target_pressure, MIN_TARGET_PRESSURE) - - if(STATE_PRESSURIZE) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) - if(memory["chamber_sensor_pressure"] >= memory["target_pressure"] * 0.95) - //not done until the pump has reported that it's off - if(memory["pump_status"] != "off") - signalPump(tag_airpump, 0) //send a signal to stop pumping - if(cycle_to_external_air) - signalPump(tag_pump_out_internal, 0) - signalPump(tag_pump_out_external, 0) - else - cycleDoors(target_state) - state = STATE_IDLE - target_state = TARGET_NONE - playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) - - - if(STATE_DEPRESSURIZE) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) - if(memory["chamber_sensor_pressure"] <= max(memory["target_pressure"] * 1.05, MIN_TARGET_PRESSURE)) - if(memory["pump_status"] != "off") - signalPump(tag_airpump, 0) - if(cycle_to_external_air) - signalPump(tag_pump_out_internal, 0) - signalPump(tag_pump_out_external, 0) - else if(memory["purge"]) - memory["purge"] = 0 - memory["target_pressure"] = (target_state == TARGET_INOPEN ? memory["internal_sensor_pressure"] : memory["external_sensor_pressure"]) - if (memory["target_pressure"] > SKIPCYCLE_MARGIN) - state = STATE_PREPARE // Skip pressurizing if target pressure is already close enough. - else - cycleDoors(target_state) - state = STATE_IDLE - target_state = TARGET_NONE - playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) - - - memory["processing"] = (state != target_state) + if(STATE_OPEN_OUT) + return 1 + if(STATE_OPEN_IN) + return 1 + if(STATE_CLOSED) + return 1 + if(STATE_BYPASS) + return 1 + if(STATE_CYCLING_IN) + if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + else if(fuzzy_smaller_check(memory["chamber_sensor_pressure"], memory["internal_sensor_pressure"])) + signalPump(tag_airpump, 1, 1, memory["target_pressure"]+0.1) + memory["processing"] = TRUE + else + toggleDoor(memory["interior_status"],tag_interior_door, 1, "open") + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_IN + memory["processing"] = FALSE + if(STATE_CYCLING_OUT) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else if(fuzzy_smaller_check(MIN_TARGET_PRESSURE, memory["chamber_sensor_pressure"])) + signalPump(tag_airpump, 1, 0, MIN_TARGET_PRESSURE) // siphon air out to avoid being pulled from your feet + memory["processing"] = TRUE + else if(memory["interior_status"]["state"] == "open") //double check + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else // pressure levels are acceptable and interior doors are closed + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "open") + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_OUT + memory["processing"] = FALSE + if(STATE_SEALING) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + memory["processing"] = TRUE + else if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + memory["processing"] = TRUE + else + state = STATE_CLOSED + memory["processing"] = FALSE + if(STATE_BYPASSING) + signalDoor(tag_interior_door, "unlock") + signalDoor(tag_exterior_door, "unlock") + state = STATE_BYPASS + else + state = STATE_UNDEFINED return 1 //these are here so that other types don't have to make so many assuptions about our implementation -/datum/computer/file/embedded_program/airlock/proc/begin_cycle_in() - state = STATE_IDLE - target_state = TARGET_INOPEN - memory["purge"] = cycle_to_external_air - -/datum/computer/file/embedded_program/airlock/proc/begin_dock_cycle() - state = STATE_IDLE - target_state = TARGET_INOPEN -/datum/computer/file/embedded_program/airlock/proc/begin_cycle_out() - state = STATE_IDLE - target_state = TARGET_OUTOPEN - memory["purge"] = cycle_to_external_air - /datum/computer/file/embedded_program/airlock/proc/close_doors() toggleDoor(memory["interior_status"], tag_interior_door, 1, "close") toggleDoor(memory["exterior_status"], tag_exterior_door, 1, "close") -/datum/computer/file/embedded_program/airlock/proc/stop_cycling() - state = STATE_IDLE - target_state = TARGET_NONE - -/datum/computer/file/embedded_program/airlock/proc/done_cycling() - return (state == STATE_IDLE && target_state == TARGET_NONE) - -//are the doors closed and locked? -/datum/computer/file/embedded_program/airlock/proc/check_exterior_door_secured() - return (memory["exterior_status"]["state"] == "closed" && memory["exterior_status"]["lock"] == "locked") - -/datum/computer/file/embedded_program/airlock/proc/check_interior_door_secured() - return (memory["interior_status"]["state"] == "closed" && memory["interior_status"]["lock"] == "locked") - -/datum/computer/file/embedded_program/airlock/proc/check_doors_secured() - var/ext_closed = check_exterior_door_secured() - var/int_closed = check_interior_door_secured() - return (ext_closed && int_closed) /datum/computer/file/embedded_program/airlock/proc/signalDoor(var/tag, var/command) var/datum/signal/signal = new @@ -332,22 +200,14 @@ ) post_signal(signal) -//this is called to set the appropriate door state at the end of a cycling process, or for the exterior buttons -/datum/computer/file/embedded_program/airlock/proc/cycleDoors(var/target) - switch(target) - if(TARGET_OUTOPEN) - toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "close") - toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open") - - if(TARGET_INOPEN) - toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "close") - toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open") - if(TARGET_NONE) - var/command = "unlock" - if(memory["secure"]) - command = "lock" - signalDoor(tag_exterior_door, command) - signalDoor(tag_interior_door, command) +/datum/computer/file/embedded_program/airlock/proc/signalScrubber(var/tag, var/power) + var/datum/signal/signal = new + signal.data = list( + "tag" = tag, + "sigtype" = "command", + "power" = "[power]", + ) + post_signal(signal) /datum/computer/file/embedded_program/airlock/proc/signal_mech_sensor(command, sensor) var/datum/signal/signal = new @@ -363,6 +223,16 @@ signal_mech_sensor("disable", tag_shuttle_mech_sensor) signal_mech_sensor("disable", tag_airlock_mech_sensor) +/datum/computer/file/embedded_program/airlock/proc/stop_everything() + signalPump(tag_airpump, 0, 1, memory["target_pressure"])//Stop the pumps + state = STATE_UNDEFINED + memory["processing"] = FALSE + +/datum/computer/file/embedded_program/airlock/proc/delta_check(var/to_check, var/target_value, var/delta) + return (abs(to_check - target_value) <= delta) + +/datum/computer/file/embedded_program/airlock/proc/fuzzy_smaller_check(var/to_check, var/target_value, var/fuzz = 0.1) + return (to_check < (target_value - fuzz)) /*---------------------------------------------------------- toggleDoor() @@ -416,12 +286,46 @@ send an additional command to open the door again. if(doorCommand) signalDoor(doorTag, doorCommand) -#undef SKIPCYCLE_MARGIN - -#undef STATE_IDLE -#undef STATE_DEPRESSURIZE -#undef STATE_PRESSURIZE +/datum/computer/file/embedded_program/airlock/access_controll/process() + switch(state) + if(STATE_OPEN_OUT) + return 1 + if(STATE_OPEN_IN) + return 1 + if(STATE_CLOSED) + return 1 + if(STATE_BYPASS) + return 1 + if(STATE_CYCLING_IN) + if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + else + toggleDoor(memory["interior_status"],tag_interior_door, 1, "open") + state = STATE_OPEN_IN + memory["processing"] = FALSE + if(STATE_CYCLING_OUT) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "open") + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_OUT + memory["processing"] = FALSE + if(STATE_SEALING) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + memory["processing"] = TRUE + else if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + memory["processing"] = TRUE + else + state = STATE_CLOSED + memory["processing"] = FALSE + if(STATE_BYPASSING) + signalDoor(tag_interior_door, "unlock") + signalDoor(tag_exterior_door, "unlock") + state = STATE_BYPASS -#undef TARGET_NONE -#undef TARGET_INOPEN -#undef TARGET_OUTOPEN + else + state = STATE_UNDEFINED + return 1 diff --git a/code/game/machinery/embedded_controller/docking_program_multi.dm b/code/game/machinery/embedded_controller/docking_program_multi.dm index a4ad7d2985..56f4b1b48c 100644 --- a/code/game/machinery/embedded_controller/docking_program_multi.dm +++ b/code/game/machinery/embedded_controller/docking_program_multi.dm @@ -159,14 +159,15 @@ response_sent = 0 if (!override_enabled) - begin_cycle_in() + return + //begin_cycle_in() if ("prepare_for_undocking") docking_mode = 1 response_sent = 0 if (!override_enabled) - stop_cycling() + //stop_cycling() close_doors() disable_mech_regulation() @@ -195,21 +196,18 @@ //checks if we are ready for docking /datum/computer/file/embedded_program/airlock/multi_docking/proc/ready_for_docking() - return done_cycling() + return 0 //checks if we are ready for undocking /datum/computer/file/embedded_program/airlock/multi_docking/proc/ready_for_undocking() - var/ext_closed = check_exterior_door_secured() - var/int_closed = check_interior_door_secured() - return (ext_closed || int_closed) + return 0 /datum/computer/file/embedded_program/airlock/multi_docking/proc/open_doors() toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open") toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open") -/datum/computer/file/embedded_program/airlock/multi_docking/cycleDoors(var/target) - if (!docking_enabled|| override_enabled) //only allow the port to be used as an airlock if nothing is docked here or the override is enabled - ..(target) +/datum/computer/file/embedded_program/airlock/multi_docking/proc/cycleDoors(var/target) + return 0 /datum/computer/file/embedded_program/airlock/multi_docking/proc/send_signal_to_master(var/command) var/datum/signal/signal = new diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 49b686f3c8..5cc1846c54 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -30,7 +30,7 @@ . = ..() stack_trace("WARNING: Embedded controller [src] ([type]) had Topic() called unexpectedly. Please report this.") -/obj/machinery/embedded_controller/ui_act(action, params) +/obj/machinery/embedded_controller/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if(LAZYLEN(valid_actions)) diff --git a/code/game/machinery/embedded_controller/mapping_helpers.dm b/code/game/machinery/embedded_controller/mapping_helpers.dm index 8d9e165d19..008e940a45 100644 --- a/code/game/machinery/embedded_controller/mapping_helpers.dm +++ b/code/game/machinery/embedded_controller/mapping_helpers.dm @@ -133,7 +133,11 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 icon_state = "pumpdout" tag_addon = "_pump_out_external" - +/obj/map_helper/airlock/atmos/scrubber + name = "chamber scrubber" + my_device_type = /obj/machinery/atmospherics/component/unary/vent_scrubber + icon_state = "scrubber" + tag_addon = "_scrubber" /* Sensors - did you know they function as buttons? You don't also need a button. */ @@ -155,7 +159,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 name = "exterior sensor" icon_state = "sensout" tag_addon = "_exterior_sensor" - command = "cycle_exterior" + command = "cycle_ext" /obj/map_helper/airlock/sensor/chamber_sensor name = "chamber sensor" @@ -167,7 +171,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 name = "interior sensor" icon_state = "sensin" tag_addon = "_interior_sensor" - command = "cycle_interior" + command = "cycle_int" /* Buttons diff --git a/code/game/machinery/embedded_controller/simple_docking_controller.dm b/code/game/machinery/embedded_controller/simple_docking_controller.dm index eebdc9ea48..82a756b617 100644 --- a/code/game/machinery/embedded_controller/simple_docking_controller.dm +++ b/code/game/machinery/embedded_controller/simple_docking_controller.dm @@ -5,7 +5,7 @@ var/tag_door valid_actions = list("force_door", "toggle_override") -/obj/machinery/embedded_controller/radio/simple_docking_controller/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/simple_docking_controller/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/simple/docking_program = program // Cast to proper type . = list( diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index 6671564f50..fb6c5c49b8 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -118,7 +118,7 @@ GLOBAL_LIST_EMPTY(exonet_nodes) // Proc: ui_data() // Parameters: 1 (user - the person using the interface) // Description: Allows the user to turn the machine on or off, or open or close certain 'ports' for things like external PDA messages, newscasters, etc. -/obj/machinery/exonet_node/ui_data(mob/user) +/obj/machinery/exonet_node/ui_data(mob/user, datum/tgui/ui) // this is the data which will be sent to the ui var/list/data = list() @@ -133,7 +133,7 @@ GLOBAL_LIST_EMPTY(exonet_nodes) // Proc: ui_act() // Parameters: 2 (standard ui_act arguments) // Description: Responds to button presses on the TGUI interface. -/obj/machinery/exonet_node/ui_act(action, params) +/obj/machinery/exonet_node/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 4e7298ec91..4208f449d7 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -1,7 +1,8 @@ /* FIRE ALARM */ -/obj/machinery/firealarm +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/fire_alarm, 21) +/obj/machinery/fire_alarm name = "fire alarm" desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever." icon = 'icons/obj/firealarm.dmi' @@ -25,36 +26,21 @@ FIRE ALARM /// If the alarms from this machine are visible on consoles. var/alarms_hidden = FALSE -/obj/machinery/firealarm/alarms_hidden +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/fire_alarm/alarms_hidden, 21) +/obj/machinery/fire_alarm/alarms_hidden alarms_hidden = TRUE -/obj/machinery/firealarm/preloading_dir(datum/map_preloader/preloader) +/obj/machinery/fire_alarm/preloading_dir(datum/map_preloader/preloader) dir = turn(dir, -preloader.turn_angle) return FALSE -/obj/machinery/firealarm/north - dir = NORTH - pixel_y = -21 - -/obj/machinery/firealarm/south - dir = SOUTH - pixel_y = 21 - -/obj/machinery/firealarm/east - dir = EAST - pixel_x = 21 - -/obj/machinery/firealarm/west - dir = WEST - pixel_x = -21 - -/obj/machinery/firealarm/Initialize(mapload) +/obj/machinery/fire_alarm/Initialize(mapload) . = ..() if(z in (LEGACY_MAP_DATUM).contact_levels) set_security_level(GLOB.security_level ? get_security_level() : "green") setDir(dir) -/obj/machinery/firealarm/setDir(ndir) +/obj/machinery/fire_alarm/setDir(ndir) . = ..() base_pixel_x = 0 base_pixel_y = 0 @@ -64,12 +50,12 @@ FIRE ALARM if(SOUTH) base_pixel_y = 21 if(WEST) - base_pixel_x = -21 - if(EAST) base_pixel_x = 21 + if(EAST) + base_pixel_x = -21 reset_pixel_offsets() -/obj/machinery/firealarm/update_icon() +/obj/machinery/fire_alarm/update_icon() cut_overlays() add_overlay("casing") @@ -130,24 +116,24 @@ FIRE ALARM add_overlay(alarm_img2) set_light(l_range = 4, l_power = 0.9, l_color = "#FF6633") -/obj/machinery/firealarm/fire_act(datum/gas_mixture/air, temperature, volume) +/obj/machinery/fire_alarm/fire_act(datum/gas_mixture/air, temperature, volume) if(detecting) if(temperature > T0C + 200) alarm() // added check of detector status here return -/obj/machinery/firealarm/attack_ai(mob/user) +/obj/machinery/fire_alarm/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/firealarm/bullet_act() +/obj/machinery/fire_alarm/bullet_act() return alarm() -/obj/machinery/firealarm/emp_act(severity) +/obj/machinery/fire_alarm/emp_act(severity) if(prob(50 / severity)) alarm(rand(30 / severity, 60 / severity)) ..() -/obj/machinery/firealarm/attackby(obj/item/W, mob/user) +/obj/machinery/fire_alarm/attackby(obj/item/W, mob/user) add_fingerprint(user) if(alarm_deconstruction_screwdriver(user, W)) @@ -171,7 +157,7 @@ FIRE ALARM alarm() return -/obj/machinery/firealarm/process()//Note: this processing was mostly phased out due to other code, and only runs when needed +/obj/machinery/fire_alarm/process()//Note: this processing was mostly phased out due to other code, and only runs when needed if(machine_stat & (NOPOWER|BROKEN)) return @@ -191,12 +177,12 @@ FIRE ALARM return -/obj/machinery/firealarm/power_change() +/obj/machinery/fire_alarm/power_change() ..() spawn(rand(0,15)) update_icon() -/obj/machinery/firealarm/attack_hand(mob/user, list/params) +/obj/machinery/fire_alarm/attack_hand(mob/user, list/params) if(user.stat || machine_stat & (NOPOWER | BROKEN)) return @@ -237,7 +223,7 @@ FIRE ALARM onclose(user, "firealarm") return -/obj/machinery/firealarm/Topic(href, href_list) +/obj/machinery/fire_alarm/Topic(href, href_list) ..() if(usr.stat || machine_stat & (BROKEN | NOPOWER)) return @@ -265,26 +251,26 @@ FIRE ALARM return return -/obj/machinery/firealarm/proc/reset() +/obj/machinery/fire_alarm/proc/reset() if(!(working)) return var/area/area = get_area(src) - for(var/obj/machinery/firealarm/FA in area) + for(var/obj/machinery/fire_alarm/FA in area) fire_alarm.clearAlarm(src.loc, FA) update_icon() return -/obj/machinery/firealarm/proc/alarm(var/duration = 0) +/obj/machinery/fire_alarm/proc/alarm(var/duration = 0) if(!(working)) return var/area/area = get_area(src) - for(var/obj/machinery/firealarm/FA in area) + for(var/obj/machinery/fire_alarm/FA in area) fire_alarm.triggerAlarm(loc, FA, duration, hidden = alarms_hidden) update_icon() playsound(src.loc, 'sound/machines/airalarm.ogg', 25, 0, 4) return -/obj/machinery/firealarm/proc/set_security_level(var/newlevel) +/obj/machinery/fire_alarm/proc/set_security_level(var/newlevel) if(seclevel != newlevel) seclevel = newlevel update_icon() diff --git a/code/game/machinery/floor_inflatables.dm b/code/game/machinery/floor_inflatables.dm new file mode 100644 index 0000000000..d755ec044b --- /dev/null +++ b/code/game/machinery/floor_inflatables.dm @@ -0,0 +1,54 @@ +/** + * A compartment in the floor for storing an inflatable wall, which is automatically deployed when air alarms trigger + */ + +/obj/machinery/floor_inflatables + name = "floor mounted inflatables" + icon = 'icons/obj/doors/hazard/floor_inflatables.dmi' + icon_state = "setup" + density = 0 + opacity = 0 + var/obj/item/inflatable/stored + +/obj/machinery/floor_inflatables/Initialize(mapload) + . = ..() + stored = new(src) + var/area/A = get_area(src) + ASSERT(istype(A)) + LAZYADD(A.all_doors, src) + update_icon() + +/obj/machinery/floor_inflatables/update_icon(updates) + . = ..() + if(stored) + icon_state = "setup" + else + icon_state = "deployed" + +/obj/machinery/floor_inflatables/proc/trigger() + if(!stored) + return + if(istype(stored)) + stored.inflate(location = get_turf(src)) + else + stored.forceMove(get_turf(src)) + stored = null + update_icon() + +/obj/machinery/floor_inflatables/attackby(obj/item/C as obj, mob/user as mob) + add_fingerprint(user, 0, C) + add_fingerprint(user, 0, src) + if(istype(C)) + if(C.w_class <= ITEMSIZE_NORMAL) + C.forceMove(src) + stored = C + to_chat(user, "You slide [C] into the compartment and close it.") + update_icon() + else + to_chat(user, "[C] is to large for [src]") + +/obj/machinery/floor_inflatables/attack_hand(mob/user, list/params) + . = ..() + var/confirm = input(user, "Do you want to trigger [src]'s deployment?","Trigger Floormount") as null|anything in list("Yes","No") + if(confirm && confirm == "Yes") + trigger() diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index b9c0494b8b..510b838e49 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -178,6 +178,8 @@ var/list/floor_light_cache = list() name = "changing floor light" /obj/machinery/floor_light/changing/process(delta_time) + if(!on) + return . = ..() update_color() @@ -205,4 +207,5 @@ var/list/floor_light_cache = list() /obj/machinery/floor_light/changing/prebuilt anchored = TRUE + on = FALSE diff --git a/code/game/machinery/holopad.dm b/code/game/machinery/holopad.dm index 2c33429ea9..0209055dcd 100644 --- a/code/game/machinery/holopad.dm +++ b/code/game/machinery/holopad.dm @@ -447,7 +447,7 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) ui = new(user, src, "Holopad") ui.open() -/obj/machinery/holopad/ui_static_data(mob/user) +/obj/machinery/holopad/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["connectivity"] = ui_connectivity_data() .["isAI"] = isAI(user) @@ -462,7 +462,7 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) .["ringerToggle"] = ringer_toggleable .["autoToggle"] = call_auto_toggle -/obj/machinery/holopad/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/holopad/ui_data(mob/user, datum/tgui/ui) . = ..() .["isAIProjecting"] = isAI(user) && is_ai_projecting(user) .["aiRequested"] = !request_ai_cooldown() @@ -477,7 +477,7 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) ringing[++ringing.len] = holocall.ui_caller_id_source() .["ringing"] = ringing -/obj/machinery/holopad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/holopad/ui_act(action, list/params, datum/tgui/ui) . = ..() switch(action) // user requesting ai @@ -583,7 +583,7 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) outgoing_call.cleanup_remote_presence() return TRUE -/obj/machinery/holopad/ui_close(mob/user) +/obj/machinery/holopad/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() // if they were remoting, kick 'em - they do get buttons on top left but // we want to enforce interface being open. diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 95cafc6124..023687111b 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -48,7 +48,7 @@ ui = new(user, src, "IVDrip", name) ui.open() -/obj/machinery/iv_drip/ui_data(mob/user) +/obj/machinery/iv_drip/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["transferRate"] = transfer_rate data["maxInjectRate"] = MAX_IV_TRANSFER_RATE @@ -58,7 +58,7 @@ data["beakerAttached"] = reagent_container ? TRUE : FALSE return data -/obj/machinery/iv_drip/ui_act(action, params) +/obj/machinery/iv_drip/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return @@ -182,7 +182,11 @@ to_chat(attached_victim, SPAN_USERDANGER("The IV drip needle is ripped out of you, leaving an open bleeding wound!")) var/list/arm_zones = shuffle(list(BP_R_ARM, BP_L_ARM)) var/obj/item/organ/external/chosen_limb = attached_victim.get_organ(arm_zones[1]) || attached_victim.get_organ(arm_zones[2]) || attached_victim.get_organ(BP_TORSO) - chosen_limb.take_damage(3) + chosen_limb.inflict_bodypart_damage( + brute = 3, + damage_mode = DAMAGE_MODE_SHARP, + weapon_descriptor = "a needle", + ) chosen_limb.create_wound(CUT, 5) detach_iv() return PROCESS_KILL diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 73ba949f33..25758ac5be 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -159,7 +159,7 @@ if (panel_open) add_overlay("panel_open") -/obj/machinery/media/jukebox/ui_act(action, list/params, datum/tgui/ui, datum/tgui_module/module) +/obj/machinery/media/jukebox/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -211,7 +211,7 @@ return ui_interact(user) -/obj/machinery/media/jukebox/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/media/jukebox/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["playing"] = playing @@ -240,7 +240,7 @@ ui = new(user, src, "Jukebox", "RetroBox - Space Style") ui.open() -/obj/machinery/media/jukebox/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/media/jukebox/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/lathes/lathe.dm b/code/game/machinery/lathes/lathe.dm index 458d959da6..df2a42c9ed 100644 --- a/code/game/machinery/lathes/lathe.dm +++ b/code/game/machinery/lathes/lathe.dm @@ -579,7 +579,7 @@ /// items to use for design - order matters! uses weakref's. var/list/ingredient_parts -/datum/lathe_queue_entry/ui_data() +/datum/lathe_queue_entry/ui_data(mob/user, datum/tgui/ui) return list( "design" = design_id, "amount" = amount, diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 7c055ad255..d9adc6922e 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -27,7 +27,7 @@ ui = new(user, src, "PipeDispenser", name) ui.open() -/obj/machinery/pipedispenser/ui_data(mob/user) +/obj/machinery/pipedispenser/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "disposals" = disposals, "p_layer" = p_layer, @@ -59,7 +59,7 @@ return data -/obj/machinery/pipedispenser/ui_act(action, params) +/obj/machinery/pipedispenser/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index 2c4c8a0b3c..4d71af4a61 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) PD.Deactivate() return TRUE -/obj/machinery/pointdefense_control/ui_data(mob/user) +/obj/machinery/pointdefense_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["id"] = id_tag var/list/turrets = list() diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm index 10cc8d9a8c..ed8a64779b 100644 --- a/code/game/machinery/suit_storage/suit_cycler.dm +++ b/code/game/machinery/suit_storage/suit_cycler.dm @@ -410,9 +410,9 @@ if(prob(radiation_level*2)) occupant.emote("scream") if(radiation_level > 2) - occupant.take_organ_damage(0,radiation_level*2 + rand(1,3)) + occupant.take_random_targeted_damage(0,radiation_level*2 + rand(1,3)) if(radiation_level > 1) - occupant.take_organ_damage(0,radiation_level + rand(1,3)) + occupant.take_random_targeted_damage(0,radiation_level + rand(1,3)) occupant.apply_effect(radiation_level * 200, IRRADIATE) /obj/machinery/suit_cycler/proc/finished_job() diff --git a/code/game/machinery/suit_storage/suit_storage_unit.dm b/code/game/machinery/suit_storage/suit_storage_unit.dm index 5546eeb3de..d856bbafe9 100644 --- a/code/game/machinery/suit_storage/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage/suit_storage_unit.dm @@ -87,7 +87,7 @@ return 0 ui_interact(user) -/obj/machinery/suit_storage_unit/ui_state(mob/user, datum/tgui_module/module) +/obj/machinery/suit_storage_unit/ui_state() return GLOB.notcontained_state /obj/machinery/suit_storage_unit/ui_interact(mob/user, datum/tgui/ui) @@ -96,7 +96,7 @@ ui = new(user, src, "SuitStorageUnit", name) ui.open() -/obj/machinery/suit_storage_unit/ui_data() +/obj/machinery/suit_storage_unit/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["broken"] = isbroken @@ -130,7 +130,7 @@ data["occupied"] = FALSE return data -/obj/machinery/suit_storage_unit/ui_act(action, params) //I fucking HATE this proc +/obj/machinery/suit_storage_unit/ui_act(action, list/params, datum/tgui/ui) if(..() || isUV || isbroken) return TRUE @@ -320,10 +320,10 @@ occupant.emote("scream") if(issuperUV) var/burndamage = rand(28,35) - occupant.take_organ_damage(0,burndamage) + occupant.take_random_targeted_damage(brute = 0, brute = burndamage) else var/burndamage = rand(6,10) - occupant.take_organ_damage(0,burndamage) + occupant.take_random_targeted_damage(brute = 0, brute = burndamage) if(i==3) //End of the cycle if(!issuperUV) if(helmet_stored) @@ -369,10 +369,10 @@ spawn(50) if(occupant) if(issuperUV) - occupant.take_organ_damage(0,40) + occupant.take_random_targeted_damage(brute = 0, burn = 40) to_chat(user, "Test. You gave him 40 damage") else - occupant.take_organ_damage(0,8) + occupant.take_random_targeted_damage(brute = 0, burn = 8) to_chat(user, "Test. You gave him 8 damage") return*/ diff --git a/code/game/machinery/telecomms/_telecomms.dm b/code/game/machinery/telecomms/_telecomms.dm index 6742110c24..7c9f141ca3 100644 --- a/code/game/machinery/telecomms/_telecomms.dm +++ b/code/game/machinery/telecomms/_telecomms.dm @@ -305,7 +305,7 @@ /obj/machinery/telecomms/attack_ai(var/mob/user as mob) attack_hand(user) -/obj/machinery/telecomms/ui_data(mob/user) +/obj/machinery/telecomms/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["temp"] = temp @@ -357,7 +357,7 @@ return data -/obj/machinery/telecomms/ui_status(mob/user) +/obj/machinery/telecomms/ui_status(mob/user, datum/ui_state/state) if(!issilicon(user)) if(!istype(user.get_active_held_item(), /obj/item/multitool)) return UI_CLOSE @@ -539,7 +539,7 @@ overmap_range = clamp(new_range, overmap_range_min, overmap_range_max) update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1)) -/obj/machinery/telecomms/ui_act(action, params) +/obj/machinery/telecomms/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index deb1bc024e..c1c33182ca 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -18,7 +18,7 @@ req_access = list(ACCESS_ENGINEERING_TELECOMMS) -/obj/machinery/computer/telecomms/server/ui_data(mob/user) +/obj/machinery/computer/telecomms/server/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["universal_translate"] = universal_translate @@ -73,7 +73,7 @@ ui = new(user, src, "TelecommsLogBrowser", name) ui.open() -/obj/machinery/computer/telecomms/server/ui_act(action, params) +/obj/machinery/computer/telecomms/server/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index f23e06aab2..3538ddd6d0 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -20,7 +20,7 @@ var/list/temp = null // temporary feedback messages -/obj/machinery/computer/telecomms/monitor/ui_data(mob/user) +/obj/machinery/computer/telecomms/monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["network"] = network @@ -61,7 +61,7 @@ ui = new(user, src, "TelecommsMachineBrowser", name) ui.open() -/obj/machinery/computer/telecomms/monitor/ui_act(action, params) +/obj/machinery/computer/telecomms/monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/teleporter/console.dm b/code/game/machinery/teleporter/console.dm index 1f57687b2a..6b5a96a447 100644 --- a/code/game/machinery/teleporter/console.dm +++ b/code/game/machinery/teleporter/console.dm @@ -95,7 +95,7 @@ ui = new(user, src, "TeleporterConsole", name) // 500, 800 ui.open() -/obj/machinery/computer/teleporter/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/teleporter/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["disabled"] = is_disabled() diff --git a/code/game/machinery/turnstile.dm b/code/game/machinery/turnstile.dm index 4b5b83eaec..a520d926c4 100644 --- a/code/game/machinery/turnstile.dm +++ b/code/game/machinery/turnstile.dm @@ -88,8 +88,8 @@ /obj/machinery/turnstile/entry name = "\improper Entrance" - req_one_access = 111 + req_one_access = list(111) /obj/machinery/turnstile/exit name = "\improper Exit" - req_one_access = 112 + req_one_access = list(112) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index b5605ff003..95484cd260 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -65,9 +65,13 @@ switch(damtype) if("brute") H.afflict_unconscious(20 * 1) - update |= temp.take_damage(rand(force/2, force), 0) + temp.inflict_bodypart_damage( + brute = rand(force / 2, force), + ) if("fire") - update |= temp.take_damage(0, rand(force/2, force)) + temp.inflict_bodypart_damage( + burn = rand(force / 2, force), + ) if("tox") if(H.reagents) if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2) diff --git a/code/game/mecha/equipment/tools/armor_ranged.dm b/code/game/mecha/equipment/tools/armor_ranged.dm index caae1a42ff..2167fe13b6 100644 --- a/code/game/mecha/equipment/tools/armor_ranged.dm +++ b/code/game/mecha/equipment/tools/armor_ranged.dm @@ -97,7 +97,7 @@ chassis.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) var/mob/living/M = A - M.take_organ_damage(10) + M.take_random_targeted_damage(brute = 10) else if(istype(A, /obj)) var/obj/O = A if(O.throw_force) diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 33c486e549..f320235f3a 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -84,7 +84,7 @@ S.icon_state = initial(S.icon_state) S.icon = initial(S.icon) S.reagents.trans_to_mob(M, S.reagents.total_volume, CHEM_INJECT) - M.take_organ_damage(2) + M.take_random_targeted_damage(brute = 2) S.visible_message(" [M] was hit by the syringe!") break else if(S.loc == trg) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d2f0957b91..8d2e3af026 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -496,7 +496,7 @@ ui = new(user, src, "ExosuitFabricator", name) ui.open() -/obj/machinery/mecha_part_fabricator/ui_static_data(mob/user) +/obj/machinery/mecha_part_fabricator/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/final_sets = list() @@ -533,7 +533,7 @@ return data -/obj/machinery/mecha_part_fabricator/ui_data(mob/user) +/obj/machinery/mecha_part_fabricator/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["materials"] = output_available_resources() @@ -559,7 +559,7 @@ return data -/obj/machinery/mecha_part_fabricator/ui_act(action, var/list/params) +/obj/machinery/mecha_part_fabricator/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index c9c2814e83..a8fd686c0b 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -79,7 +79,7 @@ for(var/i in I.materials_base) I.materials_base[i] = I.materials_base[i] * component_coeff -/obj/machinery/mecha_part_fabricator/pros/ui_data(mob/user) +/obj/machinery/mecha_part_fabricator/pros/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["species_types"] = species_types diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9b1550bda1..fc65bdce15 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1087,7 +1087,7 @@ src.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) var/mob/living/M = A - M.take_organ_damage(10) + M.take_random_targeted_damage(brute = 10) else if(istype(A, /obj)) var/obj/O = A if(O.throw_force) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 5c807d5fe5..cd4f58454e 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -24,7 +24,7 @@ ui = new(user, src, "MechaControlConsole", name) ui.open() -/obj/machinery/computer/mecha/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/mecha/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["beacons"] = list() @@ -75,7 +75,7 @@ icon_state = "motion2" origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 2) -/obj/item/mecha_parts/mecha_tracking/ui_data(mob/user) +/obj/item/mecha_parts/mecha_tracking/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(!in_mecha()) return FALSE diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index d9e6cc2c52..d2f478a8b8 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -51,9 +51,13 @@ var/update = 0 switch(damtype) if("brute") - update |= temp.take_damage(rand(force/2, force), 0) + temp.inflict_bodypart_damage( + brute = rand(force / 2, force), + ) if("fire") - update |= temp.take_damage(0, rand(force/2, force)) + temp.inflict_bodypart_damage( + burn = rand(force / 2, force), + ) if("tox") if(H.reagents) if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 826773e9c3..785f046735 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -29,10 +29,7 @@ /obj/mecha/working/ripley/Destroy() for(var/atom/movable/A in src.cargo) - A.loc = loc - var/turf/T = loc - if(istype(T)) - T.Entered(A) + A.forceMove(loc) step_rand(A) cargo.Cut() ..() diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm index 51d9759c1f..1313166d56 100644 --- a/code/game/mecha/working/working.dm +++ b/code/game/mecha/working/working.dm @@ -12,52 +12,5 @@ if(isPlayerLevel(T.z)) new /obj/item/mecha_parts/mecha_tracking(src) -/* This stuff has been generalized! -/obj/mecha/working/Destroy() - for(var/mob/M in src) - if(M==src.occupant) - continue - M.loc = get_turf(src) - M.loc.Entered(M) - step_rand(M) - for(var/atom/movable/A in src.cargo) - A.loc = get_turf(src) - var/turf/T = get_turf(A) - if(T) - T.Entered(A) - step_rand(A) - ..() - return - -/obj/mecha/working/Topic(href, href_list) - ..() - if(href_list["drop_from_cargo"]) - var/obj/O = locate(href_list["drop_from_cargo"]) - if(O && O in src.cargo) - src.occupant_message("You unload [O].") - O.loc = get_turf(src) - src.cargo -= O - var/turf/T = get_turf(O) - if(T) - T.Entered(O) - src.log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]") - return - -/obj/mecha/working/Exit(atom/movable/O) - if(O in cargo) - return 0 - return ..() - -/obj/mecha/working/get_stats_part() - var/output = ..() - output += "Cargo Compartment Contents:
" - if(src.cargo.len) - for(var/obj/O in src.cargo) - output += "Unload : [O]
" - else - output += "Nothing" - output += "
" - return output -*/ /obj/mecha/working/range_action(atom/target as obj|mob|turf) return diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index ef76cea481..557cd497a5 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -152,7 +152,7 @@ // todo: remove this shit if(QDELETED(src)) return - loc = exit_vent + forceMove(exit_vent) var/travel_time = round(get_dist(loc, exit_vent.loc) / 2) spawn(travel_time) // todo: remove this shit @@ -160,7 +160,7 @@ return if(!exit_vent || exit_vent.welded) - loc = entry_vent + forceMove(entry_vent) entry_vent = null return @@ -172,10 +172,10 @@ return if(!exit_vent || exit_vent.welded) - loc = entry_vent + forceMove(entry_vent) entry_vent = null return - loc = exit_vent.loc + forceMove(exit_vent) entry_vent = null var/area/new_area = get_area(loc) if(new_area) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index eefe23344e..a83d190cef 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -22,6 +22,12 @@ /// flags for the bodyparts this item covers when worn. /// These flags are listed in [code/__DEFINES/inventory/item_flags.dm]. var/body_cover_flags = NONE + /// Flags which determine which body parts are protected from heat. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm + /// These flags are listed in [code/__DEFINES/inventory/item_flags.dm]. + var/heat_protection_cover = NONE + /// Flags which determine which body parts are protected from cold. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm + /// These flags are listed in [code/__DEFINES/inventory/item_flags.dm]. + var/cold_protection_cover = NONE /// This is used to determine on which slots an item can fit, for inventory slots that use flags to determine this. /// These flags are listed in [code/__DEFINES/inventory/slots.dm]. var/slot_flags = NONE @@ -86,10 +92,6 @@ */ var/list/attack_verb = "attacked" - /// Flags which determine which body parts are protected from heat. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm - var/heat_protection = 0 - /// Flags which determine which body parts are protected from cold. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm - var/cold_protection = 0 /// Set this variable to determine up to which temperature (IN KELVIN) the item protects against heat damage. Keep at null to disable protection. Only protects areas set by heat_protection flags. var/max_heat_protection_temperature /// Set this variable to determine down to which temperature (IN KELVIN) the item protects against cold damage. 0 is NOT an acceptable number due to if(varname) tests!! Keep at null to disable protection. Only protects areas set by cold_protection flags. @@ -243,7 +245,6 @@ var/turf/T = src.loc src.loc = null - src.loc = T /// See inventory_sizes.dm for the defines. @@ -486,7 +487,7 @@ else playsound(src, drop_sound, 30, preference = /datum/client_preference/drop_sounds) -/obj/item/throw_landed(atom/movable/AM, datum/thrownthing/TT) +/obj/item/throw_land(atom/A, datum/thrownthing/TT) . = ..() if(TT.throw_flags & THROW_AT_IS_NEAT) return @@ -628,10 +629,11 @@ if(M.stat != 2) to_chat(M, "You go blind!") var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD) - if(affecting.take_damage(7)) - M:UpdateDamageIcon() + affecting.inflict_bodypart_damage( + brute = 7, + ) else - M.take_organ_damage(7) + M.take_random_targeted_damage(brute = 7) M.eye_blurry += rand(3,4) return diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e643bfba9b..fcf428d6f4 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -970,7 +970,7 @@ GLOBAL_LIST_EMPTY(PDAs) if("2") // Eject pAI device var/turf/T = get_turf_or_move(src.loc) if(T) - pai.loc = T + pai.forceMove(T) pai = null else @@ -1084,7 +1084,7 @@ GLOBAL_LIST_EMPTY(PDAs) M.put_in_hands(O) to_chat(usr, "You remove \the [O] from \the [src].") return - O.loc = get_turf(src) + O.forceMove(get_turf(src)) else to_chat(usr, "This PDA does not have a pen in it.") diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 3078364962..cb25a42365 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -101,7 +101,7 @@ icon_state = new_iconstate overlays = new_overlays setDir(O.dir) - M.loc = src + M.forceMove(src) master = C master.active_dummy = src diff --git a/code/game/objects/items/devices/communicator/UI_tgui.dm b/code/game/objects/items/devices/communicator/UI_tgui.dm index 365a1af802..60aaeb2f05 100644 --- a/code/game/objects/items/devices/communicator/UI_tgui.dm +++ b/code/game/objects/items/devices/communicator/UI_tgui.dm @@ -83,7 +83,7 @@ // Proc: ui_state() // Parameters: User // Description: This tells TGUI to only allow us to be interacted with while in a mob inventory. -/obj/item/communicator/ui_state(mob/user, datum/tgui_module/module) +/obj/item/communicator/ui_state() return GLOB.inventory_state // Proc: ui_interact() @@ -108,7 +108,7 @@ if(custom_state) // Just in case ui.set_state(custom_state) -/obj/item/communicator/ui_close(mob/user, datum/tgui_module/module) +/obj/item/communicator/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() if(isnull(user.client)) return // what??? @@ -118,7 +118,7 @@ // Proc: ui_data() // Parameters: User, UI, State // Description: Uses a bunch of for loops to turn lists into lists of lists, so they can be displayed in nanoUI, then displays various buttons to the user. -/obj/item/communicator/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/communicator/ui_data(mob/user, datum/tgui/ui) // this is the data which will be sent to the ui var/list/data = list() //General nanoUI information var/list/communicators = list() //List of communicators @@ -298,7 +298,7 @@ // Proc: ui_static_data() // Parameters: User, UI, State // Description: Just like ui_data, except it only gets called once when the user opens the UI, not every tick. -/obj/item/communicator/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/communicator/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() // Update manifest' if(data_core) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index f8e2648b7c..d3e3cf61ed 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -344,11 +344,11 @@ /obj/item/gps/proc/push_waypoint_data() push_ui_data(data = list("waypoints" = ui_waypoint_data())) -/obj/item/gps/ui_static_data(mob/user) +/obj/item/gps/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["waypoints"] = ui_waypoint_data() -/obj/item/gps/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/gps/ui_data(mob/user, datum/tgui/ui) . = ..() .["on"] = !!on @@ -412,7 +412,7 @@ if(!tag_as) return FALSE var/turf/T = get_turf(src) - add_waypoint(tag_as, text2num(params["x"]) || T.x, text2num(params["y"]) || T.y, params["level_id"] || SSmapping.level_id(T.z)) + add_waypoint(tag_as, text2num(params["x"]) || T.x, text2num(params["y"]) || T.y, params["level_id"] || SSmapping.fluff_level_id(T.z)) return FALSE // add waypoint pushes data already if("del_waypoint") //* RAW LOCATE IN HREF WARNING: RECEIVING PROC WILL SANITY CHECK. diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index e935a0f6b8..48b1e2d8c3 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -292,6 +292,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) setEmotion("null") src.forceMove(get_turf(src)) pai.open_up() + pai.update_action_buttons() /obj/item/paicard/proc/removePersonality() QDEL_NULL(pai) @@ -383,3 +384,45 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) /obj/item/paicard/proc/stop_displaying_hologram() displaying_hologram = FALSE update_icons() + +/// Handling for ghosts going into empty pAI cards +/obj/item/paicard/attack_ghost(mob/user) + . = ..() + + if(src.pai != null) //Have a person in them already? + user.examinate(src) + return + + var/datum/category_item/player_setup_item/player_global/pai/pai_pref = user.client.prefs.preference_by_type[/datum/category_item/player_setup_item/player_global/pai] + var/datum/paiCandidate/prefs = pai_pref?.candidate + var/has_pAI_data = !isnull(prefs) && !isnull(prefs.name) + var/options = (has_pAI_data ? list("Yes (As [prefs.name])") : list()) + list("Yes (Pick Name)", "No") + + var/choice = input(user, "Do you wish to inhabit this PAI?") in options + if(choice == "No" || isnull(choice)) + return + + var/pai_name + var/actual_pai_name + + if(choice == "Yes (Pick Name)") + pai_name = input(user, "Choose your character's name", "Character Name") as text + actual_pai_name = sanitize_species_name(pai_name) + else + actual_pai_name = sanitize_species_name(prefs.name) + + if(isnull(actual_pai_name)) + return + + var/pai_key = user.key + var/turf/location = get_turf(src) + var/obj/item/paicard/card = new(location) + var/mob/living/silicon/pai/pai = new(card) + qdel(src) + + if(choice != "Yes (Pick Name)") + pai.desc = prefs.description + + pai.key = pai_key + card.setPersonality(pai) + pai.SetName(actual_pai_name) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 44487f9ee0..66aeb30156 100755 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -70,7 +70,7 @@ return ..(freq, level) return -1 -/obj/item/radio/headset/ui_state(mob/user, datum/tgui_module/module) +/obj/item/radio/headset/ui_state() return GLOB.inventory_state /obj/item/radio/headset/syndicate @@ -378,7 +378,7 @@ if(keyslot1) var/turf/T = get_turf(user) if(T) - keyslot1.loc = T + keyslot1.forceMove(T) keyslot1 = null @@ -386,7 +386,7 @@ if(keyslot2) var/turf/T = get_turf(user) if(T) - keyslot2.loc = T + keyslot2.forceMove(T) keyslot2 = null recalculateChannels() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index a57119fdb8..c9c6601d44 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -1,3 +1,4 @@ +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/item/radio/intercom, 28) /obj/item/radio/intercom name = "station intercom (General)" desc = "Talk through this." @@ -15,6 +16,21 @@ var/wiresexposed = 0 var/overlay_color = PIPE_COLOR_GREEN +/obj/item/radio/intercom/setDir(ndir) + . = ..() + base_pixel_x = 0 + base_pixel_y = 0 + switch(dir) + if(NORTH) + base_pixel_y = -28 + if(SOUTH) + base_pixel_y = 28 + if(WEST) + base_pixel_x = 28 + if(EAST) + base_pixel_x = -28 + reset_pixel_offsets() + /obj/item/radio/intercom/update_icon(updates) cut_overlays() if(!on) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index d5073ab793..6c688e783a 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( ui = new(user, src, "Radio", name) ui.open() -/obj/item/radio/ui_data(mob/user) +/obj/item/radio/ui_data(mob/user, datum/tgui/ui) var/data[0] data["rawfreq"] = frequency @@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( return data -/obj/item/radio/ui_act(action, params) +/obj/item/radio/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -688,7 +688,7 @@ GLOBAL_DATUM_INIT(virtual_announcer_ai, /mob/living/silicon/ai/announcer, new(nu if(keyslot) var/turf/T = get_turf(user) if(T) - keyslot.loc = T + keyslot.forceMove(T) keyslot = null recalculateChannels() diff --git a/code/game/objects/items/devices/tape_recorder/tape_recorder.dm b/code/game/objects/items/devices/tape_recorder/tape_recorder.dm index 7bc2ef7874..918510e368 100644 --- a/code/game/objects/items/devices/tape_recorder/tape_recorder.dm +++ b/code/game/objects/items/devices/tape_recorder/tape_recorder.dm @@ -168,6 +168,9 @@ if(user && !silent) to_chat(user, SPAN_WARNING("[src] failed to lock the tape for reading.")) return + if(!tape.reel || !length(tape.reel)) + to_chat(user, SPAN_WARNING("[src] has nothing to play!")) + return if(!silent) audible_message("[SPAN_BOLD("[src]")]: Playback started.") playing = TRUE diff --git a/code/game/objects/items/devices/text_to_speech.dm b/code/game/objects/items/devices/text_to_speech.dm index e2b96dd446..25c5f20bfa 100644 --- a/code/game/objects/items/devices/text_to_speech.dm +++ b/code/game/objects/items/devices/text_to_speech.dm @@ -2,39 +2,57 @@ name = "TTS device" desc = "A device that speaks an inputted message. Given to crew which can not speak properly or at all." icon = 'icons/obj/integrated_electronics/electronic_setups.dmi' - icon_state = "setup_small" + icon_state = "setup_small_off" w_class = ITEMSIZE_SMALL var/named + var/activated = FALSE + var/mob/linked_user /obj/item/text_to_speech/attack_self(mob/user) . = ..() if(.) return - if(user.incapacitated(INCAPACITATION_KNOCKDOWN) || user.incapacitated(INCAPACITATION_DISABLED)) // EDIT: We can use the device only if we are not in certain types of incapacitation. We don't want chairs stopping us from texting!! + if(user.incapacitated(INCAPACITATION_STUNNED)) // EDIT: We can use the device only if we are not in certain types of incapacitation. We don't want chairs stopping us from texting!! to_chat(user, "You cannot activate the device in your state.") return - if(!named) - to_chat(user, "You input your name into the device.") - name = "[initial(name)] ([user.real_name])" - desc = "[initial(desc)] This one is assigned to [user.real_name]." - named = 1 - /* //Another way of naming the device. Gives more freedom, but could lead to issues. - device_name = copytext(sanitize(input(user, "What would you like to name your device? You must input a name before the device can be used.", "Name your device", "") as null|text),1,MAX_NAME_LEN) - name = "[initial(name)] - [device_name]" - named = 1 - */ - playsound(src, 'sound/items/tts/started_type.ogg', 25, TRUE) - user.say_overhead("typing...") - var/message = sanitize(input(user,"Choose a message to relay to those around you.") as text|null) - if(message) - var/obj/item/text_to_speech/O = src - audible_message("[icon2html(thing = O, target = world)] \The [O.name] states, \"[message]\"") - user.say_overhead(message, FALSE, MESSAGE_RANGE_COMBAT_LOUD) // I don't like this, I wish I could just invoke what this calls directly! - else - playsound(src, 'sound/items/tts/stopped_type.ogg', 25, TRUE) - user.say_overhead("stopped typing.") + activated = !activated + icon_state = activated ? "setup_small" : "setup_small_off" + + to_chat(user, "You [activated ? "activate" : "deactivate"] the device.") + +/obj/item/text_to_speech/equipped(mob/user, slot, accessory, creation, silent) + link_to_user(user) + . = ..() + +/obj/item/text_to_speech/unequipped(mob/user, slot, flags) + unlink() + . = ..() -/obj/item/text_to_speech/AltClick(mob/user) // QOL Change - attack_self(user) +/obj/item/text_to_speech/proc/link_to_user(mob/user) + linked_user = user + RegisterSignal(user, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + name = "[initial(name)] ([user.real_name])" + desc = "[initial(desc)] This one is assigned to [user.real_name]." + +/obj/item/text_to_speech/proc/unlink() + UnregisterSignal(linked_user, COMSIG_MOB_SAY) + name = initial(name) + desc = initial(desc) + +/obj/item/text_to_speech/proc/handle_speech(datum/source, list/message_args) + if(loc != linked_user) // this should never happen, but it's best to be safe in case an unsafe unequip happens somehow + unlink() + // you can't use TTS if knocked down or otherwise incapacitated + if(linked_user.incapacitated(INCAPACITATION_STUNNED)) + return + + if(activated) + var/message = message_args["message"] + var/whispering = message_args["whispering"] + message_args["cancelled"] = TRUE + audible_message("[icon2html(thing = src, target = world)] \The [name] [whispering ? "quietly states" : "states"], \"[message]\"", null, whispering ? 2 : world.view) + if(!whispering) + linked_user.say_overhead(message, FALSE, MESSAGE_RANGE_COMBAT_LOUD) + playsound(src, 'sound/items/tts/stopped_type.ogg', 25, TRUE) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 47b3a19302..8363b56abb 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -76,7 +76,7 @@ return ui_interact(user) -/obj/item/transfer_valve/ui_state(mob/user, datum/tgui_module/module) +/obj/item/transfer_valve/ui_state() return GLOB.inventory_state /obj/item/transfer_valve/ui_interact(mob/user, datum/tgui/ui = null) @@ -85,7 +85,7 @@ ui = new(user, src, "TransferValve", name) // 460, 320 ui.open() -/obj/item/transfer_valve/ui_data(mob/user) +/obj/item/transfer_valve/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["tank_one"] = tank_one ? tank_one.name : null data["tank_two"] = tank_two ? tank_two.name : null @@ -93,7 +93,7 @@ data["valve"] = valve_open return data -/obj/item/transfer_valve/ui_act(action, params) +/obj/item/transfer_valve/ui_act(action, list/params, datum/tgui/ui) if(..()) return . = TRUE diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 36453b49ad..ac04f62cef 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -48,21 +48,21 @@ switch(contains) if(1) for(var/obj/O in src) - O.loc = user.loc + O.forceMove(user.loc) to_chat(user, "You take money out of \the [src].") contains = 0 update_icon() return if(2) for(var/mob/M in src) - M.loc = user.loc + M.forceMove(user.loc) user.visible_message("[user] releases [M] from \the [src].", "You release [M] from \the [src].") contains = 0 update_icon() return if(3) for(var/obj/effect/spider/spiderling/S in src) - S.loc = user.loc + S.forceMove(user.loc) user.visible_message("[user] releases [S] from \the [src].", "You release [S] from \the [src].") START_PROCESSING(SSobj, S) // They can grow after being let out though contains = 0 diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index ef7c24a640..ee5ea49454 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -211,8 +211,8 @@ O.add_language(L.name) O.job = "Cyborg" O.cell = chest.cell - O.cell.loc = O - W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame. + O.cell.forceMove(O) + W.forceMove(O) //Should fix cybros run time erroring when blown up. It got deleted before, along with the frame. // Since we "magically" installed a cell, we also have to update the correct component. if(O.cell) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 07b83075f1..77fb8e9c57 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -162,7 +162,7 @@ /obj/item/borg/upgrade/advhealth name = "advanced health analyzer module" - desc = "A carbon dioxide jetpack suitable for low-gravity operations." + desc = "An upgrade to improve a station-bound synthetic's health analyzer." icon_state = "cyborg_upgrade3" item_state = "cyborg_upgrade" require_module = TRUE @@ -184,6 +184,39 @@ to_chat(usr, "There's no mounting point for the module!") return FALSE + +/obj/item/borg/upgrade/bluespaceorebag + name = "bluespace mining satchel module" + desc = "Improves the ore satchels of mining units to hold a lot more ores." + icon_state = "cyborg_upgrade3" + item_state = "cyborg_upgrade" + module_flags = BORG_MODULE_MINER + require_module = TRUE + +/obj/item/borg/upgrade/bluespaceorebag/action(var/mob/living/silicon/robot/R) + if(..()) + return FALSE + + var/obj/item/storage/bag/ore/O = locate() in R.module + if(!O) + O = locate() in R.module.contents + if(!O) + O = locate() in R.module.modules + if(!O) //there should be one though... + R.module.modules += new/obj/item/storage/bag/ore/bluespace(R.module) + return TRUE + if(O) + if(istype(O,/obj/item/storage/bag/ore/bluespace)) + to_chat(R, "Upgrade mounting error! Upgrade already present.") + to_chat(usr, SPAN_WARNING("[R] already has this upgrade!")) + return FALSE + else + R.uneq_all() + O.deconstruct(ATOM_DECONSTRUCT_DISASSEMBLED) //drops all ores previous satchel was carrying using this method + R.module.modules += new/obj/item/storage/bag/ore/bluespace(R.module) + return TRUE + + /obj/item/borg/upgrade/syndicate name = "scrambled equipment module" desc = "Unlocks new and often deadly module specific items of a robot" @@ -218,7 +251,7 @@ //Robot resizing module, moved from robot/upgrades_vr - Papalus /obj/item/borg/upgrade/sizeshift name = "robot size alteration module" - desc = "Using technology similar to one used in sizeguns, allows cyborgs to adjust their own size as neccesary." + desc = "Using technology similar to one used in size guns, allows cyborgs to adjust their own size as necessary." icon_state = "cyborg_upgrade2" item_state = "cyborg_upgrade" require_module = 1 diff --git a/code/game/objects/items/scanners/plant.dm b/code/game/objects/items/scanners/plant.dm index 31eb5b14ca..a06add0802 100644 --- a/code/game/objects/items/scanners/plant.dm +++ b/code/game/objects/items/scanners/plant.dm @@ -18,10 +18,10 @@ ui = new(user, src, "PlantAnalyzer", name) ui.open() -/obj/item/plant_analyzer/ui_state(mob/user, datum/tgui_module/module) +/obj/item/plant_analyzer/ui_state() return GLOB.inventory_state -/obj/item/plant_analyzer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/plant_analyzer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/datum/seed/grown_seed = locate(last_seed) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index f2ed4d9d5f..6f42300ce1 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -79,7 +79,7 @@ ui = new(user, src, "StackCrafting") ui.open() -/obj/item/stack/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/stack/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["recipes"] = tgui_recipes() .["maxAmount"] = max_amount @@ -94,7 +94,7 @@ assembled[++assembled.len] = recipe.tgui_recipe_data() return assembled -/obj/item/stack/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/stack/ui_data(mob/user, datum/tgui/ui) . = ..() .["amount"] = get_amount() diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 558ba61397..c1f39b35ae 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -125,7 +125,7 @@ can_hold = list(/obj/item/stack/ore) var/stored_ore = list() var/total_ore = 0 //current ore stored - var/max_ore = 200 //how much ore it can hold + var/max_ore = 300 //how much ore it can hold var/last_update = 0 /obj/item/storage/bag/ore/update_w_class() @@ -209,7 +209,7 @@ /obj/item/storage/bag/ore/proc/take(obj/item/stack/ore/O) if(!istype(O)) - return + return FALSE var/overflow = max((total_ore + O.amount) - max_ore, 0) var/store_amount = O.amount - overflow @@ -222,8 +222,10 @@ if(overflow) O.use(store_amount) O.forceMove(drop_location()) + return FALSE else qdel(O) + return TRUE /obj/item/storage/bag/ore/proc/deposit(atom/newloc, amount = 50) if(isOreEmpty()) @@ -269,6 +271,14 @@ icon = 'icons/obj/lavaland.dmi' icon_state = "golisatchel" +//Bluespace. +/obj/item/storage/bag/ore/bluespace + name = "mining satchel of holding" + desc = "This advanced spacious storage efficiently stores and transports ores using bluespace technology. It's like having an ore box latched onto your pocket!" + icon_state = "satchel_bspace" + max_ore = SHORT_REAL_LIMIT //if someone manages to reach 16+ million ores in a single 5 hour round, they'd have to be something else. + + // ----------------------------- // Plant bag // ----------------------------- diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index ce0c3912d9..367b4c79bc 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -157,7 +157,7 @@ //Returns the amount of fuel in the welder /obj/item/weldingtool/proc/get_fuel() - return reagents.get_reagent_amount("fuel") + return reagents.get_reagent_amount(/datum/reagent/fuel) /obj/item/weldingtool/proc/get_max_fuel() return max_fuel diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 85a2cb1fbd..e1ddadbd76 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -117,7 +117,7 @@ get_asset_datum(/datum/asset/spritesheet/pipes), ) -/obj/item/pipe_dispenser/ui_state(mob/user, datum/tgui_module/module) +/obj/item/pipe_dispenser/ui_state() return GLOB.inventory_state /obj/item/pipe_dispenser/ui_interact(mob/user, datum/tgui/ui) @@ -127,11 +127,11 @@ ui = new(user, src, "RapidPipeDispenser", name) ui.open() -/obj/item/pipe_dispenser/ui_static_data(mob/user) +/obj/item/pipe_dispenser/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list("paint_colors" = GLOB.pipe_paint_colors) return data -/obj/item/pipe_dispenser/ui_data(mob/user) +/obj/item/pipe_dispenser/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "category" = category, "piping_layer" = piping_layer, @@ -165,7 +165,7 @@ data["init_directions"] = init_directions return data -/obj/item/pipe_dispenser/ui_act(action, params) +/obj/item/pipe_dispenser/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index d902d74c9c..036b90ef18 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -9,6 +9,7 @@ light_color = "#E09D37" var/wax = 2000 var/icon_type = "candle" + var/light_range_lit = 3 /obj/item/flame/candle/Initialize(mapload) . = ..() @@ -42,12 +43,11 @@ if(C.lit) light() - /obj/item/flame/candle/proc/light(var/flavor_text = "\The [usr] lights the [src].") if(!lit) lit = TRUE visible_message(flavor_text) - set_light(CANDLE_LUM) + set_light(light_range_lit) START_PROCESSING(SSobj, src) /obj/item/flame/candle/process(delta_time) @@ -116,10 +116,13 @@ light("\The [src] mysteriously lights itself!.") /obj/item/flame/candle/everburn/white + name = "white candle" desc = "a white pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments." icon_state = "whitecandle" icon_type = "whitecandle" + /obj/item/flame/candle/everburn/black + name = "black candle" desc = "a black pillar candle. Ominous." icon_state = "blackcandle" icon_type = "blackcandle" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 26c7a6a4d9..9fa66090e3 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -105,6 +105,7 @@ user.drop_all_held_items() user.stop_pulling() +/* grimdark code that's disabled for code quality reasons - readd later if we care var/last_chew = 0 /mob/living/carbon/human/RestrainedClickOn(var/atom/A) if (A != src) return ..() @@ -130,6 +131,7 @@ var/last_chew = 0 H:UpdateDamageIcon() last_chew = world.time +*/ /obj/item/handcuffs/fuzzy name = "fuzzy cuffs" diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm deleted file mode 100644 index 0ce4b552f4..0000000000 --- a/code/game/objects/items/weapons/hydroponics.dm +++ /dev/null @@ -1,116 +0,0 @@ -/* - * SeedBag - */ -//uncomment when this is updated to match storage update -/* -/obj/item/seedbag - icon = 'icons/obj/hydroponics_machines.dmi' - icon_state = "seedbag" - name = "Seed Bag" - desc = "A small satchel made for organizing seeds." - var/mode = 1; //0 = pick one at a time, 1 = pick all on tile - var/capacity = 500; //the number of seeds it can carry. - slot_flags = SLOT_BELT - w_class = ITEMSIZE_TINY - var/list/item_quants = list() - -/obj/item/seedbag/attack_self(mob/user) - . = ..() - if(.) - return - user.machine = src - interact(user) - -/obj/item/seedbag/verb/toggle_mode() - set name = "Switch Bagging Method" - set category = "Object" - - mode = !mode - switch (mode) - if(1) - to_chat(usr, "The bag now picks up all seeds in a tile at once.") - if(0) - to_chat(usr, "The bag now picks up one seed pouch at a time.") - -/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob) - ..() - if (istype(O, /obj/item/seedbag)) - var/obj/item/seedbag/S = O - if (S.mode == 1) - for (var/obj/item/seeds/G in locate(src.x,src.y,src.z)) - if (S.contents.len < S.capacity) - S.contents += G; - if(S.item_quants[G.name]) - S.item_quants[G.name]++ - else - S.item_quants[G.name] = 1 - else - to_chat(user, "The seed bag is full.") - S.updateUsrDialog() - return - to_chat(user, "You pick up all the seeds.") - else - if (S.contents.len < S.capacity) - S.contents += src; - if(S.item_quants[name]) - S.item_quants[name]++ - else - S.item_quants[name] = 1 - else - to_chat(user, "The seed bag is full.") - S.updateUsrDialog() - return - -/obj/item/seedbag/interact(mob/user as mob) - - var/dat = "Select an item:
" - - if (contents.len == 0) - dat += "No seeds loaded!" - else - for (var/O in item_quants) - if(item_quants[O] > 0) - var/N = item_quants[O] - dat += "[capitalize(O)]:" - dat += " [N] " - dat += "Vend" - dat += "
" - - dat += "
Unload All" - dat += "" - user << browse("Seedbag Supplies[dat]", "window=seedbag") - onclose(user, "seedbag") - return - -/obj/item/seedbag/Topic(href, href_list) - if(..()) - return - - usr.machine = src - if ( href_list["vend"] ) - var/N = href_list["vend"] - - if(item_quants[N] <= 0) // Sanity check, there are probably ways to press the button when it shouldn't be possible. - return - - item_quants[N] -= 1 - for(var/obj/O in contents) - if(O.name == N) - O.loc = get_turf(src) - usr.put_in_hands(O) - break - - else if ( href_list["unload"] ) - item_quants.Cut() - for(var/obj/O in contents ) - O.loc = get_turf(src) - - src.updateUsrDialog() - return - -/obj/item/seedbag/updateUsrDialog() - var/list/nearby = range(1, src) - for(var/mob/M in nearby) - if ((M.client && M.machine == src)) - src.attack_self(M) -*/ diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index f0891c5d90..ad2647dc7f 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -55,7 +55,10 @@ /obj/item/implant/proc/meltdown() //breaks it down, making implant unrecongizible to_chat(imp_in, "You feel something melting inside [part ? "your [part.name]" : "you"]!") if (part) - part.take_damage(burn = 15, used_weapon = "Electronics meltdown") + part.inflict_bodypart_damage( + burn = 15, + weapon_descriptor = "component meltdown", + ) else var/mob/living/M = imp_in M.apply_damage(15,BURN) diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 7a9d74f4d4..2c0a66bc19 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -103,7 +103,7 @@ /obj/item/material/knife/attack(target as mob, mob/living/user as mob) if ((MUTATION_CLUMSY in user.mutations) && prob(50)) to_chat(user, "You accidentally cut yourself with \the [src].") - user.take_organ_damage(20) + user.take_random_targeted_damage(brute = 20) return return ..() */ @@ -130,7 +130,7 @@ return ..() if ((MUTATION_CLUMSY in L.mutations) && prob(50)) to_chat(user, "\The [src] slips out of your hand and hits your head.") - L.take_organ_damage(10) + L.take_random_targeted_damage(brute = 10) L.afflict_unconscious(20 * 2) return CLICKCHAIN_DO_NOT_PROPAGATE return ..() diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index d2642c7f9a..00f632ce0f 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -133,11 +133,11 @@ if(affecting) if(affecting.robotic >= ORGAN_ROBOT) return - if(affecting.take_damage(damage_force, 0)) - H.UpdateDamageIcon() - H.update_health() + affecting.inflict_bodypart_damage( + brute = damage_force, + ) if(affecting.organ_can_feel_pain()) - H.afflict_paralyze(20 * 3) + H.afflict_paralyze(20 * 2) return check -= picked return diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 3d3d6380d0..1bbadc77cc 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -90,7 +90,7 @@ user.visible_message("\The [user] accidentally cuts [TU.himself] with \the [src].",\ "You accidentally cut yourself with \the [src].") var/mob/living/carbon/human/H = ishuman(user)? user : null - H.take_organ_damage(5,5) + H.take_random_targeted_damage(brute = 5, burn = 5) deactivate(user) else activate(user) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index c2c9c253b1..226cce82a3 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -403,7 +403,7 @@ return else G.stun_effect_act(10 , 50, BP_TORSO, src) - G.take_organ_damage(10) + G.take_random_targeted_damage(brute = 10) G.afflict_unconscious(20 * 20) playsound(src.loc, "sparks", 50, 1) return diff --git a/code/game/objects/items/weapons/nullrod.dm b/code/game/objects/items/weapons/nullrod.dm index 8a9188863e..022893442c 100644 --- a/code/game/objects/items/weapons/nullrod.dm +++ b/code/game/objects/items/weapons/nullrod.dm @@ -138,8 +138,8 @@ name = "holy claymore" desc = "A weapon fit for a crusade!" slot_flags = SLOT_BACK|SLOT_BELT + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE projectile_parry_chance = 30 - sharp = 1 attack_sound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -157,8 +157,7 @@ name = "sacred chainsaw sword" desc = "Suffer not a heretic to live." slot_flags = SLOT_BELT - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE attack_verb = list("sawed", "torn", "cut", "chopped", "diced") attack_sound = 'sound/weapons/chainsaw_attack.ogg' @@ -225,8 +224,7 @@ desc = "Ask not for whom the bell tolls..." armor_penetration = 35 slot_flags = SLOT_BACK - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE attack_verb = list("chopped", "sliced", "cut", "reaped") /obj/item/nullrod/scythe/vibro @@ -257,8 +255,7 @@ desc = "Good? Bad? You're the guy with the chainsaw hand." icon_state = "chainsaw_on" item_state = "mounted_chainsaw" - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE attack_verb = list("sawed", "torn", "cut", "chopped", "diced") attack_sound = 'sound/weapons/chainsaw_attack.ogg' @@ -273,7 +270,7 @@ name = "clown dagger" desc = "Used for absolutely hilarious sacrifices." attack_sound = 'sound/items/bikehorn.ogg' - sharp = 1 + damage_mode = DAMAGE_MODE_SHARP attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") /obj/item/nullrod/pride_hammer @@ -315,12 +312,12 @@ icon_state = "fedora" item_state = "fedora" slot_flags = SLOT_HEAD + damage_mode = DAMAGE_MODE_SHARP icon = 'icons/obj/clothing/hats.dmi' damage_force = 0 throw_speed = 4 throw_range = 7 throw_force = 30 - sharp = 1 attack_verb = list("enlightened", "redpilled") /obj/item/nullrod/armblade @@ -328,8 +325,7 @@ desc = "Particularly twisted deities grant gifts of dubious value." icon_state = "arm_blade" item_state = "arm_blade" - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE /obj/item/nullrod/armblade/Initialize(mapload) . = ..() @@ -372,7 +368,7 @@ damage_force = 15 defend_chance = 40 slot_flags = SLOT_BACK - sharp = 1 + damage_mode = DAMAGE_MODE_SHARP attack_sound = "swing_hit" attack_verb = list("smashed", "slammed", "whacked", "thwacked") icon_state = "bostaff0" @@ -407,8 +403,7 @@ item_state = "crysknife" name = "arrhythmic knife" desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn." - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP attack_sound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -422,14 +417,14 @@ desc = "Holding this makes you look absolutely devilish." attack_verb = list("poked", "impaled", "pierced", "jabbed") attack_sound = 'sound/weapons/bladeslice.ogg' - sharp = 1 + damage_mode = DAMAGE_MODE_SHARP /obj/item/nullrod/egyptian name = "egyptian staff" desc = "A tutorial in mummification is carved into the staff. You could probably craft the wraps if you had some cloth." icon_state = "pharaoh_sceptre" item_state = "pharaoh_sceptre" - attack_verb = list("bashes", "smacks", "whacks") + attack_verb = list("bashed", "smacked", "whacked") /obj/item/nullrod/rosary icon_state = "rosary" diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 244c885ee6..3e4238780e 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -90,7 +90,7 @@ break if(!success) - user.loc = pick(L) + user.forceMove(pick(L)) smoke.start() src.uses -= 1 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 7fe72fb72f..eea328313b 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -331,7 +331,7 @@ if ((MUTATION_CLUMSY in user.mutations) && prob(50)) to_chat(user, "You beat yourself in the head with [src].") var/mob/living/carbon/human/H = ishuman(user)? user : null - H?.take_organ_damage(5) + H?.take_random_targeted_damage(brute = 5) active = !active if (active) damage_force = 10 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index e005143e6e..fbae63a4aa 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -28,7 +28,7 @@ var/mob/living/carbon/human/H = user H.apply_damage(2*damage_force, BRUTE, BP_HEAD) else - L.take_organ_damage(2*damage_force) + L.take_random_targeted_damage(brute = 2*damage_force) return return ..() @@ -106,7 +106,7 @@ H.apply_damage(2*damage_force, BRUTE, BP_HEAD) else if(isliving(user)) var/mob/living/L = user - L.take_organ_damage(2*damage_force) + L.take_random_targeted_damage(brute = 2*damage_force) return var/old_damtype = damtype var/old_attack_verb = attack_verb diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index d223e575b2..a3477920d8 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -224,7 +224,7 @@ var/list/global/tank_gauge_cache = list() if (src.proxyassembly.assembly) src.proxyassembly.assembly.attack_self(user) -/obj/item/weapon/tank/ui_state(mob/user, datum/tgui_module/module) +/obj/item/weapon/tank/ui_state() return GLOB.deep_inventory_state /obj/item/tank/ui_interact(mob/user, datum/tgui/ui) @@ -233,7 +233,7 @@ var/list/global/tank_gauge_cache = list() ui = new(user, src, "Tank", name) ui.open() -/obj/item/tank/ui_static_data(mob/user) +/obj/item/tank/ui_static_data(mob/user, datum/tgui/ui) . = list ( "defaultReleasePressure" = round(TANK_DEFAULT_RELEASE_PRESSURE), "minReleasePressure" = round(TANK_MIN_RELEASE_PRESSURE), @@ -242,7 +242,7 @@ var/list/global/tank_gauge_cache = list() "fragmentPressure" = round(TANK_FRAGMENT_PRESSURE) ) -/obj/item/tank/ui_data(mob/user) +/obj/item/tank/ui_data(mob/user, datum/tgui/ui) . = list( "tankPressure" = round(air_contents.return_pressure()), "releasePressure" = round(distribute_pressure) @@ -266,7 +266,7 @@ var/list/global/tank_gauge_cache = list() return . -/obj/item/tank/ui_act(action, params) +/obj/item/tank/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index 6232c70c54..8f148088dc 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -38,7 +38,7 @@ if((MUTATION_CLUMSY in L.mutations) && prob(50)) //What if he's a clown? to_chat(victim, "You accidentally slam yourself with the [src]!") L.afflict_paralyze(20 * 1) - L.take_organ_damage(2) + L.take_random_targeted_damage(brute = 2) if(prob(50)) playsound(victim, 'sound/items/trayhit1.ogg', 50, 1) return @@ -60,9 +60,9 @@ if(prob(15)) victim.afflict_paralyze(20 * 3) - victim.take_organ_damage(3) + victim.take_random_targeted_damage(brute = 3) else - victim.take_organ_damage(5) + victim.take_random_targeted_damage(brute = 5) if(prob(50)) playsound(victim, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(victim, null)) @@ -106,10 +106,10 @@ O.show_message(SPAN_DANGER("[L] slams [victim] with the tray!"), SAYCODE_TYPE_VISIBLE) if(prob(10)) victim.afflict_stun(20 * rand(1,3)) - victim.take_organ_damage(3) + victim.take_random_targeted_damage(brute = 3) return else - victim.take_organ_damage(5) + victim.take_random_targeted_damage(brute = 5) return else //No eye or head protection, tough luck! @@ -130,10 +130,10 @@ O.show_message(SPAN_DANGER("[L] slams [victim] in the face with the tray!"), SAYCODE_TYPE_VISIBLE) if(prob(30)) victim.afflict_stun(20 * rand(2,4)) - victim.take_organ_damage(4) + victim.take_random_targeted_damage(brute = 4) return else - victim.take_organ_damage(8) + victim.take_random_targeted_damage(brute = 8) if(prob(30)) victim.afflict_paralyze(20 * 2) return diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 17d1162fa0..5157e7229f 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -321,7 +321,7 @@ e_args.performer.put_in_hands_or_drop(obj_cell_slot.remove_cell(e_args.performer)) return TRUE -//? Cells / Inducers +//* Cells / Inducers *// /** * get cell slot @@ -338,7 +338,7 @@ if(!isnull(obj_cell_slot?.cell) && !obj_cell_slot.primary && obj_cell_slot.receive_inducer) things_to_induce += obj_cell_slot.cell -//? Climbing +//* Climbing *// /obj/MouseDroppedOn(atom/dropping, mob/user, proximity, params) if(drag_drop_climb_interaction(user, dropping)) @@ -470,7 +470,7 @@ H.update_health() */ -//? Context +//* Context *// /obj/context_query(datum/event_args/actor/e_args) . = ..() @@ -507,14 +507,14 @@ return TRUE return ..() -//? EMP +//* EMP *// /obj/emp_act(severity) . = ..() if(obj_cell_slot?.receive_emp) obj_cell_slot?.cell?.emp_act(severity) -//? Hiding / Underfloor +//* Hiding / Underfloor *// /obj/proc/is_hidden_underfloor() return FALSE @@ -522,7 +522,7 @@ /obj/proc/should_hide_underfloor() return FALSE -//* Examine +//* Examine *// /obj/examine(mob/user, dist) . = ..() @@ -552,7 +552,29 @@ else . += SPAN_BOLDWARNING("It's falling apart!") -//* Resists +//* Orientation *// + +/** + * Standard wallmount orientation: face away + */ +/obj/proc/auto_orient_wallmount_single() + for(var/dir in GLOB.cardinal) + if(get_step(src, dir)?.get_wallmount_anchor()) + setDir(turn(dir, 180)) + return + +/** + * Standard wallmount orientation: face away + * + * Directly sets dir without setDir() + */ +/obj/proc/auto_orient_wallmount_single_preinit() + for(var/dir in GLOB.cardinal) + if(get_step(src, dir)?.get_wallmount_anchor()) + src.dir = turn(dir, 180) + return + +//* Resists *// /** * called when something tries to resist out from inside us. @@ -625,7 +647,7 @@ animate(src, transform=turn(matrix(), 8*shake_dir), pixel_x=init_px + 2*shake_dir, time=1) animate(transform=null, pixel_x=init_px, time=6, easing=ELASTIC_EASING) -//? Tool System +//* Tool System *// /obj/dynamic_tool_query(obj/item/I, datum/event_args/actor/clickchain/e_args, list/hint_images = list()) if(isnull(obj_cell_slot) || !obj_cell_slot.remove_tool_behavior || !obj_cell_slot.interaction_active(e_args.performer)) diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index c60289bde9..02803fa76d 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -252,7 +252,7 @@ ), prob(2);list( /obj/item/hardsuit/industrial/equipped, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/structure/closet/crate/engineering ), prob(2);list( @@ -311,43 +311,43 @@ ), prob(2);list( /obj/item/pickaxe/silver, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/drill, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/jackhammer, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/diamond, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/diamonddrill, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/gold, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/plasmacutter, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index b6fc32dbd1..f4aad4afb1 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -70,6 +70,16 @@ /obj/item/tool/wrench/clockwork, /obj/item/multitool/clockwork) +/obj/random/ore_bag + name = "random mining satchel" + desc = "This is a random mining satchel." + icon = 'icons/obj/mining.dmi' + icon_state = "satchel_bspace" + +/obj/random/ore_bag/item_to_spawn() + return pick(prob(6);/obj/item/storage/bag/ore, + prob(1);/obj/item/storage/bag/ore/bluespace) + /obj/random/technology_scanner name = "random scanner" desc = "This is a random technology scanner." @@ -1060,7 +1070,7 @@ /obj/random/multiple/ores/item_to_spawn() return pick( prob(9);list( - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/shovel, /obj/item/stack/ore/glass, //TODO: replace this legacy loot nonsense. /obj/item/stack/ore/glass, @@ -1080,7 +1090,7 @@ /obj/item/stack/ore/hydrogen ), prob(7);list( - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/pickaxe, /obj/item/stack/ore/osmium, /obj/item/stack/ore/osmium, diff --git a/code/game/objects/random/underdark.dm b/code/game/objects/random/underdark.dm index 8df29b2705..4b79d82da0 100644 --- a/code/game/objects/random/underdark.dm +++ b/code/game/objects/random/underdark.dm @@ -40,7 +40,7 @@ /obj/random/multiple/underdark/ores/item_to_spawn() return pick( prob(9);list( - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/shovel, /obj/item/stack/ore/glass, //TODO: tell this legacy loot bullshit to fuck off so we don't have this happening. /obj/item/stack/ore/glass, @@ -60,7 +60,7 @@ /obj/item/stack/ore/hydrogen ), prob(7);list( - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/pickaxe, /obj/item/stack/ore/osmium, /obj/item/stack/ore/osmium, diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 3c4278b805..ec2ae31c51 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -32,7 +32,7 @@ LINEN BINS add_fingerprint(user) /obj/item/bedsheet/attackby(obj/item/I, mob/user) - if(is_sharp(I)) + if(is_sharp(I) || I.tool_check(TOOL_WIRECUTTER)) user.visible_message("\The [user] begins cutting up [src] with [I].", "You begin cutting up [src] with [I].") if(do_after(user, 50)) to_chat(user, "You cut [src] into pieces!") diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index 99393dc3cd..e5cfe97fa4 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -26,6 +26,8 @@ /obj/structure/catwalk/Initialize(mapload) . = ..() + if(istype(loc, /turf/simulated/floor/water)) + layer = ABOVE_TURF_LAYER for(var/obj/structure/catwalk/O in range(1)) O.update_icon() for(var/obj/structure/catwalk/C in get_turf(src)) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 0bb46b31e6..4b6d3cafce 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -77,6 +77,8 @@ return 1 /obj/structure/closet/crate/attackby(obj/item/W as obj, mob/user as mob) + if(user.a_intent == INTENT_HARM) + return ..() if(opened) if(isrobot(user)) return diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index e9c7a16f5a..abf55da59e 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -253,7 +253,8 @@ /obj/structure/girder/drop_products(method, atom/where) . = ..() material_structure.place_dismantled_product(where, 2) - material_reinforcing.place_dismantled_product(where, 1) + if(material_reinforcing) + material_reinforcing.place_dismantled_product(where, 1) /obj/structure/girder/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) var/turf/simulated/T = get_turf(src) diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index f16820a612..21227f6cc2 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -77,7 +77,9 @@ GLOBAL_LIST_INIT(wallframe_typecache, typecacheof(list( var/obj/structure/wall_frame/neighbor = locate() in step_turf if(neighbor) continue - if(!can_area_smooth(step_turf)) + var/can_area_smooth + CAN_AREAS_SMOOTH(src, step_turf, can_area_smooth) + if(isnull(can_area_smooth)) continue for(var/atom/movable/movable_thing as anything in step_turf) if(GLOB.wallframe_typecache[movable_thing.type]) diff --git a/code/game/objects/structures/tables/flipping.dm b/code/game/objects/structures/tables/flipping.dm index 84d1a66766..1f5f41ead0 100644 --- a/code/game/objects/structures/tables/flipping.dm +++ b/code/game/objects/structures/tables/flipping.dm @@ -123,8 +123,8 @@ break if(failed) to_chat(usr, SPAN_WARNING("[blocking? "[blocking] is in the way!" : "It won't budge."]")) - - unflip() + else + unflip() /obj/structure/table/proc/flip(var/direction) var/list/obj/structure/table/tables = tableflip_closure(direction) diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index dff69f3027..c0a849a6e4 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -31,6 +31,8 @@ //A variant that will can be hidden underneath tiles similiar to pipes and such /obj/structure/transit_tube/hidden level = 1 + plane = TURF_PLANE + layer = BELOW_TURF_LAYER // A place where tube pods stop, and people can get in or out. // Mappers: use "Generate Instances from Directions" for this @@ -59,32 +61,8 @@ /obj/structure/transit_tube_pod/Destroy() for(var/atom/movable/AM in contents) - AM.loc = loc - - ..() - - - -// When destroyed by explosions, properly handle contents. -/obj/structure/transit_tube_pod/legacy_ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/AM in contents) - AM.loc = loc - LEGACY_EX_ACT(AM, severity + 1, null) - - qdel(src) - return - if(2.0) - if(prob(50)) - for(var/atom/movable/AM in contents) - AM.loc = loc - LEGACY_EX_ACT(AM, severity + 1, null) - - qdel(src) - return - if(3.0) - return + AM.forceMove(loc) + return ..() /obj/structure/transit_tube_pod/Initialize(mapload) . = ..() @@ -115,7 +93,7 @@ to_chat(AM, "The tube's support pylons block your way.") return ..() else - AM.loc = src.loc + AM.forceMove(loc) to_chat(AM, "You slip under the tube.") /obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj) @@ -125,7 +103,7 @@ to_chat(AM, "The pod is already occupied.") return else if(!pod.moving && (pod.dir in directions())) - AM.loc = pod + AM.forceMove(pod) return @@ -332,7 +310,7 @@ last_delay = current_tube.enter_delay(src, next_dir) sleep(last_delay) setDir(next_dir) - loc = next_loc // When moving from one tube to another, skip collision and such. + forceMove(next_loc) // When moving from one tube to another, skip collision and such. density = current_tube.density if(current_tube && current_tube.should_stop_pod(src, next_dir)) @@ -379,7 +357,7 @@ if(istype(mob, /mob) && mob.client) // If the pod is not in a tube at all, you can get out at any time. if(!(locate(/obj/structure/transit_tube) in loc)) - mob.loc = loc + mob.forceMove(loc) mob.client.Move(get_step(loc, direction), direction) //if(moving && istype(loc, /turf/space)) @@ -392,7 +370,7 @@ if(!station.pod_moving) if(direction == station.dir) if(station.icon_state == "open") - mob.loc = loc + mob.forceMove(loc) mob.client.Move(get_step(loc, direction), direction) else diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b1adaf1250..b73334fb62 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -33,7 +33,7 @@ if(ishuman(user)) user.put_in_hands(I) else - I.loc = get_turf(src) + I.forceMove(get_turf(src)) to_chat(user, "You find \an [I] in the cistern.") w_items -= I.w_class return @@ -351,7 +351,7 @@ var/temperature = temperature_settings[watertemp] var/temp_adj = between(BODYTEMP_COOLING_MAX, temperature - M.bodytemperature, BODYTEMP_HEATING_MAX) - M.bodytemperature += temp_adj + M.adjust_bodytemperature(temp_adj) if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 227add68c5..e793d4fe94 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -722,59 +722,6 @@ animate(src, color = GLASS_COLOR_FROSTED, time=5) set_opacity(TRUE) -/obj/machinery/button/windowtint - name = "window tint control" - icon = 'icons/obj/power.dmi' - icon_state = "light0" - desc = "A remote control switch for polarized windows." - var/range = 7 - -/obj/machinery/button/windowtint/attack_hand(mob/user, list/params) - if (..()) - return TRUE - else - toggle_tint() - -/obj/machinery/button/windowtint/proc/toggle_tint() - use_power(5) - - active = !active - update_appearance() - - for (var/obj/structure/window/reinforced/polarized/target_window in range(src, range)) - if (target_window.id == id || !target_window.id) - INVOKE_ASYNC(target_window, TYPE_PROC_REF(/obj/structure/window/reinforced/polarized, toggle)) - -/obj/machinery/button/windowtint/power_change() - ..() - if (active && !powered(power_channel)) - toggle_tint() - -/obj/machinery/button/windowtint/update_icon_state() - . = ..() - icon_state = "light[active]" - -/obj/machinery/button/windowtint/attackby(obj/item/object, mob/user) - if (istype(object, /obj/item/multitool)) - var/obj/item/multitool/MT = object - if (!id) - // If no ID is set yet (newly built button?) let them select an ID for first-time use! - var/new_id = tgui_input_text( - user = user, - message = "Enter the ID for the window.", - title = name, - ) - if (new_id && user.get_active_held_item() != object && in_range(src, user)) - id = new_id - to_chat(user, SPAN_NOTICE("The new ID of \the [src] is [id]")) - if (id) - // It already has an ID (or they just set one), buffer it for copying to windows. - to_chat(user, SPAN_NOTICE("You store \the [src] in \the [MT]'s buffer!")) - MT.connectable = src - MT.update_appearance() - return TRUE - return ..() - /obj/structure/window/wooden name = "wooden panel" desc = "A set of wooden panelling, designed to hide the drab grey walls." diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index c50f76ac51..098d0c54e7 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -10,6 +10,7 @@ icon = 'icons/obj/structures/window_spawners.dmi' icon_state = "wingrille" density = TRUE + layer = WINDOW_LAYER anchored = 1.0 pressure_resistance = 4*ONE_ATMOSPHERE CanAtmosPass = ATMOS_PASS_AIR_BLOCKED diff --git a/code/game/turfs/simulated/floor_types/river.dm b/code/game/turfs/simulated/floor_types/river.dm new file mode 100644 index 0000000000..77bab49dc2 --- /dev/null +++ b/code/game/turfs/simulated/floor_types/river.dm @@ -0,0 +1,126 @@ +/turf/simulated/floor/water/river + name = "shallow river" + desc = "A moving body of water. It seems shallow enough to walk through, if needed." + icon = 'icons/turf/outdoors.dmi' + icon_state = "seashallow" // So it shows up in the map editor as water. + water_state = "rivershallow" + water_file = 'icons/turf/river.dmi' + under_state = "desert" + var/delta_sum = 0 + var/float_delay = 10 + var/moving_dir = SOUTH + +/turf/simulated/floor/water/river/update_icon() + switch(moving_dir) + if(NORTH) + water_state = initial(water_state) + "_north" + if(SOUTH) + water_state = initial(water_state) + "_south" + if(EAST) + water_state = initial(water_state) + "_east" + if(WEST) + water_state = initial(water_state) + "_west" + else + message_admins("[src.type] ([src.x];[src.y];[src.z]) without a properly set moving dir, defaulting to north.") + moving_dir = NORTH + water_state = initial(water_state) + "_north" + . = ..() +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/south) +/turf/simulated/floor/water/river/south + dir = SOUTH + moving_dir = SOUTH + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/north) +/turf/simulated/floor/water/river/north + dir = NORTH + moving_dir = NORTH + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/east) +/turf/simulated/floor/water/river/east + dir = EAST + moving_dir = EAST + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/west) +/turf/simulated/floor/water/river/west + dir = WEST + moving_dir = WEST + +/turf/simulated/floor/water/river/deep + name = "deep river" + desc = "A deep moving body of water. Walking through this is gonna be a pain." + icon_state = "seadeep" + water_state = "riverdeep" + under_state = "abyss" + slowdown = 8 + depth = 2 + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/deep/south) +/turf/simulated/floor/water/river/deep/south + dir = SOUTH + moving_dir = SOUTH + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/deep/north) +/turf/simulated/floor/water/river/deep/north + dir = NORTH + moving_dir = NORTH + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/deep/east) +/turf/simulated/floor/water/river/deep/east + dir = EAST + moving_dir = EAST + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/deep/west) +/turf/simulated/floor/water/river/deep/west + dir = WEST + moving_dir = WEST + +/turf/simulated/floor/water/river/Entered(atom/movable/AM, atom/oldloc) + . = ..() + START_PROCESSING(SSobj, src) + +/turf/simulated/floor/water/river/Exited(atom/movable/AM, atom/newloc) + . = ..() + STOP_PROCESSING(SSobj, src) + +/turf/simulated/floor/water/river/process(delta_time) + if(!LAZYLEN(contents)) + STOP_PROCESSING(SSobj, src)//Failsafe, no need to process if we dont have any contents + return + if(!((locate(/obj/item) in contents) || (locate(/obj/vehicle) in contents) || (locate(/mob/living) in contents))) + STOP_PROCESSING(SSobj, src) + return + if(locate(/obj/structure/catwalk) in contents) + return//Stop floating stuff down stream when there is a catwalk + delta_sum += delta_time + if(delta_sum > float_delay) + addtimer(CALLBACK(src, PROC_REF(convey), src.contents), 1) + delta_sum = 0 + float_delay = rand(5, 20) + +/turf/simulated/floor/water/river/proc/convey(list/affecting) + var/turf/T = get_step(src, moving_dir) + if(!T) + return + var/list/to_move + LAZYINITLIST(to_move) + for(var/atom/movable/A in affecting) + if(istype(A, /atom/movable/lighting_overlay)) + continue + if(!(A.anchored || (A.atom_flags & ATOM_ABSTRACT))) + if(A.loc == src) // prevents the object from being affected if it's not currently here. + step(A,moving_dir) + + +/obj/effect/floor_decal/river_beach_edge + name = "beach" + icon = 'icons/turf/river.dmi' + icon_state = "shore_overlay" + layer = ABOVE_TURF_LAYER //So it showes above the water layer of rivers + +/obj/effect/floor_decal/river_beach_corner_edge + name = "beach corner" + icon = 'icons/turf/river.dmi' + icon_state = "shore_corner_overlay" + layer = ABOVE_TURF_LAYER //So it showes above the water layer of rivers + + diff --git a/code/game/turfs/simulated/floor_types/water.dm b/code/game/turfs/simulated/floor_types/water.dm index 7092dbebc7..bc5802aece 100644 --- a/code/game/turfs/simulated/floor_types/water.dm +++ b/code/game/turfs/simulated/floor_types/water.dm @@ -5,6 +5,7 @@ icon = 'icons/turf/outdoors.dmi' icon_state = "seashallow" // So it shows up in the map editor as water. var/water_state = "water_shallow" + var/water_file = 'icons/turf/outdoors.dmi' var/under_state = "rock" edge_icon_state = "water_shallow" slowdown = 4 @@ -28,7 +29,7 @@ ..() // To get the edges. icon_state = under_state // This isn't set at compile time in order for it to show as water in the map editor. - var/image/water_sprite = image(icon = 'icons/turf/outdoors.dmi', icon_state = water_state, layer = WATER_LAYER) + var/image/water_sprite = image(icon = water_file, icon_state = water_state, layer = WATER_LAYER) add_overlay(water_sprite) /turf/simulated/floor/water/attackby(obj/item/O as obj, mob/user as mob) diff --git a/code/game/turfs/simulated/flooring/flooring_decals.dm b/code/game/turfs/simulated/flooring/flooring_decals.dm index d188a72900..1f3ac474ff 100644 --- a/code/game/turfs/simulated/flooring/flooring_decals.dm +++ b/code/game/turfs/simulated/flooring/flooring_decals.dm @@ -51,7 +51,7 @@ var/list/floor_decals = list() var/image/I = floor_decals[cache_key] if(!I) I = image(icon = icon, icon_state = icon_state, dir = dir) - I.layer = T.layer + I.layer = (T.layer > src.layer ? T.layer : src.layer) I.color = color I.alpha = alpha floor_decals[cache_key] = I diff --git a/code/game/turfs/simulated/flooring/flooring_premade.dm b/code/game/turfs/simulated/flooring/flooring_premade.dm index dd0d45746c..b905f55afd 100644 --- a/code/game/turfs/simulated/flooring/flooring_premade.dm +++ b/code/game/turfs/simulated/flooring/flooring_premade.dm @@ -285,6 +285,8 @@ icon_state = "reinforced" initial_flooring = /singleton/flooring/reinforced +CREATE_STANDARD_TURFS(/turf/simulated/floor/reinforced) + /turf/simulated/floor/reinforced/airless initial_gas_mix = GAS_STRING_VACUUM diff --git a/code/game/turfs/simulated/wall/materials.dm b/code/game/turfs/simulated/wall/materials.dm index 7557b1c12a..856fc1f2ef 100644 --- a/code/game/turfs/simulated/wall/materials.dm +++ b/code/game/turfs/simulated/wall/materials.dm @@ -52,25 +52,33 @@ /turf/simulated/wall/proc/update_materials() if(material_reinf) construction_stage = 6 - name = "reinforced [material_outer.display_name] wall" - desc = "It seems to be a section of hull reinforced with [material_reinf.display_name] and plated with [material_outer.display_name]." - else if(material_outer) - construction_stage = null - name = "[material_outer.display_name] wall" - desc = "It seems to be a section of hull plated with [material_outer.display_name]." else construction_stage = null - name = "wall" - desc = "It seems to be a section of hull." - var/integrity_factor = (isnull(material_outer)? 1 : material_outer.relative_integrity) * 0.75 - integrity_factor += (isnull(material_girder)? 1 : material_girder.relative_integrity) * 0.25 - integrity_factor += (isnull(material_reinf)? 0 : material_reinf.relative_integrity) * 0.5 + + if(!isnull(material_reinf)) + icon = material_reinf.icon_reinf + else if(!isnull(material_outer)) + icon = material_outer.icon_base + else + icon = 'icons/turf/walls/solid_wall.dmi' + + stripe_icon = material_outer.wall_stripe_icon + material_color = material_outer.icon_colour + + + var/integrity_factor = (material_outer ? material_outer.relative_integrity : 1) * 0.75 + integrity_factor += (material_girder ? material_girder.relative_integrity : 1) * 0.25 + integrity_factor += (material_reinf ? material_reinf.relative_integrity : 0) * 0.5 + set_multiplied_integrity(integrity_factor, FALSE) - var/datum/armor/grabbed = SSmaterials.wall_materials_armor(list((material_girder) = MATERIAL_SIGNIFICANCE_WALL_GIRDER, (material_reinf) = MATERIAL_SIGNIFICANCE_WALL_REINF, (material_outer) = MATERIAL_SIGNIFICANCE_WALL)) - set_armor(grabbed) + set_armor(SSmaterials.wall_materials_armor(list( + (material_girder) = MATERIAL_SIGNIFICANCE_WALL_GIRDER, + (material_reinf) = MATERIAL_SIGNIFICANCE_WALL_REINF, + (material_outer) = MATERIAL_SIGNIFICANCE_WALL) + )) rad_insulation = 1 / ((material_girder?.density * 0.1 + material_outer?.density * 1.2 + material_reinf?.density * 0.5) / 8 * 1.7) diff --git a/code/game/turfs/simulated/wall/wall.dm b/code/game/turfs/simulated/wall/wall.dm index b3f0d5f36a..4c0d366944 100644 --- a/code/game/turfs/simulated/wall/wall.dm +++ b/code/game/turfs/simulated/wall/wall.dm @@ -48,39 +48,40 @@ var/active var/can_open = FALSE + /// The base material of the wall. var/datum/material/material_outer = /datum/material/steel + /// The reinforcement material of the wall. var/datum/material/material_reinf + /// The material of the girders that are produced when the wall is dismantled. var/datum/material/material_girder = /datum/material/steel var/last_state var/construction_stage + + /// The material color of the wall. + VAR_PROTECTED/material_color /// Paint color of which the wall has been painted with. - var/paint_color + VAR_PROTECTED/paint_color /// Paint color of which the stripe has been painted with. Will not overlay a stripe if no paint is applied - var/stripe_color - var/stripe_icon - var/cache_key - var/shiny_wall + VAR_PROTECTED/stripe_color + + /// This is set by materials, do not touch! + VAR_PRIVATE/stripe_icon + /// This is set by update_overlays(), do not touch! + VAR_PRIVATE/cache_key + + var/shiny_wall //? Not even used rn? var/shiny_stripe /turf/simulated/wall/Initialize(mapload) - . = ..() // Remove the color that was set for mapping clarity. + //? This is before the ..() as it does stuff if there is a color. color = null - // init materials - init_materials() - if(smoothing_flags & SMOOTH_DIAGONAL_CORNERS && fixed_underlay) //Set underlays for the diagonal walls. - var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, plane = TURF_PLANE) - if(fixed_underlay["space"]) - underlay_appearance.icon = 'icons/turf/space.dmi' - underlay_appearance.icon_state = "space" - underlay_appearance.plane = SPACE_PLANE - else - underlay_appearance.icon = fixed_underlay["icon"] - underlay_appearance.icon_state = fixed_underlay["icon_state"] - fixed_underlay = string_assoc_list(fixed_underlay) - underlays += underlay_appearance + . = ..() + + // Init materials + init_materials() /turf/simulated/wall/Destroy() clear_plants() diff --git a/code/game/turfs/simulated/wall/wall_icon.dm b/code/game/turfs/simulated/wall/wall_icon.dm index 04dc15608a..760e99eec4 100644 --- a/code/game/turfs/simulated/wall/wall_icon.dm +++ b/code/game/turfs/simulated/wall/wall_icon.dm @@ -15,12 +15,13 @@ GLOBAL_LIST_INIT(neighbor_typecache, typecacheof(list( /obj/structure/window/reinforced/polarized/full, /obj/structure/wall_frame, /obj/machinery/smartfridge, - ))) +))) GLOBAL_LIST_EMPTY(wall_overlays_cache) /turf/simulated/wall/proc/generate_wall_damage_overlays() - var/alpha_inc = 256 / damage_overlays.len + //? Global because all walls share the same damage overlays, and the len is constant. + var/global/alpha_inc = 256 / damage_overlays.len for(var/i = 1; i <= damage_overlays.len; i++) var/image/img = image(icon = 'icons/turf/walls/damage_masks.dmi', icon_state = "overlay_damage") @@ -28,19 +29,36 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) img.alpha = (i * alpha_inc) - 1 damage_overlays[i] = img -/turf/simulated/wall/proc/get_wall_icon() - if(!isnull(material_reinf)) - return material_reinf.icon_reinf - if(!isnull(material_outer)) - return material_outer.icon_base - return 'icons/turf/walls/solid_wall.dmi' +/// Paints the wall with a new color. +/turf/simulated/wall/proc/paint_wall(new_paint) + paint_color = new_paint + update_appearance() -/turf/simulated/wall/proc/apply_reinf_overlay() - . = istype(material_reinf) +/turf/simulated/wall/proc/paint_stripe(new_paint) + stripe_color = new_paint + update_appearance() -/turf/simulated/wall/update_icon_state() - . = ..() +/turf/simulated/wall/update_name(updates) + if(material_reinf) + name = "reinforced [material_outer.display_name] wall" + else if(material_outer) + name = "[material_outer.display_name] wall" + else + name = "wall" + + return ..() + +/turf/simulated/wall/update_desc(updates) + if(material_reinf) + desc = "It seems to be a section of hull reinforced with [material_reinf.display_name] and plated with [material_outer.display_name]." + else if(material_outer) + desc = "It seems to be a section of hull plated with [material_outer.display_name]." + else + desc = "It seems to be a section of hull." + + return ..() +/turf/simulated/wall/update_icon_state() // handle fakewalls // TODO: MAKE FAKEWALLS NOT TURFS WTF if(!density) @@ -49,20 +67,18 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) else if(icon_state == "fwall_open") icon_state = cached_wall_state + return ..() + /turf/simulated/wall/update_overlays() - icon = get_wall_icon() - color = isnull(material_outer)? null : material_outer.icon_colour - if(isnull(material_outer)) - overlays.len = 0 - return - stripe_icon = material_outer.wall_stripe_icon - var/plating_color = paint_color || material_outer.icon_colour || COLOR_WALL_GUNMETAL //fallback in case things are really fucked. - stripe_color = stripe_color || paint_color || material_outer.icon_colour + var/wall_paint = paint_color || material_color + var/stripe_paint = stripe_color || paint_color || material_color var/neighbor_stripe = NONE for (var/cardinal = NORTH; cardinal <= WEST; cardinal *= 2) //No list copy please good sir var/turf/step_turf = get_step(src, cardinal) - if(!can_area_smooth(step_turf)) + var/can_area_smooth + CAN_AREAS_SMOOTH(src, step_turf, can_area_smooth) + if(isnull(can_area_smooth)) continue for(var/atom/movable/movable_thing as anything in step_turf) if(GLOB.neighbor_typecache[movable_thing.type]) @@ -70,16 +86,16 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) break var/old_cache_key = cache_key - cache_key = "[icon]:[smoothing_junction]:[plating_color]:[stripe_icon]:[stripe_color]:[neighbor_stripe]:[shiny_wall]:[shiny_stripe]:[construction_stage]" + cache_key = "[icon]:[smoothing_junction]:[wall_paint]:[stripe_icon]:[stripe_paint]:[neighbor_stripe]:[shiny_wall]:[shiny_stripe]:[construction_stage]" if(!(old_cache_key == cache_key)) + color = wall_paint + var/potential_overlays = GLOB.wall_overlays_cache[cache_key] if(potential_overlays) overlays = potential_overlays - color = plating_color else - color = plating_color - //Updating the unmanaged wall overlays (unmanaged for optimisations) + //? Updating the unmanaged wall overlays (unmanaged for optimisations) overlays.len = 0 var/list/new_overlays = list() @@ -90,7 +106,7 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) var/image/smoothed_stripe = image(stripe_icon, icon_state) smoothed_stripe.appearance_flags = RESET_COLOR - smoothed_stripe.color = stripe_color + smoothed_stripe.color = stripe_paint new_overlays += smoothed_stripe if(shiny_stripe) @@ -101,8 +117,9 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) if(neighbor_stripe) var/image/neighb_stripe_overlay = image('icons/turf/walls/neighbor_stripe.dmi', "stripe-[neighbor_stripe]") neighb_stripe_overlay.appearance_flags = RESET_COLOR - neighb_stripe_overlay.color = stripe_color + neighb_stripe_overlay.color = stripe_paint new_overlays += neighb_stripe_overlay + if(shiny_wall) var/image/shine = image('icons/turf/walls/neighbor_stripe.dmi', "shine-[neighbor_stripe]") shine.appearance_flags = RESET_COLOR diff --git a/code/game/turfs/simulated/wall_types/wall_types.dm b/code/game/turfs/simulated/wall_types/wall_types.dm index 988e454d9e..dce5db87a5 100644 --- a/code/game/turfs/simulated/wall_types/wall_types.dm +++ b/code/game/turfs/simulated/wall_types/wall_types.dm @@ -435,93 +435,110 @@ I.color = stripe_color add_overlay(I) -/turf/simulated/wall/r_wall/prepainted +/turf/simulated/wall/prepainted + name = "Pre-Painted Wall" color = COLOR_WALL_GUNMETAL paint_color = COLOR_WALL_GUNMETAL - icon_state = "reinforced_solid" -/turf/simulated/wall/r_wall/prepainted/command - stripe_color = COLOR_COMMAND_BLUE +/turf/simulated/wall/prepainted/command color = COLOR_COMMAND_BLUE + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_COMMAND_BLUE -/turf/simulated/wall/r_wall/prepainted/security - stripe_color = COLOR_SECURITY_RED +/turf/simulated/wall/prepainted/command/alt + color = COLOR_GOLD + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_GOLD + +/turf/simulated/wall/prepainted/security color = COLOR_SECURITY_RED + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_SECURITY_RED -/turf/simulated/wall/r_wall/prepainted/medical +/turf/simulated/wall/prepainted/medical + color = COLOR_BABY_BLUE paint_color = COLOR_GRAY80 stripe_color = COLOR_BABY_BLUE - color = COLOR_BABY_BLUE -/turf/simulated/wall/r_wall/prepainted/engineering - stripe_color = COLOR_SUN +/turf/simulated/wall/prepainted/engineering color = COLOR_SUN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_SUN -/turf/simulated/wall/r_wall/prepainted/engineering/atmos - stripe_color = COLOR_ATMOSPHERICS_CYAN +/turf/simulated/wall/prepainted/engineering/atmos color = COLOR_ATMOSPHERICS_CYAN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_ATMOSPHERICS_CYAN -/turf/simulated/wall/r_wall/prepainted/civilian - stripe_color = COLOR_PALE_BTL_GREEN +/turf/simulated/wall/prepainted/civilian color = COLOR_PALE_BTL_GREEN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_PALE_BTL_GREEN -/turf/simulated/wall/r_wall/prepainted/exploration - stripe_color = COLOR_EXPLO_VIOLET +/turf/simulated/wall/prepainted/exploration color = COLOR_EXPLO_VIOLET + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_EXPLO_VIOLET -/turf/simulated/wall/r_wall/prepainted/science +/turf/simulated/wall/prepainted/science + color = COLOR_PURPLE_GRAY paint_color = COLOR_GRAY80 stripe_color = COLOR_PURPLE_GRAY - color = COLOR_PURPLE_GRAY -/turf/simulated/wall/r_wall/prepainted/cargo - stripe_color = COLOR_CARGO_BROWN +/turf/simulated/wall/prepainted/cargo color = COLOR_CARGO_BROWN - -/turf/simulated/wall/prepainted paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_CARGO_BROWN + + +/turf/simulated/wall/r_wall/prepainted + name = "PRe-Painted Reinforced Wall" + icon_state = "reinforced_solid" color = COLOR_WALL_GUNMETAL - icon_state = "solid" + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_WALL_GUNMETAL -/turf/simulated/wall/prepainted/command - stripe_color = COLOR_COMMAND_BLUE +/turf/simulated/wall/r_wall/prepainted/command color = COLOR_COMMAND_BLUE + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_COMMAND_BLUE -/turf/simulated/wall/prepainted/command/alt - paint_color = COLOR_GRAY15 - stripe_color = COLOR_GOLD - color = COLOR_GOLD - -/turf/simulated/wall/prepainted/security - stripe_color = COLOR_SECURITY_RED +/turf/simulated/wall/r_wall/prepainted/security color = COLOR_SECURITY_RED + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_SECURITY_RED -/turf/simulated/wall/prepainted/medical +/turf/simulated/wall/r_wall/prepainted/medical + color = COLOR_BABY_BLUE paint_color = COLOR_GRAY80 stripe_color = COLOR_BABY_BLUE - color = COLOR_BABY_BLUE -/turf/simulated/wall/prepainted/engineering - stripe_color = COLOR_SUN +/turf/simulated/wall/r_wall/prepainted/engineering color = COLOR_SUN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_SUN -/turf/simulated/wall/prepainted/engineering/atmos - stripe_color = COLOR_ATMOSPHERICS_CYAN +/turf/simulated/wall/r_wall/prepainted/engineering/atmos color = COLOR_ATMOSPHERICS_CYAN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_ATMOSPHERICS_CYAN -/turf/simulated/wall/prepainted/civilian - stripe_color = COLOR_PALE_BTL_GREEN +/turf/simulated/wall/r_wall/prepainted/civilian color = COLOR_PALE_BTL_GREEN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_PALE_BTL_GREEN -/turf/simulated/wall/prepainted/exploration - stripe_color = COLOR_EXPLO_VIOLET +/turf/simulated/wall/r_wall/prepainted/exploration color = COLOR_EXPLO_VIOLET + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_EXPLO_VIOLET -/turf/simulated/wall/prepainted/science +/turf/simulated/wall/r_wall/prepainted/science + color = COLOR_PURPLE_GRAY paint_color = COLOR_GRAY80 stripe_color = COLOR_PURPLE_GRAY - color = COLOR_PURPLE_GRAY -/turf/simulated/wall/prepainted/cargo - stripe_color = COLOR_CARGO_BROWN +/turf/simulated/wall/r_wall/prepainted/cargo color = COLOR_CARGO_BROWN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_CARGO_BROWN diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 80f34fef98..13cc350358 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -588,7 +588,7 @@ return color = other.color -//? Depth +//* Depth *// /** * gets overall depth level for stuff standing on us @@ -600,20 +600,39 @@ continue . = max(., O.depth_level) -//? Multiz +//* Multiz *// /turf/proc/update_multiz() return -//? Sector API +//* Orientation *// + +/** + * Are we a valid anchor or orientation source for a wall-mounted object? + * + * If so, return the anchor object. + */ +/turf/proc/get_wallmount_anchor() + RETURN_TYPE(/atom) + // are we valid + if(GLOB.wallframe_typecache[type]) + return src + // are our contents valid + for(var/obj/O in contents) + if(GLOB.wallframe_typecache[O.type]) + return O + +//* Sector API *// /** * called by planet / weather to update temperature during weather changes + * + * todo: this is bad lol this either needs more specifications/documentation or a redesign */ /turf/proc/sector_set_temperature(temperature) return -//? Radiation +//* Radiation *// /turf/proc/update_rad_insulation() rad_insulation_contents = 1 diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm index d19d6ac5d8..a0359f7f56 100644 --- a/code/game/verbs/advanced_who.dm +++ b/code/game/verbs/advanced_who.dm @@ -1,3 +1,5 @@ +// todo: combine with advanced who wtf is this shit +// todo: /client/proc/who_query(client/asker, admin_rights, ...) be used for building the string? /client/verb/who_advanced() set name = "Advanced Who" @@ -10,6 +12,10 @@ if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights)) for(var/client/C in GLOB.clients) var/entry = "\t[C.key]" + if(!C.initialized) + entry += " - Uninitialized" + Lines += entry + continue if(C.holder && C.holder.fakekey) entry += " (as [C.holder.fakekey])" entry += " - Playing as [C.mob.real_name]" @@ -54,6 +60,10 @@ else for(var/client/C in GLOB.clients) var/entry = "\t" + if(!C.initialized) + entry += "[C.ckey] - Uninitialized" + Lines += entry + continue if(C.holder && C.holder.fakekey) entry += "[C.holder.fakekey]" else diff --git a/code/game/verbs/character_directory.dm b/code/game/verbs/character_directory.dm index bb241e4ac7..8313016a25 100644 --- a/code/game/verbs/character_directory.dm +++ b/code/game/verbs/character_directory.dm @@ -17,7 +17,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) // This is a global singleton. Keep in mind that all operations should occur on usr, not src. /datum/character_directory -/datum/character_directory/ui_state(mob/user, datum/tgui_module/module) +/datum/character_directory/ui_state() return GLOB.always_state /datum/character_directory/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) @@ -26,7 +26,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) ui = new(user, src, "CharacterDirectory", "Character Directory") ui.open() -/datum/character_directory/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/character_directory/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["personalVisibility"] = user?.client?.prefs?.show_in_directory @@ -35,13 +35,16 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) return data -/datum/character_directory/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/character_directory/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/directory_mobs = list() for(var/client/C in GLOB.clients) + if(!C.initialized) + continue + // Allow opt-out. - if(!C?.prefs?.show_in_directory) + if(!C.prefs.show_in_directory) continue // These are the three vars we're trying to find diff --git a/code/game/verbs/character_profile_verbs.dm b/code/game/verbs/character_profile_verbs.dm deleted file mode 100644 index b22b84b95a..0000000000 --- a/code/game/verbs/character_profile_verbs.dm +++ /dev/null @@ -1,16 +0,0 @@ -/client/verb/regenerate_cached_character_appearance() - set name = "Regenerate Cached Profile Appearance" - set category = "OOC" - set desc = "Regenerates the cached appearance of your character in their profile." - - // This is primarily to stop malicious users from trying to lag the server by spamming this verb - if(world.time < usr.next_move) - to_chat(usr, "Don't spam appearance refreshes.") - return - usr.setClickCooldown(10) - - if (usr.name in GLOB.cached_previews) - GLOB.cached_previews[usr.name] = get_flat_icon(usr) - to_chat(usr, SPAN_NOTICE("Your cached appearance has been regenerated.")) - else - to_chat(usr, SPAN_BOLDWARNING("Your current mob was not found in the appearance cache.")) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index ae584e9556..3a9f73e3bf 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -1,3 +1,6 @@ +// todo: combine with advanced who wtf is this shit +// todo: /client/proc/who_query(client/asker, admin_rights, ...) be used for building the string? + /client/verb/who() set name = "Who" set category = "OOC" @@ -9,6 +12,10 @@ if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights)) for(var/client/C in GLOB.clients) var/entry = "\t[C.key]" + if(!C.initialized) + entry += "[C.ckey] - Uninitialized" + Lines += entry + continue if(C.holder && C.holder.fakekey) entry += " (as [C.holder.fakekey])" if(!C.initialized) @@ -76,6 +83,9 @@ var/num_admins_online = 0 if(holder) for(var/client/C in GLOB.admins) + if(!C.initialized) + continue + if(C.holder.fakekey && !((R_ADMIN|R_MOD) & holder.rights)) continue @@ -101,6 +111,8 @@ else for(var/client/C in GLOB.admins) + if(!C.initialized) + continue if(C.holder.fakekey) continue // hidden msg += "\t[C] is a [C.holder.rank]" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ec56a4e3b7..be7e52115d 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1120,6 +1120,8 @@ var/list/admin_verbs_event_manager = list( var/list/client/eligible = GLOB.clients.Copy() for(var/i in eligible) var/client/C = i + if(!C.initialized) + eligible -= C if(!isliving(C.mob)) eligible -= C for(var/role in GLOB.event_role_list) diff --git a/code/modules/admin/verbs/smite.dm b/code/modules/admin/verbs/smite.dm index fed5a65092..5fefe9752d 100644 --- a/code/modules/admin/verbs/smite.dm +++ b/code/modules/admin/verbs/smite.dm @@ -90,10 +90,12 @@ target.electrocute_act(75,def_zone = BP_HEAD) target.visible_message("[target] is struck by lightning!") if(SMITE_AUTOSAVE) - fake_autosave(target, src) + var/time_to_stun = tgui_input_number(src, "How long would you like the saving to take? (in seconds)", "Autosave Time", 10, min_value = 1) + fake_autosave(target, time_to_stun, src) if(SMITE_AUTOSAVE_WIDE) - fake_autosave(target, src, TRUE) + var/time_to_stun = tgui_input_number(src, "How long would you like the saving to take? (in seconds)", "Autosave Time", 10, min_value = 1) + fake_autosave(target, time_to_stun, src, TRUE) if(SMITE_DARKSPACE_ABDUCT) darkspace_abduction(target, src) @@ -140,17 +142,17 @@ target.afflict_paralyze(20 * 20) target.stuttering = 20 -/proc/fake_autosave(var/mob/living/target, var/client/user, var/wide) +/proc/fake_autosave(var/mob/living/target, var/duration, var/client/user, var/wide) if(!istype(target) || !target.client) to_chat(user, "Skipping [target] because they are not a /mob/living or have no client.") return if(wide) for(var/mob/living/L in orange(user.view, user.mob)) - fake_autosave(L, user) + fake_autosave(L, duration, user) return - target.applyMoveCooldown(10 SECONDS) + target.applyMoveCooldown(duration SECONDS) to_chat(target, "Autosaving your progress, please wait...") target << 'sound/effects/ding.ogg' @@ -178,7 +180,7 @@ loader.screen_loc = "NORTH-1, EAST-1" target.client.screen += loader - spawn(10 SECONDS) + spawn(duration SECONDS) if(target) to_chat(target, "Autosave complete!") if(target.client) diff --git a/code/modules/admin/view_variables/color_matrix_editor.dm b/code/modules/admin/view_variables/color_matrix_editor.dm index 5e142d6f7e..f8db046627 100644 --- a/code/modules/admin/view_variables/color_matrix_editor.dm +++ b/code/modules/admin/view_variables/color_matrix_editor.dm @@ -75,16 +75,16 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/color_matrix_proxy_view) QDEL_NULL(proxy_view) return ..() -/datum/color_matrix_editor/ui_state(mob/user, datum/tgui_module/module) +/datum/color_matrix_editor/ui_state() return GLOB.admin_state -/datum/color_matrix_editor/ui_static_data(mob/user) +/datum/color_matrix_editor/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() data["mapRef"] = proxy_view.assigned_map return data -/datum/color_matrix_editor/ui_data(mob/user) +/datum/color_matrix_editor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["currentColor"] = current_color @@ -108,7 +108,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/color_matrix_proxy_view) on_confirm() SStgui.close_uis(src) -/datum/color_matrix_editor/ui_close(mob/user, datum/tgui_module/module) +/datum/color_matrix_editor/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE diff --git a/code/modules/admin/view_variables/filteriffic.dm b/code/modules/admin/view_variables/filteriffic.dm index adf7e795e7..747a7b1a9a 100644 --- a/code/modules/admin/view_variables/filteriffic.dm +++ b/code/modules/admin/view_variables/filteriffic.dm @@ -4,7 +4,7 @@ /datum/filter_editor/New(atom/target) src.target = target -/datum/filter_editor/ui_state(mob/user, datum/tgui_module/module) +/datum/filter_editor/ui_state() return GLOB.admin_state /datum/filter_editor/ui_interact(mob/user, datum/tgui/ui) @@ -13,18 +13,18 @@ ui = new(user, src, "Filteriffic") ui.open() -/datum/filter_editor/ui_static_data(mob/user) +/datum/filter_editor/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() data["filter_info"] = GLOB.master_filter_info return data -/datum/filter_editor/ui_data() +/datum/filter_editor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["target_name"] = target.name data["target_filter_data"] = target.filter_data return data -/datum/filter_editor/ui_act(action, list/params) +/datum/filter_editor/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index 05044b1f7c..e837a16845 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -13,125 +13,6 @@ if(href_list["Vars"]) debug_variables(locate(href_list["Vars"])) -/* TG STUFF PENDING FULL PORT! -//Stuff below aren't in dropdowns/etc. - - if(check_rights(R_VAREDIT)) - - //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). - - if(href_list["rename"]) - if(!check_rights(NONE)) - return - - var/mob/M = locate(href_list["rename"]) in GLOB.mob_list - if(!istype(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - - var/new_name = stripped_input(usr,"What would you like to name this mob?","Input a name",M.real_name,MAX_NAME_LEN) - if( !new_name || !M ) - return - - message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].") - M.fully_replace_character_name(M.real_name,new_name) - vv_update_display(M, "name", new_name) - vv_update_display(M, "real_name", M.real_name || "No real name") - - else if(href_list["rotatedatum"]) - if(!check_rights(NONE)) - return - - var/atom/A = locate(href_list["rotatedatum"]) - if(!istype(A)) - to_chat(usr, "This can only be done to instances of type /atom") - return - - switch(href_list["rotatedir"]) - if("right") - A.setDir(turn(A.dir, -45)) - if("left") - A.setDir(turn(A.dir, 45)) - vv_update_display(A, "dir", dir2text(A.dir)) - - - else if(href_list["makehuman"]) - if(!check_rights(R_SPAWN)) - return - - var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list - if(!istype(Mo)) - to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey") - return - - if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") - return - if(!Mo) - to_chat(usr, "Mob doesn't exist anymore") - return - holder.Topic(href, list("humanone"=href_list["makehuman"])) - - else if(href_list["adjustDamage"] && href_list["mobToDamage"]) - if(!check_rights(NONE)) - return - - var/mob/living/L = locate(href_list["mobToDamage"]) in GLOB.mob_list - if(!istype(L)) - return - - var/Text = href_list["adjustDamage"] - - var/amount = input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num|null - - if (isnull(amount)) - return - - if(!L) - to_chat(usr, "Mob doesn't exist anymore") - return - - var/newamt - switch(Text) - if("brute") - L.adjustBruteLoss(amount) - newamt = L.getBruteLoss() - if("fire") - L.adjustFireLoss(amount) - newamt = L.getFireLoss() - if("toxin") - L.adjustToxLoss(amount) - newamt = L.getToxLoss() - if("oxygen") - L.adjustOxyLoss(amount) - newamt = L.getOxyLoss() - if("brain") - L.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount) - newamt = L.getOrganLoss(ORGAN_SLOT_BRAIN) - if("clone") - L.adjustCloneLoss(amount) - newamt = L.getCloneLoss() - if("stamina") - L.adjustStaminaLoss(amount) - newamt = L.getStaminaLoss() - else - to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]") - return - - if(amount != 0) - var/log_msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [key_name(L)]" - message_admins("[key_name(usr)] dealt [amount] amount of [Text] damage to [ADMIN_LOOKUPFLW(L)]") - log_admin(log_msg) - admin_ticket_log(L, "[log_msg]") - vv_update_display(L, Text, "[newamt]") - - - //Finally, refresh if something modified the list. - if(href_list["datumrefresh"]) - var/datum/DAT = locate(href_list["datumrefresh"]) - if(istype(DAT, /datum) || istype(DAT, /client)) - debug_variables(DAT) -*/ - //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). else if(href_list["rename"]) if(!check_rights(R_VAREDIT)) return @@ -616,8 +497,8 @@ return switch(Text) - if("brute") L.adjustBruteLoss(amount) - if("fire") L.adjustFireLoss(amount) + if("brute") amount > 0? L.take_overall_damage(brute = amount) : L.heal_overall_damage(brute = -amount) + if("fire") amount > 0? L.take_overall_damage(burn = amount) : L.heal_overall_damage(burn = -amount) if("toxin") L.adjustToxLoss(amount) if("oxygen")L.adjustOxyLoss(amount) if("brain") L.adjustBrainLoss(amount) diff --git a/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm b/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm index 4aa8cc4845..61468dcf96 100644 --- a/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm +++ b/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm @@ -136,7 +136,7 @@ return rabid = TRUE my_slime.update_mood() - my_slime.visible_message(SPAN_DANGER("\The [src] enrages!")) + my_slime.visible_message(SPAN_DANGER("\The [my_slime] enrages!")) // Called to relax from being rabid (when blue slime core was used). /datum/ai_holder/simple_mob/xenobio_slime/proc/relax() diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 36664ba32c..84b8bba7b2 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -107,7 +107,7 @@ ui_interact(user) return TRUE -/obj/item/device/assembly/ui_state(mob/user, datum/tgui_module/module) +/obj/item/device/assembly/ui_state() return GLOB.deep_inventory_state /obj/item/device/assembly/ui_interact(mob/user, datum/tgui/ui) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index eed0dc9d62..dea3be27a7 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -168,7 +168,7 @@ ui = new(user, src, "AssemblyInfrared", name) ui.open() -/obj/item/assembly/infra/ui_data(mob/user) +/obj/item/assembly/infra/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index f469da1d1f..42e174d9c5 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -35,10 +35,9 @@ if(!H.gloves) affecting = H.get_organ(type) H.afflict_stun(20 * 3) - if(affecting) - if(affecting.take_damage(1, 0)) - H.UpdateDamageIcon() - H.update_health() + affecting?.inflict_bodypart_damage( + brute = 1, + ) else if(ismouse(target)) var/mob/living/simple_mob/animal/passive/mouse/M = target visible_message("SPLAT!") diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 4f4d01326d..73bee40519 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -110,7 +110,7 @@ ui = new(user, src, "AssemblyProx", name) ui.open() -/obj/item/assembly/prox_sensor/ui_data(mob/user) +/obj/item/assembly/prox_sensor/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["time"] = time * 10 diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 3b0491d168..c27af1c62f 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -42,7 +42,7 @@ ui = new(user, src, "Signaler", name) ui.open() -/obj/item/assembly/signaler/ui_data(mob/user) +/obj/item/assembly/signaler/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["frequency"] = frequency data["code"] = code @@ -50,7 +50,7 @@ data["maxFrequency"] = RADIO_HIGH_FREQ return data -/obj/item/assembly/signaler/ui_act(action, params) +/obj/item/assembly/signaler/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 2a75005860..45df510a22 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -75,7 +75,7 @@ ui = new(user, src, "AssemblyTimer", name) ui.open() -/obj/item/assembly/timer/ui_data(mob/user) +/obj/item/assembly/timer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/time_left = time data["seconds"] = round(time_left % 60) diff --git a/code/modules/asset_cache/asset_cache_client.dm b/code/modules/asset_cache/asset_cache_client.dm index 3cff8cb41f..a30fcaf5df 100644 --- a/code/modules/asset_cache/asset_cache_client.dm +++ b/code/modules/asset_cache/asset_cache_client.dm @@ -1,4 +1,8 @@ +/client/proc/warn_if_no_asset_cache_browser() + if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. + to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") + /// Process asset cache client topic calls for `"asset_cache_confirm_arrival=[INT]"` /client/proc/asset_cache_confirm_arrival(job_id) var/asset_cache_job = round(text2num(job_id)) diff --git a/code/modules/atmospherics/machinery/air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm.dm index 7b9412ca40..96a13304af 100644 --- a/code/modules/atmospherics/machinery/air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm.dm @@ -11,10 +11,11 @@ GLOBAL_LIST_EMPTY(air_alarms) /area var/obj/machinery/air_alarm/master_air_alarm +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm, 26) /obj/machinery/air_alarm name = "alarm" desc = "Used to control various station atmospheric systems. The light indicates the current air status of the area." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/modules/atmospherics/air_alarm.dmi' icon_state = "alarm0" plane = TURF_PLANE layer = ABOVE_TURF_LAYER @@ -523,7 +524,7 @@ GLOBAL_LIST_EMPTY(air_alarms) ui_interact(user) wires.Interact(user) -/obj/machinery/air_alarm/ui_status(mob/user) +/obj/machinery/air_alarm/ui_status(mob/user, datum/ui_state/state) if(isAI(user) && aidisabled) to_chat(user, "AI control has been disabled.") else if(!shorted) @@ -538,7 +539,7 @@ GLOBAL_LIST_EMPTY(air_alarms) ui.set_state(state) ui.open() -/obj/machinery/air_alarm/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/air_alarm/ui_data(mob/user, datum/tgui/ui) . = ..() var/datum/gas_mixture/environment = loc.return_air() .["environment"] = environment.tgui_analyzer_scan(GAS_GROUP_REAGENT | GAS_GROUP_UNKNOWN) @@ -572,7 +573,7 @@ GLOBAL_LIST_EMPTY(air_alarms) . += data //! end -/obj/machinery/air_alarm/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/air_alarm/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["gasContext"] = global.gas_data.tgui_gas_context() .["gasTLV"] = tlv_ids @@ -588,7 +589,7 @@ GLOBAL_LIST_EMPTY(air_alarms) data["temperatureTLV"] = tlv_temperature push_ui_data(data = data) -/obj/machinery/air_alarm/ui_act(action, params, datum/tgui/ui) +/obj/machinery/air_alarm/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return @@ -767,6 +768,7 @@ GLOBAL_LIST_EMPTY(air_alarms) #undef TEST_TLV_VALUES #undef DECLARE_TLV_VALUES +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/alarms_hidden, 26) /obj/machinery/air_alarm/alarms_hidden alarms_hidden = TRUE @@ -780,6 +782,7 @@ GLOBAL_LIST_EMPTY(air_alarms) pixel_x = (dir & 3) ? 0 : (dir == 4 ? -21 : 21) pixel_y = (dir & 3) ? (dir == 1 ? -18 : 20) : 0 +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/freezer, 26) /obj/machinery/air_alarm/freezer target_temperature = T0C - 13.15 // Chilly freezer room @@ -788,13 +791,16 @@ GLOBAL_LIST_EMPTY(air_alarms) tlv_temperature = list(T0C - 40, T0C - 20, T0C + 40, T0C + 60) return ..() +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/monitor, 26) /obj/machinery/air_alarm/monitor report_danger_level = 0 breach_detection = 0 +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/nobreach, 26) /obj/machinery/air_alarm/nobreach breach_detection = 0 +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/server, 26) /obj/machinery/air_alarm/server/Initialize(mapload) . = ..() req_access = list(ACCESS_SCIENCE_RD, ACCESS_ENGINEERING_ATMOS, ACCESS_ENGINEERING_ENGINE) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/algae_generator_vr.dm b/code/modules/atmospherics/machinery/components/binary_devices/algae_generator_vr.dm index 912826c250..799768392e 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/algae_generator_vr.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/algae_generator_vr.dm @@ -171,7 +171,7 @@ ui = new(user, src, "AlgaeFarm", name) ui.open() -/obj/machinery/atmospherics/component/binary/algae_farm/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/algae_farm/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["panelOpen"] = panel_open @@ -207,7 +207,7 @@ return data -/obj/machinery/atmospherics/component/binary/algae_farm/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/algae_farm/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm index 9f7248f61d..c82a1c20ac 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm @@ -196,7 +196,7 @@ ui = new(user, src, "heat_pump", name) ui.open() -/obj/machinery/atmospherics/component/binary/heat_pump/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/heat_pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["target_temp"] = target_temp data["current_temp"] = air2.temperature @@ -209,10 +209,10 @@ return data -/obj/machinery/atmospherics/component/binary/heat_pump/ui_state(mob/user, datum/tgui_module/module) +/obj/machinery/atmospherics/component/binary/heat_pump/ui_state() return GLOB.physical_state -/obj/machinery/atmospherics/component/binary/heat_pump/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/heat_pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/massive_gas_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/massive_gas_pump.dm index 0dc4032904..0ac892f84e 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/massive_gas_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/massive_gas_pump.dm @@ -132,7 +132,7 @@ ui.open() //This is the data which will be sent to the ui -/obj/machinery/atmospherics/component/binary/massive_gas_pump/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/massive_gas_pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data = list( @@ -156,7 +156,7 @@ return ui_interact(user) -/obj/machinery/atmospherics/component/binary/massive_gas_pump/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/massive_gas_pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm index b689c6986e..78d3670892 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm @@ -165,7 +165,7 @@ ui.open() //This is the data which will be sent to the ui -/obj/machinery/atmospherics/component/binary/massive_heat_pump/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/massive_heat_pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data = list( @@ -192,7 +192,7 @@ return ui_interact(user) -/obj/machinery/atmospherics/component/binary/massive_heat_pump/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/massive_heat_pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index 5582317cce..a93a66e7a0 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -186,7 +186,7 @@ ui.open() //This is the data which will be sent to the ui -/obj/machinery/atmospherics/component/binary/passive_gate/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/passive_gate/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data = list( @@ -202,7 +202,7 @@ return data -/obj/machinery/atmospherics/component/binary/passive_gate/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/passive_gate/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index f9742e64da..5420eaf6c4 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -183,7 +183,7 @@ Thus, the two variables affect pump operation are set in New(): ui.open() //This is the data which will be sent to the ui -/obj/machinery/atmospherics/component/binary/pump/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data = list( @@ -240,7 +240,7 @@ Thus, the two variables affect pump operation are set in New(): return ui_interact(user) -/obj/machinery/atmospherics/component/binary/pump/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/component.dm b/code/modules/atmospherics/machinery/components/component.dm index 1b095b237c..5948abc1c6 100644 --- a/code/modules/atmospherics/machinery/components/component.dm +++ b/code/modules/atmospherics/machinery/components/component.dm @@ -70,15 +70,15 @@ // todo: use a special state to handle multitool hijacking -// /obj/machinery/atmospherics/component/ui_state(mob/user, datum/tgui_module/module) +// /obj/machinery/atmospherics/component/ui_state() // return GLOB.default_state -/obj/machinery/atmospherics/component/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["powerRating"] = power_maximum .["controlFlags"] = atmos_component_ui_flags -/obj/machinery/atmospherics/component/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/ui_data(mob/user, datum/tgui/ui) . = ..() if(!tgui_interface) return diff --git a/code/modules/atmospherics/machinery/components/omni_devices/filter.dm b/code/modules/atmospherics/machinery/components/omni_devices/filter.dm index 09ec71b720..a9e9720d72 100644 --- a/code/modules/atmospherics/machinery/components/omni_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/omni_devices/filter.dm @@ -96,7 +96,7 @@ ui.open() -/obj/machinery/atmospherics/component/quaternary/atmos_filter/ui_data(mob/user) +/obj/machinery/atmospherics/component/quaternary/atmos_filter/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["power"] = use_power @@ -150,7 +150,7 @@ else return null -/obj/machinery/atmospherics/component/quaternary/atmos_filter/ui_act(action, params) +/obj/machinery/atmospherics/component/quaternary/atmos_filter/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/omni_devices/mixer.dm b/code/modules/atmospherics/machinery/components/omni_devices/mixer.dm index ee481208f0..b91f390752 100644 --- a/code/modules/atmospherics/machinery/components/omni_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/omni_devices/mixer.dm @@ -130,7 +130,7 @@ ui = new(user, src, "OmniMixer", name) ui.open() -/obj/machinery/atmospherics/component/quaternary/mixer/ui_data(mob/user) +/obj/machinery/atmospherics/component/quaternary/mixer/ui_data(mob/user, datum/tgui/ui) var/list/data = new() data["power"] = use_power @@ -163,7 +163,7 @@ return data -/obj/machinery/atmospherics/component/quaternary/mixer/ui_act(action, params) +/obj/machinery/atmospherics/component/quaternary/mixer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index cd89e66710..9b4494fb2e 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -71,17 +71,17 @@ /obj/machinery/atmospherics/component/trinary/filter/proc/set_rate(liters) flow_setting = clamp(liters, 0, air1.volume) -/obj/machinery/atmospherics/component/trinary/filter/ui_data(mob/user) +/obj/machinery/atmospherics/component/trinary/filter/ui_data(mob/user, datum/tgui/ui) . = ..() .["filtering"] = filtering .["maxRate"] = air1.volume .["rate"] = flow_setting -/obj/machinery/atmospherics/component/trinary/filter/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/trinary/filter/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["atmosContext"] = global.gas_data.tgui_gas_context() -/obj/machinery/atmospherics/component/trinary/filter/ui_act(action, params) +/obj/machinery/atmospherics/component/trinary/filter/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index c0f8e340a3..3d096b6137 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -83,7 +83,7 @@ ui = new(user, src, "AtmosMixer", name) ui.open() -/obj/machinery/atmospherics/component/trinary/mixer/ui_data(mob/user) +/obj/machinery/atmospherics/component/trinary/mixer/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["on"] = use_power data["set_pressure"] = round(set_flow_rate) @@ -100,7 +100,7 @@ return ui_interact(user) -/obj/machinery/atmospherics/component/trinary/mixer/ui_act(action, params) +/obj/machinery/atmospherics/component/trinary/mixer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/molar_filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/molar_filter.dm index fd7bafa66c..9075c54bb3 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/molar_filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/molar_filter.dm @@ -69,7 +69,7 @@ /obj/machinery/atmospherics/component/trinary/molar_filter/proc/set_rate(liters) flow_setting = clamp(liters, 0, air1.volume) -/obj/machinery/atmospherics/component/trinary/molar_filter/ui_data(mob/user) +/obj/machinery/atmospherics/component/trinary/molar_filter/ui_data(mob/user, datum/tgui/ui) . = ..() .["lower"] = mass_lower .["upper"] = mass_upper @@ -77,7 +77,7 @@ .["maxRate"] = air1.volume .["rate"] = flow_setting -/obj/machinery/atmospherics/component/trinary/molar_filter/ui_act(action, params) +/obj/machinery/atmospherics/component/trinary/molar_filter/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary/cold_sink.dm b/code/modules/atmospherics/machinery/components/unary/cold_sink.dm index 96f1741872..e0df0c43d5 100644 --- a/code/modules/atmospherics/machinery/components/unary/cold_sink.dm +++ b/code/modules/atmospherics/machinery/components/unary/cold_sink.dm @@ -68,7 +68,7 @@ ui = new(user, src, "GasTemperatureSystem", name) ui.open() -/obj/machinery/atmospherics/component/unary/freezer/ui_data(mob/user) +/obj/machinery/atmospherics/component/unary/freezer/ui_data(mob/user, datum/tgui/ui) // this is the data which will be sent to the ui var/data[0] data["on"] = use_power ? 1 : 0 @@ -88,7 +88,7 @@ return data -/obj/machinery/atmospherics/component/unary/freezer/ui_act(action, params) +/obj/machinery/atmospherics/component/unary/freezer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/unary/heat_source.dm b/code/modules/atmospherics/machinery/components/unary/heat_source.dm index 4e37184dbd..1e3a14a325 100644 --- a/code/modules/atmospherics/machinery/components/unary/heat_source.dm +++ b/code/modules/atmospherics/machinery/components/unary/heat_source.dm @@ -82,7 +82,7 @@ ui = new(user, src, "GasTemperatureSystem", name) ui.open() -/obj/machinery/atmospherics/component/unary/heater/ui_data(mob/user) +/obj/machinery/atmospherics/component/unary/heater/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["on"] = use_power ? 1 : 0 @@ -100,7 +100,7 @@ return data -/obj/machinery/atmospherics/component/unary/heater/ui_act(action, params) +/obj/machinery/atmospherics/component/unary/heater/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/unary/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary/outlet_injector.dm index 4314a1d5a4..22662a5f22 100644 --- a/code/modules/atmospherics/machinery/components/unary/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary/outlet_injector.dm @@ -102,14 +102,14 @@ ui = new(user, src, "AtmosPump", name) ui.open() -/obj/machinery/atmospherics/component/unary/outlet_injector/ui_data() +/obj/machinery/atmospherics/component/unary/outlet_injector/ui_data(mob/user, datum/tgui/ui) var/data = list() data["on"] = injecting data["rate"] = round(volume_rate) data["max_rate"] = round(air_contents.volume) return data -/obj/machinery/atmospherics/component/unary/outlet_injector/ui_act(action, params) +/obj/machinery/atmospherics/component/unary/outlet_injector/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/modules/atmospherics/machinery/components/unary/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary/vent_pump.dm index 086b243e4b..29295778aa 100644 --- a/code/modules/atmospherics/machinery/components/unary/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary/vent_pump.dm @@ -161,7 +161,7 @@ var/pressure_delta = get_pressure_delta(environment) //src.visible_message("DEBUG >>> [src]: pressure_delta = [pressure_delta]") - if((environment.temperature || air_contents.temperature) && pressure_delta > 0.5) + if((environment.temperature || air_contents.temperature) && pressure_delta > 0.05) if(pump_direction) //internal -> external var/transfer_moles = calculate_transfer_moles(air_contents, environment, pressure_delta) power_draw = pump_gas(src, air_contents, environment, transfer_moles, power_rating) @@ -312,7 +312,7 @@ ui = new(user, src, "AtmosVentPump") ui.open() -/obj/machinery/atmospherics/component/unary/vent_pump/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/unary/vent_pump/ui_data(mob/user, datum/tgui/ui) . = ..() .["state"] = ui_vent_data() .["name"] = name @@ -482,7 +482,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/retro/on on = TRUE - icon_state = "map_vent_out" + icon_state = "map_vent_out_retro" /obj/machinery/atmospherics/component/unary/vent_pump/retro/on/welded welded = 1 diff --git a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm index 2a5bce6b6b..ba665cace6 100644 --- a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm @@ -318,11 +318,11 @@ scrub_groups ^= target return TRUE -/obj/machinery/atmospherics/component/unary/vent_scrubber/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/unary/vent_scrubber/ui_data(mob/user, datum/tgui/ui) . = ..() .["state"] = ui_scrubber_data() -/obj/machinery/atmospherics/component/unary/vent_scrubber/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/unary/vent_scrubber/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["gasContext"] = global.gas_data.tgui_gas_context() .["name"] = name @@ -396,15 +396,11 @@ //! legacy below - if(signal.data["status"] != null) - spawn(2) - broadcast_status() - return //do not update_icon - -// log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]") spawn(2) broadcast_status() - update_icon() + + if(signal.data["status"] == null) + update_icon() //* Subtypes @@ -420,7 +416,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on on = TRUE - icon_state = "map_scrubber_on" + icon_state = "map_scrubber_on_retro" /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on/welded welded = 1 diff --git a/code/modules/atmospherics/machinery/mainspipe.dm b/code/modules/atmospherics/machinery/mainspipe.dm index 385c631e5d..dfccd70ae3 100644 --- a/code/modules/atmospherics/machinery/mainspipe.dm +++ b/code/modules/atmospherics/machinery/mainspipe.dm @@ -368,19 +368,26 @@ /obj/machinery/atmospherics/mains_pipe/split/return_network(A) return split_node.return_network(A) - +/* /obj/machinery/atmospherics/mains_pipe/split/supply icon_type = "supply" /obj/machinery/atmospherics/mains_pipe/split/Initialize(mapload) . = ..() split_node = supply - -/obj/machinery/atmospherics/mains_pipe/split/hidden +*/ +/obj/machinery/atmospherics/mains_pipe/split/hidden/supply level = 1 icon_state = "split-supply-f" +/obj/machinery/atmospherics/mains_pipe/split/hidden/scrubbers + level = 1 + icon_state = "split-scrubbers-f" +/obj/machinery/atmospherics/mains_pipe/split/hidden/aux + level = 1 + icon_state = "split-aux-f" -/obj/machinery/atmospherics/mains_pipe/split/visible + +/obj/machinery/atmospherics/mains_pipe/split/visible/suppy level = 2 icon_state = "split-supply" @@ -391,9 +398,6 @@ . = ..() split_node = scrubbers -/obj/machinery/atmospherics/mains_pipe/split/hidden - level = 1 - icon_state = "split-scrubbers-f" /obj/machinery/atmospherics/mains_pipe/split/visible level = 2 @@ -406,10 +410,6 @@ . = ..() split_node = aux -/obj/machinery/atmospherics/mains_pipe/split/hidden - level = 1 - icon_state = "split-aux-f" - /obj/machinery/atmospherics/mains_pipe/split/visible level = 2 icon_state = "split-aux" diff --git a/code/modules/atmospherics/machinery/portable/area_atmos_computer.dm b/code/modules/atmospherics/machinery/portable/area_atmos_computer.dm index e4ea08ae3d..b7f1e566ce 100644 --- a/code/modules/atmospherics/machinery/portable/area_atmos_computer.dm +++ b/code/modules/atmospherics/machinery/portable/area_atmos_computer.dm @@ -34,7 +34,7 @@ ui = new(user, src, "AreaScrubberControl", name) ui.open() -/obj/machinery/computer/area_atmos/ui_data(mob/user) +/obj/machinery/computer/area_atmos/ui_data(mob/user, datum/tgui/ui) var/list/working = list() for(var/id in connectedscrubbers) var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber = connectedscrubbers[id] @@ -53,7 +53,7 @@ return list("scrubbers" = working) -/obj/machinery/computer/area_atmos/ui_act(action, params) +/obj/machinery/computer/area_atmos/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index d1b24dcbde..2aa49452e0 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -299,7 +299,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attack_hand(mob/user, list/params) return src.ui_interact(user) -/obj/machinery/portable_atmospherics/canister/ui_state(mob/user, datum/tgui_module/module) +/obj/machinery/portable_atmospherics/canister/ui_state() return GLOB.physical_state /obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, datum/tgui/ui) @@ -308,7 +308,7 @@ update_flag ui = new(user, src, "Canister", name) ui.open() -/obj/machinery/portable_atmospherics/canister/ui_static_data(mob/user) +/obj/machinery/portable_atmospherics/canister/ui_static_data(mob/user, datum/tgui/ui) return list( "defaultReleasePressure" = round(CAN_DEFAULT_RELEASE_PRESSURE), "minReleasePressure" = round(can_min_release_pressure), @@ -318,7 +318,7 @@ update_flag "holdingTankFragPressure" = round(TANK_FRAGMENT_PRESSURE) ) -/obj/machinery/portable_atmospherics/canister/ui_data() +/obj/machinery/portable_atmospherics/canister/ui_data(mob/user, datum/tgui/ui) . = list( "portConnected" = !!connected_port, "tankPressure" = round(air_contents.return_pressure()), @@ -347,7 +347,7 @@ update_flag ) ) -/obj/machinery/portable_atmospherics/canister/ui_act(action, params) +/obj/machinery/portable_atmospherics/canister/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 056f5d25cd..07e76b1e7e 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -86,13 +86,13 @@ ui = new(user, src, tgui_interface) ui.open() -/obj/machinery/portable_atmospherics/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["controlFlags"] = atmos_portable_ui_flags .["useCharge"] = FALSE .["flowMax"] = flow_maximum -/obj/machinery/portable_atmospherics/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/ui_data(mob/user, datum/tgui/ui) . = ..() .["flow"] = flow_current .["flowSetting"] = flow_setting diff --git a/code/modules/atmospherics/machinery/portable/powered.dm b/code/modules/atmospherics/machinery/portable/powered.dm index 9fcc1a0473..f84ae88b01 100644 --- a/code/modules/atmospherics/machinery/portable/powered.dm +++ b/code/modules/atmospherics/machinery/portable/powered.dm @@ -30,14 +30,14 @@ return 1 return 0 -/obj/machinery/portable_atmospherics/powered/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/powered/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["useCharge"] = TRUE .["maxCharge"] = isnull(cell)? 0 : cell.maxcharge .["powerRating"] = power_maximum .["useCell"] = use_cell -/obj/machinery/portable_atmospherics/powered/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/powered/ui_data(mob/user, datum/tgui/ui) . = ..() .["charge"] = isnull(cell)? 0 : cell.charge if(atmos_portable_ui_flags & (ATMOS_PORTABLE_UI_SEE_POWER | ATMOS_PORTABLE_UI_SET_POWER)) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index deb7c648c9..e3fea77858 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -113,10 +113,10 @@ ui.open() -/obj/machinery/portable_atmospherics/powered/pump/ui_state(mob/user, datum/tgui_module/module) +/obj/machinery/portable_atmospherics/powered/pump/ui_state() return GLOB.physical_state -/obj/machinery/portable_atmospherics/powered/pump/ui_data(mob/user) +/obj/machinery/portable_atmospherics/powered/pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["on"] = on ? TRUE : FALSE @@ -142,7 +142,7 @@ return data -/obj/machinery/portable_atmospherics/powered/pump/ui_act(action, params) +/obj/machinery/portable_atmospherics/powered/pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index c94ccf5d2e..9db12e6bd6 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -55,17 +55,17 @@ //! LEGACY ABOVE -/obj/machinery/portable_atmospherics/powered/scrubber/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/powered/scrubber/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["atmosContext"] = global.gas_data.tgui_gas_context() .["scrubbingIds"] = scrubbing_ids .["scrubbingGroups"] = scrubbing_groups -/obj/machinery/portable_atmospherics/powered/scrubber/ui_data(mob/user) +/obj/machinery/portable_atmospherics/powered/scrubber/ui_data(mob/user, datum/tgui/ui) . = ..() .["moleRate"] = transfer_current -/obj/machinery/portable_atmospherics/powered/scrubber/ui_act(action, params) +/obj/machinery/portable_atmospherics/powered/scrubber/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return @@ -96,7 +96,7 @@ /obj/machinery/portable_atmospherics/powered/scrubber/process(delta_time) ..() - if(on && cell?.charge) + if(on && (cell?.charge || !use_cell)) var/datum/gas_mixture/scrubbing = isnull(holding)? loc.return_air() : holding.air_contents var/old_mols = scrubbing.total_moles // todo: compensate for delta_time, right now this is not stable and will go faster/slower based on SSair tick rate. diff --git a/code/modules/cargo/supplypacks/hydroponics.dm b/code/modules/cargo/supplypacks/hydroponics.dm index 7c3ceea420..61b7d0fd24 100644 --- a/code/modules/cargo/supplypacks/hydroponics.dm +++ b/code/modules/cargo/supplypacks/hydroponics.dm @@ -238,12 +238,9 @@ container_name = "Glacicorn crate" access = ACCESS_GENERAL_BOTANY -/datum/supply_pack/hydro/cow +/datum/supply_pack/hydro/furnacegrub name = "Furnace Grub crate" cost = 40 container_type = /obj/structure/largecrate/animal/furnacegrub container_name = "Furnace Grub crate" access = ACCESS_GENERAL_BOTANY - - - diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index bbc85354d3..30684835ef 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -74,7 +74,7 @@ // Tgui Topic middleware - if(tgui_Topic(href_list)) + if(tgui_topic(href_list)) if(CONFIG_GET(flag/emergency_tgui_logging)) log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]") return @@ -149,11 +149,18 @@ return 1 - /////////// //CONNECT// /////////// +/** + * Linter check, do not call. + */ +/proc/lint__check_client_new_doesnt_sleep() + SHOULD_NOT_SLEEP(TRUE) + var/client/C + C.New() + /client/New(TopicData) //* pre-connect-ish // set appadmin for profiling or it might not work (?) (this is old code we just assume it's here for a reason) @@ -165,9 +172,12 @@ return null // kick out guests if(!config_legacy.guests_allowed && is_guest() && !is_localhost()) - alert(src,"This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK") - del(src) - return + security_kick( + message = "This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.", + tell_user = TRUE, + immediate = TRUE, + ) + return null // pre-connect greeting to_chat(src, "If the title screen is black, resources are still downloading. Please be patient until the title screen appears.") // register in globals @@ -195,11 +205,11 @@ //* Setup user interface // todo: move top level menu here, for now it has to be under prefs. // Instantiate statpanel - statpanel_boot() + addtimer(CALLBACK(src, PROC_REF(statpanel_boot)), 0) // Instantiate tgui panel tgui_panel = new(src, "browseroutput") // Instantiate cutscene system - init_cutscene_system() + addtimer(CALLBACK(src, PROC_REF(init_cutscene_system)), 0) //* Setup admin tooling GLOB.ahelp_tickets.ClientLogin(src) @@ -262,10 +272,7 @@ // start caching it immediately INVOKE_ASYNC(SSipintel, TYPE_PROC_REF(/datum/controller/subsystem/ipintel, vpn_connection_check), address, ckey) // run onboarding gauntlet - if(!onboarding()) - if(!queued_security_kick) - security_kick("Unknown error during client init. Contact staff on Discord.", TRUE) - return FALSE + INVOKE_ASYNC(src, PROC_REF(onboarding)) //* Initialize Input if(SSinput.initialized) @@ -276,7 +283,7 @@ // initialize statbrowser // (we don't, the JS does it for us. by signalling statpanel_ready().) // Initialize tgui panel - tgui_panel.initialize() + INVOKE_ASYNC(tgui_panel, TYPE_PROC_REF(/datum/tgui_panel, initialize)) // initialize cutscene browser // (we don't, the JS does it for us.) @@ -325,12 +332,13 @@ to_chat(src, "You have unread updates in the changelog.") winset(src, "infowindow.changelog", "background-color=#eaeaea;font-style=bold") if(config_legacy.aggressive_changelog) - changelog() + changelog_async() - if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. - to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") + // ensure asset cache is there + INVOKE_ASYNC(src, PROC_REF(warn_if_no_asset_cache_browser)) - hook_vr("client_new",list(src)) + // todo: fuck you voreprefs + prefs_vr = new /datum/vore_preferences(src) if(config_legacy.paranoia_logging) if(isnum(player.player_age) && player.player_age == -1) @@ -353,6 +361,14 @@ //DISCONNECT// ////////////// +/** + * Linter check, do not call. + */ +/proc/lint__check_client_del_doesnt_sleep() + SHOULD_NOT_SLEEP(TRUE) + var/client/C + C.Del() + /client/Del() if(!gc_destroyed) Destroy() //Clean up signals and timers. diff --git a/code/modules/client/client_data.dm b/code/modules/client/data/client_data.dm similarity index 95% rename from code/modules/client/client_data.dm rename to code/modules/client/data/client_data.dm index 056317a2c6..8e1387b858 100644 --- a/code/modules/client/client_data.dm +++ b/code/modules/client/data/client_data.dm @@ -13,9 +13,6 @@ GLOBAL_LIST_EMPTY(client_data) * client data datums, to hold * round-based data that we don't want wiped * by a disconnect. - * - * this can absolutely contain player specific data, especially if we don't - * want to reload it every connect. */ /datum/client_data /// owner ckey @@ -24,9 +21,9 @@ GLOBAL_LIST_EMPTY(client_data) var/key /// absolutely, positively annihilated var/ligma = FALSE - /// byond account join date + /// byond account join date; null = not loaded var/account_join - /// byond account age + /// byond account age; null = not loaded var/account_age /// is guest var/is_guest @@ -50,7 +47,7 @@ GLOBAL_LIST_EMPTY(client_data) is_guest = IsGuestKey(key) - load_account_age() + INVOKE_ASYNC(src, PROC_REF(load_account_age)) var/list/the_cheese_touch = CONFIG_GET(keyed_list/shadowban) var/client/C = GLOB.directory[src.ckey] @@ -68,6 +65,44 @@ GLOBAL_LIST_EMPTY(client_data) log_shadowban("[ckey] autobanned based on [why].") message_admins(SPAN_DANGER("Automatically shadowbanning [ckey] based on configuration (matched on [why]). Varedit client.persistent.ligma to change this.")) +/datum/client_data/proc/block_on_account_age_loaded(timeout = INFINITY) + var/timed_out = world.time + timeout + UNTIL(!isnull(account_age) || world.time > timed_out) + return account_age + +/datum/client_data/proc/load_account_age() + if(is_guest) + account_age = 0 + return + var/list/http = world.Export("http://byond.com/members/[ckey]?format=text") + if(!http) + log_world("Failed to connect to byond age check for [ckey]") + return + var/F = file2text(http["CONTENT"]) + . = null + if(F) + // year-month-day + var/regex/R = regex("joined = \"(\\d{4}-\\d{2}-\\d{2})\"") + if(R.Find(F)) + var/str = R.group[1] + account_join = str + if(!SSdbcore.Connect()) + account_age = null + return + var/datum/db_query/query = SSdbcore.RunQuery( + "SELECT DATEDIFF(Now(), :date)", + list( + "date" = str, + ) + ) + if(query.NextRow()) + . = text2num(query.item[1]) + else + CRASH("Age check regex failed for [src.ckey]") + account_age = . + +//* External - Playtime *// + /datum/client_data/proc/load_playtime() set waitfor = FALSE if(playtime_loaded) @@ -112,39 +147,3 @@ GLOBAL_LIST_EMPTY(client_data) var/timed_out = world.time + timeout load_playtime() UNTIL(playtime_loaded || world.time > timed_out) - -/datum/client_data/proc/block_on_account_age_loaded(timeout = INFINITY) - var/timed_out = world.time + timeout - UNTIL(!isnull(account_age) || world.time > timed_out) - return account_age - -/datum/client_data/proc/load_account_age() - if(is_guest) - account_age = 0 - return - var/list/http = world.Export("http://byond.com/members/[ckey]?format=text") - if(!http) - log_world("Failed to connect to byond age check for [ckey]") - return - var/F = file2text(http["CONTENT"]) - . = null - if(F) - // year-month-day - var/regex/R = regex("joined = \"(\\d{4}-\\d{2}-\\d{2})\"") - if(R.Find(F)) - var/str = R.group[1] - account_join = str - if(!SSdbcore.Connect()) - account_age = null - return - var/datum/db_query/query = SSdbcore.RunQuery( - "SELECT DATEDIFF(Now(), :date)", - list( - "date" = str, - ) - ) - if(query.NextRow()) - . = text2num(query.item[1]) - else - CRASH("Age check regex failed for [src.ckey]") - account_age = . diff --git a/code/modules/client/player_data.dm b/code/modules/client/data/player_data.dm similarity index 98% rename from code/modules/client/player_data.dm rename to code/modules/client/data/player_data.dm index 51f18a385f..b66b1f7ab3 100644 --- a/code/modules/client/player_data.dm +++ b/code/modules/client/data/player_data.dm @@ -1,3 +1,5 @@ +// todo: this has to be globally cached for new admin panel + /** * holds db-related data * loaded every connect diff --git a/code/modules/client/onboarding/_onboarding.dm b/code/modules/client/onboarding/_onboarding.dm index 5fa68709b1..fac960325d 100644 --- a/code/modules/client/onboarding/_onboarding.dm +++ b/code/modules/client/onboarding/_onboarding.dm @@ -4,10 +4,6 @@ * client should already be logged to DB at this point. */ /client/proc/onboarding() - if(!security_checks()) - return FALSE - if(!panic_bunker()) - return FALSE - if(!age_verification()) - return FALSE - return TRUE + security_checks() + panic_bunker() + age_verification() diff --git a/code/modules/client/onboarding/age_verification.dm b/code/modules/client/onboarding/age_verification.dm index 9f85b5f041..22ed9ebc50 100644 --- a/code/modules/client/onboarding/age_verification.dm +++ b/code/modules/client/onboarding/age_verification.dm @@ -1,4 +1,8 @@ /client/proc/age_verification() + set waitfor = FALSE + age_verification_impl() + +/client/proc/age_verification_impl() if(!SSdbcore.Connect()) return TRUE if(!player.block_on_available(10 SECONDS)) @@ -40,7 +44,7 @@ GLOBAL_DATUM_INIT(age_verify_menu, /datum/age_verify_menu, new) ui = new(user, src, "AgeVerifyMenu") ui.open() -/datum/age_verify_menu/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/age_verify_menu/ui_status(mob/user, datum/ui_state/state) return UI_INTERACTIVE /datum/age_verify_menu/ui_act(action, list/params, datum/tgui/ui) diff --git a/code/modules/client/onboarding/security_checks.dm b/code/modules/client/onboarding/security_checks.dm index fbf15c4e16..dd2eaf5060 100644 --- a/code/modules/client/onboarding/security_checks.dm +++ b/code/modules/client/onboarding/security_checks.dm @@ -5,6 +5,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( )) /client/proc/security_checks() + set waitfor = FALSE + security_checks_impl() + +/client/proc/security_checks_impl() if(byond_version < 513) security_kick("BYOND 512 and prior clients are too outdated.", tell_user = TRUE) return FALSE diff --git a/code/modules/client/security.dm b/code/modules/client/security.dm index b5506b80ed..d29a1ee689 100644 --- a/code/modules/client/security.dm +++ b/code/modules/client/security.dm @@ -31,7 +31,7 @@ * queues a security kick * ensures the client's around for atleast delay or after current proc chain is over */ -/client/proc/queue_security_kick(delay) +/client/proc/queue_security_kick(delay = 0) var/left = isnull(queued_security_kick)? null : timeleft(queued_security_kick) if(isnull(left) || left < delay) deltimer(queued_security_kick) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 578b34a6c5..ee6a11fd80 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -127,6 +127,9 @@ ooc_style = "admin" for(var/client/target in GLOB.clients) + if(!target.initialized) + continue + if(target.is_preference_enabled(/datum/client_preference/show_ooc)) if(target.is_key_ignored(key)) // If we're ignored by this person, then do nothing. continue diff --git a/code/modules/clothing/gloves/arm_guards.dm b/code/modules/clothing/gloves/arm_guards.dm index 157bb6f752..837c252dc9 100644 --- a/code/modules/clothing/gloves/arm_guards.dm +++ b/code/modules/clothing/gloves/arm_guards.dm @@ -68,7 +68,7 @@ siemens_coefficient = 0.6 armor_type = /datum/armor/station/tactical min_cold_protection_temperature = T0C - 20 - cold_protection = ARMS + cold_protection_cover = ARMS /obj/item/clothing/gloves/arm_guard/combat/imperial name = "imperial gauntlets" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 72ec4d46fe..99219b21ef 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -28,9 +28,9 @@ icon_state = "black" permeability_coefficient = 0.05 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/orange @@ -84,9 +84,9 @@ icon_state = "evening_gloves" addblends = "evening_gloves_a" - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/fingerless diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 018ff2273c..f8acad27a1 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -18,9 +18,9 @@ item_state = "black" permeability_coefficient = 0.05 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/swat @@ -30,9 +30,9 @@ item_state = "swat" siemens_coefficient = 0.50 permeability_coefficient = 0.05 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves @@ -42,9 +42,9 @@ item_state = "swat" siemens_coefficient = 0 permeability_coefficient = 0.05 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE armor_type = /datum/armor/gloves/combat @@ -122,9 +122,9 @@ drop_sound = 'sound/items/drop/metalboots.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/knuckledusters @@ -218,7 +218,7 @@ desc = "A series of armwraps. Makes you pretty keen to start punching people." icon_state = "armwraps" body_cover_flags = ARMS - cold_protection = ARMS + cold_protection_cover = ARMS strip_delay = 300 //you can't just yank them off obj_flags = UNIQUE_RENAME /// did you ever get around to wearing these or no @@ -447,7 +447,7 @@ item_state = "mauler_gauntlets" transfer_prints = FALSE body_cover_flags = ARMS|HANDS - cold_protection = ARMS|HANDS + cold_protection_cover = ARMS|HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT armor = list("melee" = 30, "bullet" = 30, "laser" = 10, "energy" = 10, "bomb" = 55, "bio" = 15, "rad" = 15, "fire" = 80, "acid" = 50) @@ -490,7 +490,7 @@ icon_state = "tackle" item_state = "tackle" transfer_prints = TRUE - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT resistance_flags = NONE //custom_premium_price = PRICE_EXPENSIVE @@ -549,9 +549,9 @@ tackle_range = 5 skill_mod = 3 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE strip_mod = 1.2 // because apparently black gloves had this @@ -634,8 +634,8 @@ desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms." icon_state = "bracers" body_cover_flags = ARMS - cold_protection = HANDS - heat_protection = HANDS + cold_protection_cover = HANDS + heat_protection_cover = HANDS armor_type = /datum/armor/general/bone /obj/item/clothing/gloves/hasie @@ -648,7 +648,7 @@ name = "Utility Fur Gloves" desc = "Warm fur gloves to match the Utility Fur coat." icon_state = "furug" - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/darkcleric diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 9ce78e2ca5..021d4f2d12 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -20,7 +20,7 @@ /obj/item/clothing/head/hardhat/red icon_state = "hardhat0_red" name = "firefighter helmet" - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0.2* ONE_ATMOSPHERE max_pressure_protection = 20 * ONE_ATMOSPHERE @@ -29,7 +29,7 @@ /obj/item/clothing/head/hardhat/white icon_state = "hardhat0_white" name = "sleek hard hat" - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0.2* ONE_ATMOSPHERE max_pressure_protection = 20 * ONE_ATMOSPHERE diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c8211e073a..f7f73b1fbf 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -7,9 +7,9 @@ restricted_accessory_slots = ACCESSORY_SLOT_HELM_C|ACCESSORY_SLOT_HELM_R armor_type = /datum/armor/station/medium inv_hide_flags = HIDEEARS|BLOCKHEADHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.7 w_class = ITEMSIZE_NORMAL @@ -122,7 +122,7 @@ light_overlay = "helmet_light_dual_green" action_button_name = "Toggle Head-light" min_cold_protection_temperature = T0C - 20 - cold_protection = HEAD + cold_protection_cover = HEAD /obj/item/clothing/head/helmet/swat name = "\improper SWAT helmet" @@ -130,7 +130,7 @@ icon_state = "swat" armor_type = /datum/armor/centcom/deathsquad inv_hide_flags = HIDEEARS|HIDEEYES|BLOCKHEADHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.5 encumbrance = ITEM_ENCUMBRANCE_ARMOR_HEAVY_HELMET @@ -153,7 +153,7 @@ desc = "'Let the battle commence!'" icon_state = "thunderdome" armor_type = /datum/armor/thunderdome - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 1 @@ -205,7 +205,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "head_m", SLOT_ID_LEFT_HAND = "head_m") armor_type = /datum/armor/head/augment_helmet inv_hide_flags = HIDEEARS|HIDEEYES|BLOCKHEADHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.5 valid_accessory_slots = null diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index 0b1850fbc9..cd195bb036 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -3,7 +3,7 @@ desc = "A generic hood." icon_state = "generic_hood" body_cover_flags = HEAD - cold_protection = HEAD + cold_protection_cover = HEAD inv_hide_flags = HIDEEARS | BLOCKHAIR // Winter coats @@ -125,6 +125,14 @@ /obj/item/clothing/head/hood/winter/durathread icon_state = "winterhood_durathread" +/obj/item/clothing/head/hood/aureate + name = "aureate hood" + desc = "A detached, ornamental hood with gold embellishments. Seems to be made out of insulated fiber." + icon = 'icons/clothing/head/aureate.dmi' + icon_state = "aureate_hood" + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + //Hazardous Softsuit Hoods /obj/item/clothing/head/hood/explorer name = "explorer hood" @@ -190,7 +198,7 @@ icon_state = "golhood" desc = "A protective & concealing hood." armor_type = /datum/armor/lavaland/goliath - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/head/hood/drake @@ -198,7 +206,7 @@ icon_state = "dragon" desc = "The skull of a dragon." armor_type = /datum/armor/lavaland/drake - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE //Vainglorious diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index b8b4669f30..d973fc7270 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -410,7 +410,7 @@ icon_state = "beanie" body_cover_flags = 0 min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = HEAD + cold_protection_cover = HEAD /obj/item/clothing/head/beanie_loose name = "loose beanie" @@ -419,7 +419,7 @@ addblends = "beanie_hang_a" body_cover_flags = 0 min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = HEAD + cold_protection_cover = HEAD /obj/item/clothing/head/beretg name = "beret" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index f82190d993..5fca82543f 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -164,7 +164,7 @@ icon_state = "ushankadown" inv_hide_flags = HIDEEARS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = HEAD + cold_protection_cover = HEAD /obj/item/clothing/head/ushanka/attack_self(mob/user) . = ..() diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index 86a737d2f3..70bdf2fee9 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -8,9 +8,9 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT armor_type = /datum/armor/exploration/space/pilot inv_hide_flags = HIDEEARS - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE w_class = ITEMSIZE_NORMAL diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 71bca28fbd..7397943fa2 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -219,8 +219,8 @@ else src.icon_state = initial(icon_state) to_chat(user, "You untie the bandana and spread it out.") - slot_flags = "[initial(slot_flags)]" - body_cover_flags = "[initial(body_cover_flags)]" + slot_flags = initial(slot_flags) + body_cover_flags = initial(body_cover_flags) update_worn_icon() //so our mob-overlays update /* diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index a86df9ffd1..0b04c5fbd1 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -78,6 +78,7 @@ istype(I, /obj/item/material/kitchen/utensil) || \ istype(I, /obj/item/storage/box/survival_knife) ||\ istype(I, /obj/item/material/knife/stiletto) ||\ + istype(I, /obj/item/gps/dataknife) ||\ istype(I, /obj/item/material/knife/tacknife))) if(holding) to_chat(user, "\The [src] is already holding \a [holding].") diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index a25b97cdad..f177f61182 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -81,9 +81,9 @@ name = "winter boots" desc = "Boots lined with 'synthetic' animal fur." icon_state = "winterboots" - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE snow_speed = -1 step_volume_mod = 0.8 @@ -182,9 +182,9 @@ clothing_flags = NOSLIP siemens_coefficient = 0.6 - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE //Stolen from CM, refurbished to be less terrible. diff --git a/code/modules/clothing/shoes/leg_guards.dm b/code/modules/clothing/shoes/leg_guards.dm index 6bdb4650ac..473ac89393 100644 --- a/code/modules/clothing/shoes/leg_guards.dm +++ b/code/modules/clothing/shoes/leg_guards.dm @@ -73,4 +73,4 @@ encumbrance = ITEM_ENCUMBRANCE_ARMOR_LIGHT_BOOTS armor_type = /datum/armor/station/tactical min_cold_protection_temperature = T0C - 20 - cold_protection = LEGS + cold_protection_cover = LEGS diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 3f401ab706..58de9f113d 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -90,9 +90,9 @@ siemens_coefficient = 0.7 origin_tech = list(TECH_ARCANE = 2) - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = null diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 077be311f0..65c08e20b1 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -17,7 +17,7 @@ desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic." armor_type = /datum/armor/skrell/space/light allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd) - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN) @@ -36,7 +36,7 @@ allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank) armor_type = /datum/armor/vox/space/armored siemens_coefficient = 0.2 - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list(SPECIES_VOX) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index ea06266ea8..5a93bc2fcb 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -29,7 +29,7 @@ weight = ITEM_WEIGHT_VOIDSUIT armor_type = /datum/armor/station/tactical inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 10 * ONE_ATMOSPHERE diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 6149df5479..bdea4038fa 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -12,7 +12,7 @@ armor_type = /datum/armor/general/space inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_cover_flags = HEAD|FACE|EYES - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 2 * ONE_ATMOSPHERE @@ -77,7 +77,7 @@ allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/suit_cooling_unit) armor_type = /datum/armor/general/space inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 2 * ONE_ATMOSPHERE diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 63edea0cc3..a6bdc812a5 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -4,7 +4,7 @@ desc = "A high-tech dark red space suit helmet. Used for AI satellite maintenance." icon_state = "void" item_state_slots = list(SLOT_ID_RIGHT_HAND = "syndicate", SLOT_ID_LEFT_HAND = "syndicate") - heat_protection = HEAD + heat_protection_cover = HEAD armor_type = /datum/armor/general/space/armored max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE @@ -44,7 +44,7 @@ weight = ITEM_WEIGHT_VOIDSUIT armor_type = /datum/armor/general/space/armored allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit) - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 10 * ONE_ATMOSPHERE diff --git a/code/modules/clothing/spacesuits/void/zaddat.dm b/code/modules/clothing/spacesuits/void/zaddat.dm index 3502ce939f..9199ef9f09 100644 --- a/code/modules/clothing/spacesuits/void/zaddat.dm +++ b/code/modules/clothing/spacesuits/void/zaddat.dm @@ -3,7 +3,7 @@ desc = "A Hegemony-designed utilitarian environment suit helmet, still common among the Spacer Zaddat." icon_state = "zaddat_hegemony" item_state_slots = list(SLOT_ID_RIGHT_HAND = "syndicate", SLOT_ID_LEFT_HAND = "syndicate") - heat_protection = HEAD + heat_protection_cover = HEAD body_cover_flags = HEAD|FACE|EYES armor_type = /datum/armor/zaddat siemens_coefficient = 1 diff --git a/code/modules/clothing/suits/aliens/tajara.dm b/code/modules/clothing/suits/aliens/tajara.dm index cf87201c82..15d4bd58ae 100644 --- a/code/modules/clothing/suits/aliens/tajara.dm +++ b/code/modules/clothing/suits/aliens/tajara.dm @@ -198,7 +198,7 @@ icon_state = "winter_cloak" body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = TN60C - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS hoodtype = /obj/item/clothing/head/hood/tajaran/cloak/winter /obj/item/clothing/suit/storage/hooded/tajaran/cloak/royalist @@ -260,7 +260,7 @@ item_state = "winter_cloakhood" body_cover_flags = HEAD inv_hide_flags = HIDEEARS|BLOCKHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = TN60C /obj/item/clothing/head/hood/tajaran/cloak/royalist diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index 3018e20162..faed8a65b9 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -321,7 +321,7 @@ species_restricted = list(SPECIES_TESHARI) body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER|HIDETIE - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE armor_type = /datum/armor/teshari/hood_cloak action_button_name = "Toggle Cloak Hood" @@ -338,7 +338,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "tesh_hood_bo", SLOT_ID_LEFT_HAND = "tesh_hood_bo") inv_hide_flags = BLOCKHAIR body_cover_flags = HEAD - cold_protection = HEAD|FACE + cold_protection_cover = HEAD|FACE min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE /obj/item/clothing/suit/storage/hooded/teshari/standard/black_orange diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c40451f4af..7011facee5 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -7,9 +7,9 @@ |ACCESSORY_SLOT_MEDAL\ |ACCESSORY_SLOT_INSIGNIA) - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = UPPER_TORSO|LOWER_TORSO + heat_protection_cover = UPPER_TORSO|LOWER_TORSO max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.7 @@ -148,7 +148,7 @@ w_class = ITEMSIZE_HUGE armor_type = /datum/armor/centcom/deathsquad inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 20* ONE_ATMOSPHERE @@ -311,9 +311,9 @@ body_cover_flags = UPPER_TORSO|LOWER_TORSO clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = UPPER_TORSO|LOWER_TORSO + heat_protection_cover = UPPER_TORSO|LOWER_TORSO max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.6 @@ -433,7 +433,7 @@ desc = "An armored vest made from advanced flexible ceramic plates. It's surprisingly mobile, if a little unfashionable." icon_state = "flexitac" item_state = "flexitac" - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO min_cold_protection_temperature = T0C - 20 encumbrance = ITEM_ENCUMBRANCE_ARMOR_MEDIUM weight = ITEM_WEIGHT_ARMOR_MEDIUM @@ -515,7 +515,7 @@ desc = "this doesn't exist" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //big coats keep you big warm + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //big coats keep you big warm min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE icon = 'icons/clothing/suit/coats/dept_overcoats.dmi' armor_type = /datum/armor/security/light_formalwear @@ -561,7 +561,7 @@ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/helmet) inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index 6a6b7eaf30..c80a3131bc 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -80,7 +80,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "carp_casual", SLOT_ID_LEFT_HAND = "carp_casual") //Does not exist -S2- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Space carp like space, so you should too action_button_name = "Toggle Carp Hood" hoodtype = /obj/item/clothing/head/hood/carp_hood @@ -131,7 +131,7 @@ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS atom_flags = PHORONGUARD inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE armor_type = /datum/armor/civilian/coat hoodtype = /obj/item/clothing/head/hood/winter @@ -433,7 +433,7 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS hoodtype = /obj/item/clothing/head/hood/explorer siemens_coefficient = 0.9 armor_type = /datum/armor/exploration/soft @@ -459,7 +459,7 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS hoodtype = /obj/item/clothing/head/hood/miner siemens_coefficient = 0.9 armor_type = /datum/armor/cargo/mining/soft @@ -517,7 +517,7 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/mining_scanner/advanced, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/material/twohanded/spear) armor_type = /datum/armor/lavaland/drake hoodtype = /obj/item/clothing/head/hood/drake - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE @@ -561,7 +561,7 @@ icon_state = "mercy_hoodie" inv_hide_flags = HIDEHOLSTER body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE hoodtype = /obj/item/clothing/head/hood/mercy diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index d95cbd4e0b..06d0633329 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -337,6 +337,14 @@ desc = "Traditional Japanese menswear." icon_state = "kamishimo" +/obj/item/clothing/suit/storage/aureate + name = "aureate kimono" + desc = "An embellished spin on an ancient, traditional garb. It comes with various insignias." + icon = 'icons/clothing/suit/coats/aureate_kimono.dmi' + icon_state = "aureate_kimono" + body_cover_flags = UPPER_TORSO|ARM_RIGHT|LOWER_TORSO + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + /obj/item/clothing/suit/storage/furcoat name = "furcoat" desc = "The finest hopefully inorganic furs attached to fake leather. The provider has assured it is not of a sapient species origin." @@ -522,7 +530,7 @@ icon_state = "leathercoat" item_state_slots = list(SLOT_ID_RIGHT_HAND = "wcoat", SLOT_ID_LEFT_HAND = "wcoat") body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER /obj/item/clothing/suit/browncoat @@ -718,7 +726,7 @@ icon_state = "pufferjacket" item_state_slots = list(SLOT_ID_RIGHT_HAND = "chainmail", SLOT_ID_LEFT_HAND = "chainmail") body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE inv_hide_flags = HIDEHOLSTER @@ -728,7 +736,7 @@ icon_state = "puffervest" item_state_slots = list(SLOT_ID_RIGHT_HAND = "chainmail", SLOT_ID_LEFT_HAND = "chainmail") body_cover_flags = UPPER_TORSO|LOWER_TORSO - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/suit/storage/miljacket name = "military jacket" @@ -794,7 +802,7 @@ allowed = list (/obj/item/gun/ballistic/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) body_cover_flags = UPPER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|ARMS min_cold_protection_temperature = T0C - 20 siemens_coefficient = 0.7 @@ -805,7 +813,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "brown_jacket", SLOT_ID_LEFT_HAND = "brown_jacket") body_cover_flags = UPPER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|ARMS min_cold_protection_temperature = T0C - 20 siemens_coefficient = 0.7 @@ -906,7 +914,7 @@ icon_state = "grey_hoodie" item_state_slots = list(SLOT_ID_RIGHT_HAND = "suit_grey", SLOT_ID_LEFT_HAND = "suit_grey") min_cold_protection_temperature = T0C - 20 - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER /obj/item/clothing/suit/storage/toggle/hoodie/black @@ -1195,7 +1203,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "labcoat", SLOT_ID_LEFT_HAND = "labcoat") body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE allowed = list (/obj/item/gun/ballistic/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) @@ -1534,7 +1542,7 @@ desc = "A form fitting utilitarion coat with straps around the shoulders and holding a sash around the waist. The collar is lined with fur to help stay warm." icon_state = "fur_utility" body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit) @@ -1572,7 +1580,7 @@ icon_state = "runner_jacket" inv_hide_flags = HIDEHOLSTER body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, @@ -1584,13 +1592,13 @@ open = 0 icon_state = "[icon_state]_closed" inv_hide_flags = HIDETIE|HIDEHOLSTER - cold_protection = HEAD|UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = HEAD|UPPER_TORSO|LOWER_TORSO|ARMS|LEGS to_chat(usr, "You close the coat and activate the coils.") else if(open == 0) open = 1 icon_state = initial(icon_state) inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS to_chat(usr, "You open the coat and deactivate the coils.") else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed to_chat(usr, "You attempt to zip-up the zipper on your [src], before promptly realising how silly you are.") diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index a5caccc690..a82fa3bb3e 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -22,9 +22,9 @@ weight = ITEM_WEIGHT_ARMOR_FIRE_SUIT inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER clothing_flags = 0 - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_pressure_protection = 0.2 * ONE_ATMOSPHERE max_pressure_protection = 20 * ONE_ATMOSPHERE @@ -57,7 +57,7 @@ weight = ITEM_WEIGHT_ARMOR_BOMB_SUIT armor_type = /datum/armor/station/bomb inv_hide_flags = HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER - heat_protection = UPPER_TORSO|LOWER_TORSO + heat_protection_cover = UPPER_TORSO|LOWER_TORSO max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0 diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index c0c12bc5cd..14e6d99e73 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -345,7 +345,7 @@ /obj/item/clothing/accessory/armor/tag/ntbs name = "\improper BLUESHIELD tag" - desc = "An armor tag with the words BLUESHIELD printed in red lettering." + desc = "An armor tag with the words BLUESHIELD printed in blue lettering." icon_state = "ntbstag" /obj/item/clothing/accessory/armor/tag/ntc diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index f6ff0525a5..b281b8092e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -87,7 +87,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected. + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected. min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE /obj/item/clothing/under/acj @@ -99,7 +99,7 @@ permeability_coefficient = 0.01 body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/invulnerable - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 @@ -395,6 +395,13 @@ desc = "You must be a bit risque teasing all of them in a maid uniform!" icon_state = "sexymaid" +/obj/item/clothing/under/dress/maid/neko + name = "neko maid uniform" + desc = "A tailored maid uniform that takes many cues from Old Earth Bavarian commonwear. It seems airy and breathable." + icon = 'icons/clothing/uniform/misc/neko.dmi' + icon_state = "neko" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + /obj/item/clothing/under/dress/dress_fire name = "flame dress" desc = "A small black dress with blue flames print on it." diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 23106071b3..58699c5671 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -59,7 +59,7 @@ ui.open() -/obj/machinery/dnaforensics/ui_data(mob/user) +/obj/machinery/dnaforensics/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["scan_progress"] = round(scanner_progress) @@ -70,7 +70,7 @@ return data -/obj/machinery/dnaforensics/ui_act(action, list/params) +/obj/machinery/dnaforensics/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/donatorreskins/donatorclothing.dm b/code/modules/donatorreskins/donatorclothing.dm index 4bb521dbdb..8b67b16336 100644 --- a/code/modules/donatorreskins/donatorclothing.dm +++ b/code/modules/donatorreskins/donatorclothing.dm @@ -173,7 +173,7 @@ item_state = "noah_cloak" body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = TN60C - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS hoodtype = /obj/item/clothing/head/hood/donatornoahcloak icon = 'icons/mob/clothing/donatorclothing.dmi' icon_override = 'icons/mob/clothing/donatorclothing.dmi' @@ -185,7 +185,7 @@ item_state = "noah_cloakhood" body_cover_flags = HEAD inv_hide_flags = HIDEEARS|BLOCKHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = TN60C icon = 'icons/mob/clothing/donatorclothing.dmi' icon_override = 'icons/mob/clothing/donatorclothing.dmi' diff --git a/code/modules/economy/machines/ATM.dm b/code/modules/economy/machines/ATM.dm index 4da4bb650b..e2967158e2 100644 --- a/code/modules/economy/machines/ATM.dm +++ b/code/modules/economy/machines/ATM.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(atm_sounds, list('sound/items/polaroid1.ogg', 'sound/items/pola ui = new(user, src, "ATM", "[machine_id]") ui.open() -/obj/machinery/atm/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atm/ui_data(mob/user, datum/tgui/ui) . = ..() var/data[0] diff --git a/code/modules/events/atmos_leak.dm b/code/modules/events/atmos_leak.dm index ef5d6a2b04..3e3c87126f 100644 --- a/code/modules/events/atmos_leak.dm +++ b/code/modules/events/atmos_leak.dm @@ -64,6 +64,6 @@ // Fow now just add a bunch of it to the air var/datum/gas_mixture/air_contents = new air_contents.temperature = T20C + ((severity - 1) * rand(-50, 50)) - air_contents.gas[gas_type] = 10 * MOLES_CELLSTANDARD + air_contents.gas[gas_type] = 10 * CELL_MOLES target_turf.assume_air(air_contents) playsound(target_turf, 'sound/effects/smoke.ogg', 50, 1) diff --git a/code/modules/events/canister_leak.dm b/code/modules/events/canister_leak.dm index 8c3af30961..c944d332c0 100644 --- a/code/modules/events/canister_leak.dm +++ b/code/modules/events/canister_leak.dm @@ -7,7 +7,7 @@ // List of all non-destroyed canisters on station levels var/list/all_canisters = list() for(var/obj/machinery/portable_atmospherics/canister/C in GLOB.machines) - if(!C.destroyed && (C.z in (LEGACY_MAP_DATUM).station_levels) && C.air_contents.total_moles >= MOLES_CELLSTANDARD) + if(!C.destroyed && (C.z in (LEGACY_MAP_DATUM).station_levels) && C.air_contents.total_moles >= CELL_MOLES) all_canisters += C for(var/i in 1 to 10) diff --git a/code/modules/examine/descriptions/engineering.dm b/code/modules/examine/descriptions/engineering.dm index 6890db6b15..66c5dd9bfb 100644 --- a/code/modules/examine/descriptions/engineering.dm +++ b/code/modules/examine/descriptions/engineering.dm @@ -58,7 +58,7 @@ else results += "[desc_panel_image("welder", user)]to weld, preventing it from opening." - if(p_open) + if(panel_open) results += "[desc_panel_image("screwdriver", user)]to close the wire panel." results += "[desc_panel_image("wirecutters", user)]to cut an internal wire while hacking." results += "[desc_panel_image("multitool", user)]to pulse an internal wire while hacking." diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm index 6d05d3de5f..e31e680b57 100644 --- a/code/modules/fishing/aquarium/aquarium.dm +++ b/code/modules/fishing/aquarium/aquarium.dm @@ -219,7 +219,7 @@ else if(dead_fish > 0) to_chat(user, SPAN_WARNING("The fish are all dead!")) -/obj/structure/aquarium/ui_data(mob/user) +/obj/structure/aquarium/ui_data(mob/user, datum/tgui/ui) . = ..() .["fluid_type"] = fluid_type .["temperature"] = fluid_temp @@ -229,7 +229,7 @@ content_data += list(list("name"=fish.name,"ref"=ref(fish))) .["contents"] = content_data -/obj/structure/aquarium/ui_static_data(mob/user) +/obj/structure/aquarium/ui_static_data(mob/user, datum/tgui/ui) . = ..() //I guess these should depend on the fluid so lava critters can get high or stuff below water freezing point but let's keep it simple for now. .["minTemperature"] = min_fluid_temp diff --git a/code/modules/fishing/equipment/catalog.dm b/code/modules/fishing/equipment/catalog.dm index d67c7130a9..d8ce1d083f 100644 --- a/code/modules/fishing/equipment/catalog.dm +++ b/code/modules/fishing/equipment/catalog.dm @@ -14,7 +14,7 @@ ui = new(user, src, "FishCatalog", name) ui.open() -/obj/item/book/fish_catalog/ui_static_data(mob/user) +/obj/item/book/fish_catalog/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/static/fish_info if(!fish_info) diff --git a/code/modules/fishing/equipment/rod.dm b/code/modules/fishing/equipment/rod.dm index 4af1ad6397..017c8a110f 100644 --- a/code/modules/fishing/equipment/rod.dm +++ b/code/modules/fishing/equipment/rod.dm @@ -310,7 +310,7 @@ return TRUE return ..() -/obj/item/fishing_rod/ui_data(mob/user) +/obj/item/fishing_rod/ui_data(mob/user, datum/tgui/ui) . = ..() var/list/data = list() @@ -343,7 +343,7 @@ return FALSE return TRUE -/obj/item/fishing_rod/ui_act(action, list/params) +/obj/item/fishing_rod/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return . diff --git a/code/modules/fishing/minigame/fishing_calculator.dm b/code/modules/fishing/minigame/fishing_calculator.dm index 18614bcd52..fd7f148e05 100644 --- a/code/modules/fishing/minigame/fishing_calculator.dm +++ b/code/modules/fishing/minigame/fishing_calculator.dm @@ -21,23 +21,23 @@ ui = new(user, src, "FishingCalculator") ui.open() -/datum/fishing_calculator/ui_state(mob/user) +/datum/fishing_calculator/ui_state() return GLOB.always_state -/datum/fishing_calculator/ui_close(mob/user) +/datum/fishing_calculator/on_ui_close(mob/user, datum/tgui/ui, embedded) qdel(src) -/datum/fishing_calculator/ui_static_data(mob/user) +/datum/fishing_calculator/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["rod_types"] = typesof(/obj/item/fishing_rod) .["hook_types"] = typesof(/obj/item/fishing_hook) .["line_types"] = typesof(/obj/item/fishing_line) .["spot_types"] = subtypesof(/datum/fish_source) -/datum/fishing_calculator/ui_data(mob/user) +/datum/fishing_calculator/ui_data(mob/user, datum/tgui/ui) return list("info" = current_table) -/datum/fishing_calculator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/fishing_calculator/ui_act(action, list/params, datum/tgui/ui) . = ..() var/mob/user = usr switch(action) diff --git a/code/modules/fishing/minigame/fishing_minigame.dm b/code/modules/fishing/minigame/fishing_minigame.dm index 93253ded59..78a914fd52 100644 --- a/code/modules/fishing/minigame/fishing_minigame.dm +++ b/code/modules/fishing/minigame/fishing_minigame.dm @@ -155,16 +155,16 @@ ui.set_mouse_hook(TRUE) ui.open() -/datum/fishing_challenge/ui_host(mob/user) +/datum/fishing_challenge/ui_host() return lure //Could be the target really // Manually closing the ui is treated as lose -/datum/fishing_challenge/ui_close(mob/user) +/datum/fishing_challenge/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() if(!completed) complete(FALSE) -/datum/fishing_challenge/ui_static_data(mob/user) +/datum/fishing_challenge/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["difficulty"] = max(1,min(difficulty,100)) .["fish_ai"] = fish_ai @@ -180,7 +180,7 @@ ui_status_user_is_abled(user, lure), ) -/datum/fishing_challenge/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/fishing_challenge/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/food/drinkingglass/extras.dm b/code/modules/food/drinkingglass/extras.dm index 726728eea8..1d4c64f002 100644 --- a/code/modules/food/drinkingglass/extras.dm +++ b/code/modules/food/drinkingglass/extras.dm @@ -53,7 +53,7 @@ var/glass_desc var/glass_color w_class = ITEMSIZE_TINY - icon = DRINK_ICON_FILE + icon = 'icons/pdrink.dmi' /obj/item/glass_extra/stick name = "stick" @@ -68,5 +68,3 @@ glass_addition = "straw" glass_desc = "There is a straw in the glass." icon_state = "straw" - -#undef DRINK_ICON_FILE diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/drinkingglass/glass1.dm similarity index 100% rename from code/modules/food/food/drinks/drinkingglass.dm rename to code/modules/food/drinkingglass/glass1.dm diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/glass2.dm similarity index 100% rename from code/modules/food/drinkingglass/drinkingglass.dm rename to code/modules/food/drinkingglass/glass2.dm diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index 461dd0e8f7..99528e79b0 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -1021,3 +1021,7 @@ Drinks Data /datum/reagent/ethanol/martinez glass_icon_state = "martinez" glass_center_of_mass = list("x"=16, "y"=8) + +/datum/reagent/ethanol/mimosa + glass_icon_state = "mimosa" + glass_center_of_mass = list("x"=16, "y"=8) diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/drinks/bottle.dm similarity index 52% rename from code/modules/food/food/drinks/bottle.dm rename to code/modules/food/drinks/bottle.dm index 7352308ead..cacc715625 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/drinks/bottle.dm @@ -193,278 +193,6 @@ edge = 0 var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") -/obj/item/reagent_containers/food/drinks/bottle/gin - name = "Griffeater Gin" - desc = "A bottle of high quality gin, produced in Alpha Centauri." - icon_state = "ginbottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/gin/Initialize(mapload) - . = ..() - reagents.add_reagent("gin", 100) - -/obj/item/reagent_containers/food/drinks/bottle/whiskey - name = "Uncle Git's Special Reserve" - desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter." - icon_state = "whiskeybottle" - center_of_mass = list("x"=16, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize(mapload) - . = ..() - reagents.add_reagent("whiskey", 100) - -/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey - name = "Special Blend Whiskey" - desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." - icon_state = "whiskeybottle2" - center_of_mass = list("x"=16, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize(mapload) - . = ..() - reagents.add_reagent("specialwhiskey", 100) - -/obj/item/reagent_containers/food/drinks/bottle/vodka - name = "Tunguska Triple Distilled" - desc = "Aah, vodka. Prime choice of drink and fuel by Russians worldwide." - icon_state = "vodkabottle" - center_of_mass = list("x"=17, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize(mapload) - . = ..() - reagents.add_reagent("vodka", 100) - -/obj/item/reagent_containers/food/drinks/bottle/tequila - name = "Caccavo Guaranteed Quality Tequila" - desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" - icon_state = "tequilabottle" - center_of_mass = list("x"=16, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/tequila/Initialize(mapload) - . = ..() - reagents.add_reagent("tequila", 100) - -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing - name = "Bottle of Nothing" - desc = "A bottle filled with nothing" - icon_state = "bottleofnothing" - center_of_mass = list("x"=17, "y"=5) - -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize(mapload) - . = ..() - reagents.add_reagent("nothing", 100) - -/obj/item/reagent_containers/food/drinks/bottle/patron - name = "Wrapp Artiste Patron" - desc = "Silver laced tequila, served in space night clubs across the galaxy." - icon_state = "patronbottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/patron/Initialize(mapload) - . = ..() - reagents.add_reagent("patron", 100) - -/obj/item/reagent_containers/food/drinks/bottle/rum - name = "Captain Pete's Cuban Spiced Rum" - desc = "This isn't just rum, oh no. It's practically Cuba in a bottle." - icon_state = "rumbottle" - center_of_mass = list("x"=16, "y"=8) - -/obj/item/reagent_containers/food/drinks/bottle/rum/Initialize(mapload) - . = ..() - reagents.add_reagent("rum", 100) - -/obj/item/reagent_containers/food/drinks/bottle/whiterum - name = "Captain Pete's Cuban White Rum" - desc = "A milky, white alternative to Cuban Spiced! Tastes like coconut." - icon_state = "whiterumbottle" - center_of_mass = list("x"=16, "y"=8) - -/obj/item/reagent_containers/food/drinks/bottle/whiterum/Initialize(mapload) - . = ..() - reagents.add_reagent("whiterum", 100) - -/obj/item/reagent_containers/food/drinks/bottle/holywater - name = "Flask of Holy Water" - desc = "A flask of the chaplain's holy water." - icon_state = "holyflask" - center_of_mass = list("x"=17, "y"=10) - -/obj/item/reagent_containers/food/drinks/bottle/holywater/Initialize(mapload) - . = ..() - reagents.add_reagent("holywater", 100) - -/obj/item/reagent_containers/food/drinks/bottle/vermouth - name = "Goldeneye Vermouth" - desc = "Sweet, sweet dryness~" - icon_state = "vermouthbottle" - center_of_mass = list("x"=17, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize(mapload) - . = ..() - reagents.add_reagent("vermouth", 100) - -/obj/item/reagent_containers/food/drinks/bottle/kahlua - name = "Robert Robust's Coffee Liqueur" - desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936." - icon_state = "kahluabottle" - center_of_mass = list("x"=17, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize(mapload) - . = ..() - reagents.add_reagent("kahlua", 100) - -/obj/item/reagent_containers/food/drinks/bottle/goldschlager - name = "College Girl Goldschlager" - desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." - icon_state = "goldschlagerbottle" - center_of_mass = list("x"=15, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize(mapload) - . = ..() - reagents.add_reagent("goldschlager", 100) - -/obj/item/reagent_containers/food/drinks/bottle/cognac - name = "Chateau De Baton Premium Cognac" - desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing." - icon_state = "cognacbottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize(mapload) - . = ..() - reagents.add_reagent("cognac", 100) - -/obj/item/reagent_containers/food/drinks/bottle/wine - name = "Crab Cove Merlot" - desc = "Cheap red cooking wine pretending to be drinkable." - icon_state = "winebottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/wine/Initialize(mapload) - . = ..() - reagents.add_reagent("wine", 100) - -/obj/item/reagent_containers/food/drinks/bottle/whitewine - name = "Crab Cove Sauvignon Blanc" - desc = "White wine that's oddly better than the company's red variant." - icon_state = "whitewinebottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize(mapload) - . = ..() - reagents.add_reagent("whitewine", 100) - -/obj/item/reagent_containers/food/drinks/bottle/bitters - name = "Rattison's Bitters" - desc = "The best thing to bitters you're going to get in this sector." - icon_state = "bittersbottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/bitters/Initialize(mapload) - . = ..() - reagents.add_reagent("bitters", 100) - - -/obj/item/reagent_containers/food/drinks/bottle/absinthe - name = "Jailbreaker Verte" - desc = "One sip of this and you just know you're gonna have a good time." - icon_state = "absinthebottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize(mapload) - . = ..() - reagents.add_reagent("absinthe", 100) - -/obj/item/reagent_containers/food/drinks/bottle/melonliquor - name = "Emeraldine Melon Liquor" - desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light." - icon_state = "alco-green" //Placeholder. - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize(mapload) - . = ..() - reagents.add_reagent("melonliquor", 100) - -/obj/item/reagent_containers/food/drinks/bottle/bluecuracao - name = "Miss Blue Curacao" - desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic." - icon_state = "alco-blue" //Placeholder. - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize(mapload) - . = ..() - reagents.add_reagent("bluecuracao", 100) - -/obj/item/reagent_containers/food/drinks/bottle/victory_gin - name = "Victory Gin" - desc = "An oily Tajara liquor similar to gin. Bottled at one of the countless distilleries on Adhomai." - icon_state = "victorygin" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/victory_gin/Initialize(mapload) - . = ..() - reagents.add_reagent("victory_gin", 100) - -/obj/item/reagent_containers/food/drinks/bottle/messa_mead - name = "Messa's Mead" - desc = "A sweet liquor from Adhomai. Orginally considered a drink of the Tajaran nobility improved technology has made this honey and root based liqour available all across Adhomai and the even the stars beyond." - icon_state = "messamead" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/messa_mead/Initialize(mapload) - . = ..() - reagents.add_reagent("messa_mead", 100) - - -/obj/item/reagent_containers/food/drinks/bottle/grenadine - name = "Briar Rose Grenadine Syrup" - desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." - icon_state = "grenadinebottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize(mapload) - . = ..() - reagents.add_reagent("grenadine", 100) - -/obj/item/reagent_containers/food/drinks/bottle/cola - name = "\improper Space Cola" - desc = "Cola. in space" - icon_state = "colabottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/cola/Initialize(mapload) - . = ..() - reagents.add_reagent("cola", 100) - -/obj/item/reagent_containers/food/drinks/bottle/space_up - name = "\improper Space-Up" - desc = "Tastes like a hull breach in your mouth." - icon_state = "space-up_bottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize(mapload) - . = ..() - reagents.add_reagent("space_up", 100) - -/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind - name = "\improper Space Mountain Wind" - desc = "Blows right through you like a space wind." - icon_state = "space_mountain_wind_bottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize(mapload) - . = ..() - reagents.add_reagent("spacemountainwind", 100) - -/obj/item/reagent_containers/food/drinks/bottle/pwine - name = "Warlock's Velvet" - desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" - icon_state = "pwinebottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize(mapload) - . = ..() - reagents.add_reagent("pwine", 100) - /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew name = "Redeemer's Brew" desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart." @@ -475,104 +203,6 @@ . = ..() reagents.add_reagent("unathiliquor", 100) -//////////////////////////JUICES AND STUFF /////////////////////// - -/obj/item/reagent_containers/food/drinks/bottle/orangejuice - name = "Orange Juice" - desc = "Full of vitamins and deliciousness!" - icon_state = "orangejuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=7) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/orangejuice/Initialize(mapload) - . = ..() - reagents.add_reagent("orangejuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/applejuice - name = "Apple Juice" - desc = "Squeezed, pressed and ground to perfection!" - icon_state = "applejuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=7) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/applejuice/Initialize(mapload) - . = ..() - reagents.add_reagent("applejuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/milk - name = "Large Milk Carton" - desc = "It's milk. This carton's large enough to serve your biggest milk drinkers." - icon_state = "milk" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/milk/Initialize(mapload) - . = ..() - reagents.add_reagent("milk", 100) - -/obj/item/reagent_containers/food/drinks/bottle/cream - name = "Milk Cream" - desc = "It's cream. Made from milk. What else did you think you'd find in there?" - icon_state = "cream" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/cream/Initialize(mapload) - . = ..() - reagents.add_reagent("cream", 100) - -/obj/item/reagent_containers/food/drinks/bottle/tomatojuice - name = "Tomato Juice" - desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." - icon_state = "tomatojuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/tomatojuice/Initialize(mapload) - . = ..() - reagents.add_reagent("tomatojuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/limejuice - name = "Lime Juice" - desc = "Sweet-sour goodness." - icon_state = "limejuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/limejuice/Initialize(mapload) - . = ..() - reagents.add_reagent("limejuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/lemonjuice - name = "Lemon Juice" - desc = "Sweet-sour goodness. Minus the sweet." - icon_state = "lemonjuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/lemonjuice/Initialize(mapload) - . = ..() - reagents.add_reagent("lemonjuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/coconutmilk - name = "Coconut Milk" - desc = "A carton of NutClarity brand coconut milk." - icon_state = "milkbox" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/coconutmilk/Initialize(mapload) - . = ..() - reagents.add_reagent("coconutmilk", 100) - //Small bottles /obj/item/reagent_containers/food/drinks/bottle/small volume = 50 diff --git a/code/modules/food/drinks/bottle/alcohol.dm b/code/modules/food/drinks/bottle/alcohol.dm new file mode 100644 index 0000000000..3063a90eae --- /dev/null +++ b/code/modules/food/drinks/bottle/alcohol.dm @@ -0,0 +1,149 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/absinthe + name = "Jailbreaker Verte" + desc = "One sip of this and you just know you're gonna have a good time." + icon_state = "absinthebottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/absinthe + +/obj/item/reagent_containers/food/drinks/bottle/bitters + name = "Rattison's Bitters" + desc = "The best thing to bitters you're going to get in this sector." + icon_state = "bittersbottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/bitters + +/obj/item/reagent_containers/food/drinks/bottle/bluecuracao + name = "Miss Blue Curacao" + desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic." + icon_state = "alco-blue" //Placeholder. + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/bluecuracao + +/obj/item/reagent_containers/food/drinks/bottle/cognac + name = "Chateau De Baton Premium Cognac" + desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing." + icon_state = "cognacbottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/cognac + +/obj/item/reagent_containers/food/drinks/bottle/gin + name = "Griffeater Gin" + desc = "A bottle of high quality gin, produced in Alpha Centauri." + icon_state = "ginbottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/gin + +/obj/item/reagent_containers/food/drinks/bottle/goldschlager + name = "College Girl Goldschlager" + desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." + icon_state = "goldschlagerbottle" + center_of_mass = list("x"=15, "y"=3) + start_reagent = /datum/reagent/ethanol/goldschlager + +/obj/item/reagent_containers/food/drinks/bottle/kahlua + name = "Robert Robust's Coffee Liqueur" + desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936." + icon_state = "kahluabottle" + center_of_mass = list("x"=17, "y"=3) + start_reagent = /datum/reagent/ethanol/coffee/kahlua + +/obj/item/reagent_containers/food/drinks/bottle/melonliquor + name = "Emeraldine Melon Liquor" + desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light." + icon_state = "alco-green" //Placeholder. + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/melonliquor + +/obj/item/reagent_containers/food/drinks/bottle/messa_mead + name = "Messa's Mead" + desc = "A sweet liquor from Adhomai. Orginally considered a drink of the Tajaran nobility improved technology has made this honey and root based liqour available all across Adhomai and the even the stars beyond." + icon_state = "messamead" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/messa_mead + +/obj/item/reagent_containers/food/drinks/bottle/patron + name = "Wrapp Artiste Patron" + desc = "Silver laced tequila, served in space night clubs across the galaxy." + icon_state = "patronbottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/patron + +/obj/item/reagent_containers/food/drinks/bottle/pwine + name = "Warlock's Velvet" + desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" + icon_state = "pwinebottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/pwine + +/obj/item/reagent_containers/food/drinks/bottle/rum + name = "Captain Pete's Cuban Spiced Rum" + desc = "This isn't just rum, oh no. It's practically Cuba in a bottle." + icon_state = "rumbottle" + center_of_mass = list("x"=16, "y"=8) + start_reagent = /datum/reagent/ethanol/rum + +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey + name = "Special Blend Whiskey" + desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." + icon_state = "whiskeybottle2" + center_of_mass = list("x"=16, "y"=3) + start_reagent = /datum/reagent/ethanol/specialwhiskey + +/obj/item/reagent_containers/food/drinks/bottle/tequila + name = "Caccavo Guaranteed Quality Tequila" + desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" + icon_state = "tequilabottle" + center_of_mass = list("x"=16, "y"=3) + start_reagent = /datum/reagent/ethanol/tequila + +/obj/item/reagent_containers/food/drinks/bottle/vermouth + name = "Goldeneye Vermouth" + desc = "Sweet, sweet dryness~" + icon_state = "vermouthbottle" + center_of_mass = list("x"=17, "y"=3) + start_reagent = /datum/reagent/ethanol/vermouth + +/obj/item/reagent_containers/food/drinks/bottle/victory_gin + name = "Victory Gin" + desc = "An oily Tajara liquor similar to gin. Bottled at one of the countless distilleries on Adhomai." + icon_state = "victorygin" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/victory_gin + +/obj/item/reagent_containers/food/drinks/bottle/vodka + name = "Tunguska Triple Distilled" + desc = "Aah, vodka. Prime choice of drink and fuel by Russians worldwide." + icon_state = "vodkabottle" + center_of_mass = list("x"=17, "y"=3) + start_reagent = /datum/reagent/ethanol/vodka + +/obj/item/reagent_containers/food/drinks/bottle/whiskey + name = "Uncle Git's Special Reserve" + desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter." + icon_state = "whiskeybottle" + center_of_mass = list("x"=16, "y"=3) + start_reagent = /datum/reagent/ethanol/whiskey + +/obj/item/reagent_containers/food/drinks/bottle/whiterum + name = "Captain Pete's Cuban White Rum" + desc = "A milky, white alternative to Cuban Spiced! Tastes like coconut." + icon_state = "whiterumbottle" + center_of_mass = list("x"=16, "y"=8) + start_reagent = /datum/reagent/ethanol/whiterum + +/obj/item/reagent_containers/food/drinks/bottle/whitewine + name = "Crab Cove Sauvignon Blanc" + desc = "White wine that's oddly better than the company's red variant." + icon_state = "whitewinebottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/whitewine + +/obj/item/reagent_containers/food/drinks/bottle/wine + name = "Crab Cove Merlot" + desc = "Cheap red cooking wine pretending to be drinkable." + icon_state = "winebottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/wine diff --git a/code/modules/food/drinks/bottle/dairy.dm b/code/modules/food/drinks/bottle/dairy.dm new file mode 100644 index 0000000000..301c9fb283 --- /dev/null +++ b/code/modules/food/drinks/bottle/dairy.dm @@ -0,0 +1,20 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/cream + name = "Milk Cream" + desc = "It's cream. Made from milk. What else did you think you'd find in there?" + icon_state = "cream" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/milk/cream + +/obj/item/reagent_containers/food/drinks/bottle/milk + name = "Large Milk Carton" + desc = "It's milk. This carton's large enough to serve your biggest milk drinkers." + icon_state = "milk" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + isGlass = 0 + start_reagent = /datum/reagent/drink/milk diff --git a/code/modules/food/drinks/bottle/juice.dm b/code/modules/food/drinks/bottle/juice.dm new file mode 100644 index 0000000000..b11d8926ad --- /dev/null +++ b/code/modules/food/drinks/bottle/juice.dm @@ -0,0 +1,56 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/applejuice + name = "Apple Juice" + desc = "Squeezed, pressed and ground to perfection!" + icon_state = "applejuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=7) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/apple + +/obj/item/reagent_containers/food/drinks/bottle/coconutmilk + name = "Coconut Milk" + desc = "A carton of NutClarity brand coconut milk." + icon_state = "milkbox" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/milk/coconutmilk + +/obj/item/reagent_containers/food/drinks/bottle/lemonjuice + name = "Lemon Juice" + desc = "Sweet-sour goodness. Minus the sweet." + icon_state = "lemonjuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/lemon + +/obj/item/reagent_containers/food/drinks/bottle/limejuice + name = "Lime Juice" + desc = "Sweet-sour goodness." + icon_state = "limejuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/lime + +/obj/item/reagent_containers/food/drinks/bottle/orangejuice + name = "Orange Juice" + desc = "Full of vitamins and deliciousness!" + icon_state = "orangejuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=7) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/orange + +/obj/item/reagent_containers/food/drinks/bottle/tomatojuice + name = "Tomato Juice" + desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." + icon_state = "tomatojuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/tomato diff --git a/code/modules/food/drinks/bottle/misc.dm b/code/modules/food/drinks/bottle/misc.dm new file mode 100644 index 0000000000..3c4d06fc47 --- /dev/null +++ b/code/modules/food/drinks/bottle/misc.dm @@ -0,0 +1,23 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing + name = "Bottle of Nothing" + desc = "A bottle filled with nothing" + icon_state = "bottleofnothing" + center_of_mass = list("x"=17, "y"=5) + start_reagent = /datum/reagent/drink/nothing + +/obj/item/reagent_containers/food/drinks/bottle/grenadine + name = "Briar Rose Grenadine Syrup" + desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." + icon_state = "grenadinebottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/drink/grenadine + +/obj/item/reagent_containers/food/drinks/bottle/holywater + name = "Flask of Holy Water" + desc = "A flask of the chaplain's holy water." + icon_state = "holyflask" + center_of_mass = list("x"=17, "y"=10) + start_reagent = /datum/reagent/water/holywater diff --git a/code/modules/food/drinks/bottle/soda.dm b/code/modules/food/drinks/bottle/soda.dm new file mode 100644 index 0000000000..b727501ff9 --- /dev/null +++ b/code/modules/food/drinks/bottle/soda.dm @@ -0,0 +1,23 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/cola + name = "\improper Space Cola" + desc = "Cola. in space" + icon_state = "colabottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/drink/soda + +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind + name = "\improper Space Mountain Wind" + desc = "Blows right through you like a space wind." + icon_state = "space_mountain_wind_bottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/drink/soda/spacemountainwind + +/obj/item/reagent_containers/food/drinks/bottle/space_up + name = "\improper Space-Up" + desc = "Tastes like a hull breach in your mouth." + icon_state = "space-up_bottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/drink/soda/space_up diff --git a/code/modules/food/food/cans.dm b/code/modules/food/drinks/can.dm similarity index 100% rename from code/modules/food/food/cans.dm rename to code/modules/food/drinks/can.dm diff --git a/code/modules/food/drinks/carton.dm b/code/modules/food/drinks/carton.dm new file mode 100644 index 0000000000..14644aff85 --- /dev/null +++ b/code/modules/food/drinks/carton.dm @@ -0,0 +1,88 @@ +//* Dairy + +/obj/item/reagent_containers/food/drinks/milk + name = "milk carton" + desc = "It's milk. White and nutritious goodness!" + icon_state = "milk" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + volume = 50 + start_reagent = /datum/reagent/drink/milk + +/obj/item/reagent_containers/food/drinks/soymilk + name = "soymilk carton" + desc = "It's soy milk. White and nutritious goodness!" + icon_state = "soymilk" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + volume = 50 + start_reagent = /datum/reagent/drink/milk/soymilk + +/obj/item/reagent_containers/food/drinks/smallmilk + name = "small milk carton" + desc = "It's milk. White and nutritious goodness!" + icon_state = "mini-milk" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + volume = 30 + start_reagent = /datum/reagent/drink/milk + +/obj/item/reagent_containers/food/drinks/smallchocmilk + name = "small chocolate milk carton" + desc = "It's milk! This one is in delicious chocolate flavour." + icon_state = "mini-milk_choco" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + volume = 30 + start_reagent = /datum/reagent/drink/milk/chocolate + +//* Vetalan + +/obj/item/reagent_containers/food/drinks/bludboxmax + name = "Bludbox MAX carton" + desc = "A vampire's best friend! This Bludbox contains only the most delicious of organic, free-range O-Negatives. For all your dietry needs!" + volume = 30 + icon_state = "bludboxmax" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + start_reagent = /datum/reagent/blood + +/obj/item/reagent_containers/food/drinks/bludboxmaxlight + name = "Bludbox MAX Light carton" + desc = "A bloodsucking vegan's hipster alternative to drinking the red stuff. Bludbox light is just the same as drinking straight from the source! Comes in O- flavour." + volume = 30 + icon_state = "bludboxmaxlight" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + start_reagent = /datum/reagent/blood/synthblood + +/obj/item/reagent_containers/food/drinks/bludbox + name = "Bludbox carton" + desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends." + volume = 30 + icon_state = "bludbox" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + start_reagent = /datum/reagent/drink/blud + +/obj/item/reagent_containers/food/drinks/bludboxlight + name = "Bludbox Light carton" + desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends. This one has less sweeteners, gross!" + volume = 30 + icon_state = "bludboxlight" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + start_reagent = /datum/reagent/drink/blud/bludlight + diff --git a/code/modules/food/food/drinks/cup.dm b/code/modules/food/drinks/cup.dm similarity index 100% rename from code/modules/food/food/drinks/cup.dm rename to code/modules/food/drinks/cup.dm diff --git a/code/modules/food/drinks/flask.dm b/code/modules/food/drinks/flask.dm new file mode 100644 index 0000000000..4bb6ecd2e5 --- /dev/null +++ b/code/modules/food/drinks/flask.dm @@ -0,0 +1,33 @@ +/obj/item/reagent_containers/food/drinks/flask + name = "\improper Facility Director's flask" + desc = "A metal flask belonging to the Facility Director" + icon_state = "flask" + volume = 60 + center_of_mass = list("x"=17, "y"=7) + +/obj/item/reagent_containers/food/drinks/flask/shiny + name = "shiny flask" + desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it." + icon_state = "shinyflask" + +/obj/item/reagent_containers/food/drinks/flask/lithium + name = "lithium flask" + desc = "A flask with a Lithium Atom symbol on it." + icon_state = "lithiumflask" + +/obj/item/reagent_containers/food/drinks/flask/detflask + name = "\improper Detective's flask" + desc = "A metal flask with a leather band and golden badge belonging to the detective." + icon_state = "detflask" + center_of_mass = list("x"=17, "y"=8) + +/obj/item/reagent_containers/food/drinks/flask/barflask + name = "flask" + desc = "For those who can't be bothered to hang out at the bar to drink." + icon_state = "barflask" + +/obj/item/reagent_containers/food/drinks/flask/vacuumflask + name = "vacuum flask" + desc = "Keeping your drinks at the perfect temperature since 1892." + icon_state = "vacuumflask" + center_of_mass = list("x"=15, "y"=4) diff --git a/code/modules/food/food/drinks/jar.dm b/code/modules/food/drinks/jar.dm similarity index 100% rename from code/modules/food/food/drinks/jar.dm rename to code/modules/food/drinks/jar.dm diff --git a/code/modules/food/drinks/misc.dm b/code/modules/food/drinks/misc.dm new file mode 100644 index 0000000000..fecb7daea8 --- /dev/null +++ b/code/modules/food/drinks/misc.dm @@ -0,0 +1,15 @@ +/obj/item/reagent_containers/food/drinks/glue + name = "Glue" + desc = "A small bottle full of glue. The orange tip calls to you, and the fluid inside is non-toxic... Should you?" + icon_state = "glue" + drop_sound = 'sound/items/drop/cardboardbox.ogg' + volume = 30 + center_of_mass = list("x"=15, "y"=13) + start_reagent = /datum/reagent/drink/glue + +/obj/item/reagent_containers/food/drinks/glue/on_reagent_change() + ..() + if(reagents.total_volume) + icon_state = "glue" + else + icon_state = "glue_e" diff --git a/code/modules/food/drinks/shaker.dm b/code/modules/food/drinks/shaker.dm new file mode 100644 index 0000000000..32e6fc8e81 --- /dev/null +++ b/code/modules/food/drinks/shaker.dm @@ -0,0 +1,7 @@ +/obj/item/reagent_containers/food/drinks/shaker + name = "shaker" + desc = "A metal shaker to mix drinks in." + icon_state = "shaker" + amount_per_transfer_from_this = 10 + volume = 120 + center_of_mass = list("x"=17, "y"=10) diff --git a/code/modules/food/drinks/tea.dm b/code/modules/food/drinks/tea.dm new file mode 100644 index 0000000000..94fba3b97b --- /dev/null +++ b/code/modules/food/drinks/tea.dm @@ -0,0 +1,15 @@ +/obj/item/reagent_containers/food/drinks/teapot + name = "teapot" + desc = "An elegant teapot. It simply oozes class." + icon_state = "teapot" + item_state = "teapot" + amount_per_transfer_from_this = 10 + volume = 120 + center_of_mass = list("x"=17, "y"=7) + +/obj/item/reagent_containers/food/drinks/britcup + name = "cup" + desc = "A cup with the British flag emblazoned on it." + icon_state = "britcup" + volume = 30 + center_of_mass = list("x"=15, "y"=13) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index f875ea8ed5..5dfb340ff1 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -5,6 +5,7 @@ /// Food. //////////////////////////////////////////////////////////////////////////////// /obj/item/reagent_containers/food + armor_type = /datum/armor/none possible_transfer_amounts = null volume = 50 //Sets the default container amount for all food items. var/filling_color = "#FFFFFF" //Used by sandwiches. @@ -13,11 +14,31 @@ var/list/center_of_mass = list() // Used for table placement -/obj/item/reagent_containers/food/Initialize(mapload) + /// inherent reagents to add when we're created from cooking + /// this is also added if we were created from adminspawn or something + /// this is a list of key-value's, where value is volume, and key is a typepath or id of a reagent + /// prefer typepaths for compile-time checking. + // todo: write more on this / why we shouldn't this instead of food effects/etc. + var/list/inherent_reagents + /// reagents we kind of just start with + /// this is used for condiment bottles, milk cartons, etc + // todo: why tf is a milk carton /food? + var/list/prefill_reagents + + // todo: above is legacy + + //* Eating + /// eating bite sound + var/bite_sound = 'sound/items/eatfood.ogg' + +/obj/item/reagent_containers/food/Initialize(mapload, cooked) . = ..() if (center_of_mass.len && !pixel_x && !pixel_y) src.pixel_x = rand(-6.0, 6) //Randomizes postion src.pixel_y = rand(-6.0, 6) + // prefill depending on if we were cooked or an actual spawn. + for(var/key in cooked? inherent_reagents : inherent_reagents | prefill_reagents) + reagents.add_reagent(key, inherent_reagents[key]) /obj/item/reagent_containers/food/afterattack(atom/target, mob/user, clickchain_flags, list/params) if(center_of_mass.len && (clickchain_flags & CLICKCHAIN_HAS_PROXIMITY) && istype(target, /obj/structure/table)) diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 6861c338cd..8ffc912b1a 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -116,66 +116,10 @@ volume = 150 atom_flags = OPENCONTAINER -/obj/item/reagent_containers/food/drinks/golden_cup/on_reagent_change() - ..() - -///////////////////////////////////////////////Drinks //Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly // rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50. // Formatting is the same as food. -/obj/item/reagent_containers/food/drinks/milk - name = "milk carton" - desc = "It's milk. White and nutritious goodness!" - icon_state = "milk" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - - -/obj/item/reagent_containers/food/drinks/milk/Initialize(mapload) - . = ..() - reagents.add_reagent("milk", 50) - -/obj/item/reagent_containers/food/drinks/soymilk - name = "soymilk carton" - desc = "It's soy milk. White and nutritious goodness!" - icon_state = "soymilk" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/soymilk/Initialize(mapload) - . = ..() - reagents.add_reagent("soymilk", 50) - -/obj/item/reagent_containers/food/drinks/smallmilk - name = "small milk carton" - desc = "It's milk. White and nutritious goodness!" - volume = 30 - icon_state = "mini-milk" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/reagent_containers/food/drinks/smallmilk/Initialize(mapload) - . = ..() - reagents.add_reagent("milk", 30) - -/obj/item/reagent_containers/food/drinks/smallchocmilk - name = "small chocolate milk carton" - desc = "It's milk! This one is in delicious chocolate flavour." - volume = 30 - icon_state = "mini-milk_choco" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/reagent_containers/food/drinks/smallchocmilk/Initialize(mapload) - . = ..() - reagents.add_reagent("chocolate_milk", 30) /obj/item/reagent_containers/food/drinks/coffee name = "\improper Robust Coffee" @@ -231,58 +175,6 @@ . = ..() reagents.add_reagent("dry_ramen", 30) -/obj/item/reagent_containers/food/drinks/bludboxmax - name = "Bludbox MAX carton" - desc = "A vampire's best friend! This Bludbox contains only the most delicious of organic, free-range O-Negatives. For all your dietry needs!" - volume = 30 - icon_state = "bludboxmax" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/bludboxmax/Initialize(mapload) - . = ..() - reagents.add_reagent("blood", 30) - -/obj/item/reagent_containers/food/drinks/bludboxmaxlight - name = "Bludbox MAX Light carton" - desc = "A bloodsucking vegan's hipster alternative to drinking the red stuff. Bludbox light is just the same as drinking straight from the source! Comes in O- flavour." - volume = 30 - icon_state = "bludboxmaxlight" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/bludboxmaxlight/Initialize(mapload) - . = ..() - reagents.add_reagent("synthblood", 30) - -/obj/item/reagent_containers/food/drinks/bludbox - name = "Bludbox carton" - desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends." - volume = 30 - icon_state = "bludbox" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/bludbox/Initialize(mapload) - . = ..() - reagents.add_reagent("blud", 30) - -/obj/item/reagent_containers/food/drinks/bludboxlight - name = "Bludbox Light carton" - desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends. This one has less sweeteners, gross!" - volume = 30 - icon_state = "bludboxlight" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/bludboxlight/Initialize(mapload) - . = ..() - reagents.add_reagent("bludlight", 30) - /obj/item/reagent_containers/food/drinks/sillycup name = "paper cup" desc = "A paper water cup." @@ -309,101 +201,3 @@ W.update_icon() else return ..() - -//////////////////////////drinkingglass and shaker// -//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink -// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass -// icon states. - -/obj/item/reagent_containers/food/drinks/shaker - name = "shaker" - desc = "A metal shaker to mix drinks in." - icon_state = "shaker" - amount_per_transfer_from_this = 10 - volume = 120 - center_of_mass = list("x"=17, "y"=10) - -/obj/item/reagent_containers/food/drinks/shaker/on_reagent_change() - ..() - -/obj/item/reagent_containers/food/drinks/teapot - name = "teapot" - desc = "An elegant teapot. It simply oozes class." - icon_state = "teapot" - item_state = "teapot" - amount_per_transfer_from_this = 10 - volume = 120 - center_of_mass = list("x"=17, "y"=7) - -/obj/item/reagent_containers/food/drinks/teapot/on_reagent_change() - ..() - -/obj/item/reagent_containers/food/drinks/flask - name = "\improper Facility Director's flask" - desc = "A metal flask belonging to the Facility Director" - icon_state = "flask" - volume = 60 - center_of_mass = list("x"=17, "y"=7) - -/obj/item/reagent_containers/food/drinks/flask/on_reagent_change() - ..() - -/obj/item/reagent_containers/food/drinks/flask/shiny - name = "shiny flask" - desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it." - icon_state = "shinyflask" - -/obj/item/reagent_containers/food/drinks/flask/lithium - name = "lithium flask" - desc = "A flask with a Lithium Atom symbol on it." - icon_state = "lithiumflask" - -/obj/item/reagent_containers/food/drinks/flask/detflask - name = "\improper Detective's flask" - desc = "A metal flask with a leather band and golden badge belonging to the detective." - icon_state = "detflask" - volume = 60 - center_of_mass = list("x"=17, "y"=8) - -/obj/item/reagent_containers/food/drinks/flask/barflask - name = "flask" - desc = "For those who can't be bothered to hang out at the bar to drink." - icon_state = "barflask" - volume = 60 - center_of_mass = list("x"=17, "y"=7) - -/obj/item/reagent_containers/food/drinks/flask/vacuumflask - name = "vacuum flask" - desc = "Keeping your drinks at the perfect temperature since 1892." - icon_state = "vacuumflask" - volume = 60 - center_of_mass = list("x"=15, "y"=4) - -/obj/item/reagent_containers/food/drinks/britcup - name = "cup" - desc = "A cup with the British flag emblazoned on it." - icon_state = "britcup" - volume = 30 - center_of_mass = list("x"=15, "y"=13) - -/obj/item/reagent_containers/food/drinks/britcup/on_reagent_change() - ..() - -/obj/item/reagent_containers/food/drinks/glue - name = "Glue" - desc = "A small bottle full of glue. The orange tip calls to you, and the fluid inside is non-toxic... Should you?" - icon_state = "glue" - drop_sound = 'sound/items/drop/cardboardbox.ogg' - volume = 30 - center_of_mass = list("x"=15, "y"=13) - -/obj/item/reagent_containers/food/drinks/glue/Initialize(mapload) - . = ..() - reagents.add_reagent("safeglue", 30) - -/obj/item/reagent_containers/food/drinks/glue/on_reagent_change() - ..() - if(reagents.total_volume) - icon_state = "glue" - else - icon_state = "glue_e" diff --git a/code/modules/food/food/ice_cream.dm b/code/modules/food/food/ice_cream.dm new file mode 100644 index 0000000000..75caca94bf --- /dev/null +++ b/code/modules/food/food/ice_cream.dm @@ -0,0 +1,229 @@ +/obj/item/reagent_containers/food/snacks/ice_cream + name = "waffle cone" + desc = "An empty waffle cone, presumably used to hold ice cream. How depressing." + icon = 'icons/modules/food/items/ice_cream.dmi' + icon_state = "wafflecone" + color = "#ffcc66" + appearance_flags = KEEP_TOGETHER + w_class = WEIGHT_CLASS_TINY + throw_force = 0 + damage_force = 0 + bitesize = 3 + + // :troll: + atom_flags = NOREACT + + /// already bit into? no double dipping! + var/can_keep_scooping = FALSE + /// overall sugar-ation; continuously compounded to be the % of scoops with sugar + var/snowflake_deliciousness = 0 + /// max scoops + var/scoop_max = 8 + /// current scoop position + /// once we're biting out of it, this goes down with every bite and is used to track overlays. + var/scoop_current = 0 + + /// prefill with scoops of these reagents + /// list(path, path, path, ...) + /// do not do path = amount; the association part of the list + /// is reserved for future use + var/list/start_with_scoop_of + /// standard scoop size + var/start_with_scoop_size = 3 + +/obj/item/reagent_containers/food/snacks/ice_cream/Initialize(mapload) + . = ..() + var/created_any = FALSE + for(var/key in start_with_scoop_of) + created_any = add_scoop(key, start_with_scoop_size, update_icon = FALSE) || created_any + if(created_any) + update_appearance() + +//! LEGACY CODE START + +/obj/item/reagent_containers/food/snacks/ice_cream/attempt_feed(mob/living/M, mob/living/user) + if(can_keep_scooping) + // being bitten into for the first time, compute values as needed + can_keep_scooping = FALSE + // 1 bite per scoop, plus 1 for the base scoop, plus 1 for the cone + bitesize = reagents.total_volume / (scoop_current + 1 + 1) + . = ..() + // add_bite_mark() + +//! END + +/** + * If reagent source is a holder, we will consume reagent_amount from it; otherwise, we magically make more. + */ +/obj/item/reagent_containers/food/snacks/ice_cream/proc/add_scoop(reagent_source, reagent_amount, sugarized = TRUE, update_icon = TRUE) + var/color + if(istype(reagent_source, /datum/reagent)) + var/datum/reagent/from_reagent = reagent_source + color = from_reagent.color + reagents.add_reagent(from_reagent.id, reagent_amount) + else if(ispath(reagent_source, /datum/reagent) || istext(reagent_source)) + var/datum/reagent/from_reagent = SSchemistry.fetch_reagent(reagent_source) + color = from_reagent.color + reagents.add_reagent(from_reagent.id, reagent_amount) + else if(istype(reagent_source, /datum/reagents)) + var/datum/reagents/from_holder = reagent_source + color = from_holder.get_color() + from_holder.transfer_to_holder(reagents, amount = reagent_amount) + + var/list/pos = overlay_position(++scoop_current) + if(isnull(pos)) + return TRUE + var/image/dollop = image(icon, icon_state = "dollop", pixel_x = pos[1], pixel_y = pos[2]) + dollop.color = color + dollop.appearance_flags = KEEP_APART | RESET_COLOR + add_overlay(dollop) + + // todo: this is awful + if(sugarized) + reagents.add_reagent(/datum/reagent/sugar, 2) + snowflake_deliciousness = ((snowflake_deliciousness * (scoop_current - 1)) + sugarized? 1 : 0) / scoop_current + + if(name == initial(name)) + name = "ice cream" + desc = "Delicious ice cream. This one has [scoop_current] scoops." + + return TRUE + +// todo: byond's renderer can go die in a goddamn fire; BLEND_SUBTRACT doesn't work for alpha masks obviously +// so we don't have a fast way of rendering dynamic bite marks without having to hard-sprite shit, +// which kinda ruins the point of dynamic ice cream, don't you think? +/* +/obj/item/reagent_containers/food/snacks/ice_cream/proc/add_bite_mark() + var/pos = scoop_current-- + var/list/offsets = overlay_position(pos) + if(isnull(offsets)) + return + var/image/bite_overlay = image(icon = icon, icon_state = "bite_mask") + bite_overlay.blend_mode = BLEND_SUBTRACT + bite_overlay.pixel_x = offsets[1] + bite_overlay.pixel_y = offsets[2] + add_overlay(bite_overlay) +*/ + +/obj/item/reagent_containers/food/snacks/ice_cream/throw_land(atom/A, datum/thrownthing/TT) + smash() + return COMPONENT_THROW_HIT_TERMINATE + +/obj/item/reagent_containers/food/snacks/ice_cream/proc/smash() + visible_message(SPAN_WARNING("[src] falls, getting smushed in the process.")) + new /obj/effect/debris/cleanable/ice_cream(drop_location(), src) + qdel(src) + +/obj/item/reagent_containers/food/snacks/ice_cream/proc/overlay_position(i) + switch(i) + if(0) + // this is bite mark for 'we're out' + return list(0, -4) + if(1) + return list(0, 0) + if(2) + return list(-3, 3) + if(3) + return list(3, 3) + if(4) + return list(0, 5) + if(5) + return list(-5, 5) + if(6) + return list(5, 5) + if(7) + return list(-3, 8) + if(8) + return list(3, 8) + +#define ICE_CREAM_PATHS(REAGENT_PATH, PATH_APPEND) \ +/obj/item/reagent_containers/food/snacks/ice_cream/##PATH_APPEND { \ + start_with_scoop_of = list(REAGENT_PATH); \ +} \ +/obj/item/reagent_containers/food/snacks/ice_cream/##PATH_APPEND/double { \ + start_with_scoop_of = list(REAGENT_PATH, REAGENT_PATH); \ +} \ +/obj/item/reagent_containers/food/snacks/ice_cream/##PATH_APPEND/triple { \ + start_with_scoop_of = list(REAGENT_PATH, REAGENT_PATH, REAGENT_PATH); \ +} + +ICE_CREAM_PATHS(/datum/reagent/nutriment/vanilla, vanilla) +ICE_CREAM_PATHS(/datum/reagent/drink/milk/chocolate, chocolate) +ICE_CREAM_PATHS(/datum/reagent/drink/juice/lemon, lemon) +ICE_CREAM_PATHS(/datum/reagent/drink/juice/orange, orange) +ICE_CREAM_PATHS(/datum/reagent/drink/juice/apple, apple) + +/obj/effect/debris/cleanable/ice_cream + name = "smashed ice cream" + desc = "How depressing." + icon = 'icons/modules/food/items/ice_cream.dmi' + icon_state = "melt1" + appearance_flags = KEEP_TOGETHER + atom_flags = NOREACT + + var/waffle_stage = 0 + var/melt_stage = 0 + + /// list of colors + var/list/dollops_left_colors + /// final color + var/final_color + +/obj/effect/debris/cleanable/ice_cream/Initialize(mapload, obj/item/reagent_containers/food/snacks/ice_cream/from_cone) + . = ..() + dollops_left_colors = list() + for(var/appearance/A as anything in from_cone?.overlays) + if(A.icon_state != "dollop") + continue + dollops_left_colors += A.color + create_reagents(1000) + // we're not reacting btw :) + from_cone.reagents.transfer_to_holder(reagents) + // get final color + final_color = reagents.get_color() + // trigger reactions in a bit + addtimer(CALLBACK(src, PROC_REF(start_reaction)), rand(0.5, 1.5 SECONDS)) + // trigger melt cycle + melt_more() + +/obj/effect/debris/cleanable/ice_cream/proc/start_reaction() + atom_flags &= ~NOREACT + reagents?.handle_reactions() + +/obj/effect/debris/cleanable/ice_cream/proc/melt_more() + cut_overlays() + + melt_stage = min(3, melt_stage + 1) + icon_state = "melt[melt_stage]" + + var/image/middle = image(icon, icon_state = "melt[melt_stage]") + middle.layer = FLOAT_LAYER - 2 + middle.color = final_color + middle.appearance_flags = KEEP_APART | RESET_COLOR + add_overlay(middle) + + if(length(dollops_left_colors)) + color = BlendRGB(color || "#ffffff", dollops_left_colors[1], 0.5) + dollops_left_colors.Cut(1, 2) + for(var/color in dollops_left_colors) + var/image/dollop = image(icon = icon, icon_state = "dollop") + dollop.color = color + dollop.pixel_x = rand(-8, 8) + dollop.pixel_y = rand(-8, 8) - 4 + dollop.appearance_flags = KEEP_APART | RESET_COLOR + dollop.layer = FLOAT_LAYER - 1 + var/image/puddle = image(dollop) + puddle.icon_state = "melt[melt_stage]" + puddle.layer = FLOAT_LAYER - 2 + puddle.pixel_y = 4 + add_overlay(puddle) + + if(length(dollops_left_colors) || melt_stage < 3 || waffle_stage < 3) + addtimer(CALLBACK(src, PROC_REF(melt_more)), rand(2, 5 MINUTES)) + + waffle_stage = min(3, waffle_stage + 1) + var/image/waffle = image(icon = icon, icon_state = "waffledrop[waffle_stage]") + waffle.color = "#ffcc66" + waffle.appearance_flags = KEEP_APART | RESET_COLOR + waffle.layer = FLOAT_LAYER + add_overlay(waffle) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 86d3ce188d..9437da8f8c 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/food.dmi' icon_state = null atom_flags = OPENCONTAINER + var/bitesize = 1 var/bitecount = 0 var/trash = null @@ -56,10 +57,7 @@ open(user) /obj/item/reagent_containers/food/snacks/proc/open(mob/user) - if(custom_open_sound) - playsound(loc,custom_open_sound, rand(10,50), 1) - else - playsound(loc,'sound/items/foodcanopen.ogg', rand(10,50), 1) + playsound(loc,custom_open_sound || 'sound/items/foodcanopen.ogg', rand(10,50), 1) if(opened_icon) icon_state = "[initial(icon_state)]-open" @@ -152,7 +150,8 @@ user.visible_message("[user] feeds [M] [src].") if(reagents) //Handle ingestion of the reagent. - playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + if(bite_sound) + playsound(M.loc,bite_sound, rand(10,50), 1) if(reagents.total_volume) if(reagents.total_volume > bitesize) reagents.trans_to_mob(M, bitesize, CHEM_INGEST) @@ -217,6 +216,9 @@ var/hide_item = !has_edge(W) || !can_slice_here if (hide_item) + var/confirm=input(user, "Are you certain you want to insert \the [W] into [src]?","Hide item") as null|anything in list("Yes","No") + if(!confirm || confirm == "No") + return if (W.w_class >= w_class || is_robot_module(W)) return if(!user.attempt_insert_item_for_installation(W, src)) @@ -412,7 +414,7 @@ desc = "Freeze Dried peas covered in a very spicy substance!" icon_state = "wasabi_peas" nutriment_amt = 4 - nutriment_desc = list("capsaicin" = 2, "protein" = 2) + nutriment_desc = list("wasabi" = 2, "protein" = 2) /obj/item/reagent_containers/food/snacks/bagged/wpeas/Initialize(mapload) . = ..() @@ -1885,7 +1887,10 @@ var/mob/living/carbon/human/H = M H.visible_message("A screeching creature bursts out of [M]'s chest!") var/obj/item/organ/external/organ = H.get_organ(BP_TORSO) - organ.take_damage(50, 0, 0, "Animal escaping the ribcage") + organ?.inflict_bodypart_damage( + brute = 50, + weapon_descriptor = "bursting", + ) Expand() /obj/item/reagent_containers/food/snacks/monkeycube/on_reagent_change() diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm deleted file mode 100644 index fd2f63fe8d..0000000000 --- a/code/modules/food/kitchen/icecream.dm +++ /dev/null @@ -1,198 +0,0 @@ -#define ICECREAM_VANILLA 1 -#define ICECREAM_CHOCOLATE 2 -#define ICECREAM_STRAWBERRY 3 -#define ICECREAM_BLUE 4 -#define CONE_WAFFLE 5 -#define CONE_CHOC 6 - -// Ported wholesale from Apollo Station. - -/obj/machinery/icecream_vat - name = "icecream vat" - desc = "Ding-aling ding dong. Get your NanoTrasen-approved ice cream!" - icon = 'icons/obj/kitchen.dmi' - icon_state = "icecream_vat" - density = 1 - anchored = 0 - use_power = 0 - atom_flags = OPENCONTAINER | NOREACT - // todo: temporary, as this is unbuildable - integrity_flags = INTEGRITY_INDESTRUCTIBLE - - var/list/product_types = list() - var/dispense_flavour = ICECREAM_VANILLA - var/flavour_name = "vanilla" - -/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type) - switch(type) - if(ICECREAM_CHOCOLATE) - return list("milk", "ice", "coco") - if(ICECREAM_STRAWBERRY) - return list("milk", "ice", "berryjuice") - if(ICECREAM_BLUE) - return list("milk", "ice", "singulo") - if(CONE_WAFFLE) - return list("flour", "sugar") - if(CONE_CHOC) - return list("flour", "sugar", "coco") - else - return list("milk", "ice") - -/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type) - switch(flavour_type) - if(ICECREAM_CHOCOLATE) - return "chocolate" - if(ICECREAM_STRAWBERRY) - return "strawberry" - if(ICECREAM_BLUE) - return "blue" - if(CONE_WAFFLE) - return "waffle" - if(CONE_CHOC) - return "chocolate" - else - return "vanilla" - -/obj/machinery/icecream_vat/Initialize(mapload) - . = ..() - create_reagents(100) - while(product_types.len < 6) - product_types.Add(5) - reagents.add_reagent("milk", 5) - reagents.add_reagent("flour", 5) - reagents.add_reagent("sugar", 5) - reagents.add_reagent("ice", 5) - -/obj/machinery/icecream_vat/attack_hand(mob/user, list/params) - user.set_machine(src) - interact(user) - -/obj/machinery/icecream_vat/interact(mob/user as mob) - var/dat - dat += "ICECREAM
" - dat += "Dispensing: [flavour_name] icecream

" - dat += "Vanilla icecream: Select Make x5 [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
" - dat += "Strawberry icecream: Select Make x5 [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
" - dat += "Chocolate icecream: Select Make x5 [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
" - dat += "Blue icecream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
" - dat += "
CONES
" - dat += "Waffle cones: Dispense Make x5 [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)
" - dat += "Chocolate cones: Dispense Make x5 [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)
" - dat += "
" - dat += "VAT CONTENT
" - for(var/datum/reagent/R in reagents.reagent_list) - dat += "[R.name]: [R.volume]" - dat += "Purge
" - dat += "Refresh Close" - - var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src) - popup.set_content(dat) - popup.open() - -/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/reagent_containers/food/snacks/icecream)) - var/obj/item/reagent_containers/food/snacks/icecream/I = O - if(!I.ice_creamed) - if(product_types[dispense_flavour] > 0) - src.visible_message("[icon2html(thing = src, target = world)] [user] scoops delicious [flavour_name] icecream into [I].") - product_types[dispense_flavour] -= 1 - I.add_ice_cream(flavour_name) - // if(beaker) - // beaker.reagents.trans_to(I, 10) - if(I.reagents.total_volume < 10) - I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) - else - to_chat(user, "There is not enough icecream left!") - else - to_chat(user, "[O] already has icecream in it.") - return 1 - else if(O.is_open_container()) - return - else - ..() - -/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type, var/amount) - for(var/R in get_ingredient_list(make_type)) - if(reagents.has_reagent(R, amount)) - continue - amount = 0 - break - if(amount) - for(var/R in get_ingredient_list(make_type)) - reagents.remove_reagent(R, amount) - product_types[make_type] += amount - var/flavour = get_flavour_name(make_type) - if(make_type > 4) - src.visible_message("[user] cooks up some [flavour] cones.") - else - src.visible_message("[user] whips up some [flavour] icecream.") - else - to_chat(user, "You don't have the ingredients to make this.") - -/obj/machinery/icecream_vat/Topic(href, href_list) - - if(..()) - return - - if(href_list["select"]) - dispense_flavour = text2num(href_list["select"]) - flavour_name = get_flavour_name(dispense_flavour) - src.visible_message("[usr] sets [src] to dispense [flavour_name] flavoured icecream.") - - if(href_list["cone"]) - var/dispense_cone = text2num(href_list["cone"]) - var/cone_name = get_flavour_name(dispense_cone) - if(product_types[dispense_cone] >= 1) - product_types[dispense_cone] -= 1 - var/obj/item/reagent_containers/food/snacks/icecream/I = new(src.loc) - I.cone_type = cone_name - I.icon_state = "icecream_cone_[cone_name]" - I.desc = "Delicious [cone_name] cone, but no ice cream." - src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") - else - to_chat(usr, "There are no [cone_name] cones left!") - - if(href_list["make"]) - var/amount = (text2num(href_list["amount"])) - var/C = text2num(href_list["make"]) - make(usr, C, amount) - - if(href_list["disposeI"]) - reagents.del_reagent(href_list["disposeI"]) - - updateDialog() - - if(href_list["refresh"]) - updateDialog() - - if(href_list["close"]) - usr.unset_machine() - usr << browse(null,"window=icecreamvat") - return - -/obj/item/reagent_containers/food/snacks/icecream - name = "ice cream cone" - desc = "Delicious waffle cone, but no ice cream." - icon_state = "icecream_cone_waffle" //default for admin-spawned cones, href_list["cone"] should overwrite this all the time - bitesize = 3 - - var/ice_creamed = 0 - var/cone_type - -/obj/item/reagent_containers/food/snacks/icecream/Initialize(mapload) - . = ..() - create_reagents(20) - reagents.add_reagent("nutriment", 5) - -/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name) - name = "[flavour_name] icecream" - add_overlay("icecream_[flavour_name]") - desc = "Delicious [cone_type] cone with a dollop of [flavour_name] ice cream." - ice_creamed = 1 - -#undef ICECREAM_VANILLA -#undef ICECREAM_STRAWBERRY -#undef ICECREAM_CHOCOLATE -#undef ICECREAM_BLUE -#undef CONE_WAFFLE -#undef CONE_CHOC diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/machinery/appliance/_appliance.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/_appliance.dm rename to code/modules/food/machinery/appliance/_appliance.dm diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/machinery/appliance/_cooker.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/_cooker.dm rename to code/modules/food/machinery/appliance/_cooker.dm diff --git a/code/modules/food/kitchen/cooking_machines/_cooker_output.dm b/code/modules/food/machinery/appliance/_cooker_output.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/_cooker_output.dm rename to code/modules/food/machinery/appliance/_cooker_output.dm diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/machinery/appliance/_mixer.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/_mixer.dm rename to code/modules/food/machinery/appliance/_mixer.dm diff --git a/code/modules/food/kitchen/cooking_machines/candy.dm b/code/modules/food/machinery/appliance/candy.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/candy.dm rename to code/modules/food/machinery/appliance/candy.dm diff --git a/code/modules/food/kitchen/cooking_machines/cereal.dm b/code/modules/food/machinery/appliance/cereal.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/cereal.dm rename to code/modules/food/machinery/appliance/cereal.dm diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/machinery/appliance/container.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/container.dm rename to code/modules/food/machinery/appliance/container.dm diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/machinery/appliance/fryer.dm similarity index 98% rename from code/modules/food/kitchen/cooking_machines/fryer.dm rename to code/modules/food/machinery/appliance/fryer.dm index 1abe2a7160..7b44b59654 100644 --- a/code/modules/food/kitchen/cooking_machines/fryer.dm +++ b/code/modules/food/machinery/appliance/fryer.dm @@ -181,12 +181,17 @@ for(var/obj/item/organ/external/child in E.children) if(nopain && nopain < 2 && !(child.robotic >= ORGAN_ROBOT)) nopain = 0 - child.take_damage(0, damage) + child.inflict_bodypart_damage( + burn = damage, + ) damage -= (damage*0.5)//IF someone's arm is plunged in, the hand should take most of it E.take_damage(0, damage) else - victim.apply_damage(damage, BURN, user.zone_sel.selecting) + victim.take_targeted_damage( + burn = damage, + body_zone = user.zone_sel.selecting, + ) if(!nopain) diff --git a/code/modules/food/kitchen/cooking_machines/grill.dm b/code/modules/food/machinery/appliance/grill.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/grill.dm rename to code/modules/food/machinery/appliance/grill.dm diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/machinery/appliance/oven.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/oven.dm rename to code/modules/food/machinery/appliance/oven.dm diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/machinery/gibber.dm similarity index 100% rename from code/modules/food/kitchen/gibber.dm rename to code/modules/food/machinery/gibber.dm diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/machinery/microwave.dm similarity index 100% rename from code/modules/food/kitchen/microwave.dm rename to code/modules/food/machinery/microwave.dm diff --git a/code/modules/food/kitchen/smartfridge.dm b/code/modules/food/machinery/smartfridge.dm similarity index 100% rename from code/modules/food/kitchen/smartfridge.dm rename to code/modules/food/machinery/smartfridge.dm diff --git a/code/modules/food/kitchen/smartfridge_vr.dm b/code/modules/food/machinery/smartfridge_vr.dm similarity index 100% rename from code/modules/food/kitchen/smartfridge_vr.dm rename to code/modules/food/machinery/smartfridge_vr.dm diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 75d3a76cbb..d1fd268709 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1,24 +1,6 @@ // see code/datums/recipe.dm - -/* No telebacon. just no... -/datum/recipe/telebacon - items = list( - /obj/item/reagent_containers/food/snacks/meat, - /obj/item/assembly/signaler - ) - result = /obj/item/reagent_containers/food/snacks/telebacon - -I said no! -/datum/recipe/syntitelebacon - items = list( - /obj/item/reagent_containers/food/snacks/meat/syntiflesh, - /obj/item/assembly/signaler - ) - result = /obj/item/reagent_containers/food/snacks/telebacon -*/ - /datum/recipe/friedegg reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( @@ -678,7 +660,7 @@ I said no! /datum/recipe/icecreamsandwich reagents = list("milk" = 5, "ice" = 5) items = list( - /obj/item/reagent_containers/food/snacks/icecream + /obj/item/reagent_containers/food/snacks/ice_cream, ) result = /obj/item/reagent_containers/food/snacks/icecreamsandwich @@ -1367,7 +1349,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/crayonburger_rbw /datum/recipe/rkibble - reagents = list("milk" = 5, "cooking_oil" = 10) + reagents = list("milk" = 5, "tallow" = 10) items = list( /obj/item/robot_parts/head, /obj/item/stack/rods @@ -1540,8 +1522,8 @@ I said no! reagents = list("milk" = 5, "ice" = 5) items = list( /obj/item/reagent_containers/food/snacks/chocolatebar, - /obj/item/reagent_containers/food/snacks/icecream, - /obj/item/reagent_containers/food/snacks/icecream + /obj/item/reagent_containers/food/snacks/ice_cream, + /obj/item/reagent_containers/food/snacks/ice_cream, ) result = /obj/item/reagent_containers/food/snacks/bananasplit diff --git a/code/modules/food/structures/icecream_cart.dm b/code/modules/food/structures/icecream_cart.dm new file mode 100644 index 0000000000..520ded7a06 --- /dev/null +++ b/code/modules/food/structures/icecream_cart.dm @@ -0,0 +1,243 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +/** + * Citadel Station's dynamic icecream module, now with added grief potential. + * + * - Cones can be made out of flour by the machine + * - Cones can be infused with reagents as they are created + * - Cones can be scoops of anything added to them, as long as it's turned into icecream-ified reagents + * - You ice-creamify reagents with ice, milk, and sugar; minimum ice, but it won't taste as good without the others. + * + * Only flour, ice, milk, and sugar are stored internally. + * Other reagents are provided from reagent containers. + * + * This fully supports separated chemicals. Take that as you will. + */ +/obj/structure/icecream_cart + name = "icecream cart" + desc = "Here on the galactic frontiers, even the ice-cream carts are advanced! Now with support for separated chemicals." + icon = 'icons/modules/food/structures/ice_cream.dmi' + icon_state = "cart" + density = TRUE + anchored = FALSE + + // todo: temporary, as this is unbuildable + integrity_flags = INTEGRITY_INDESTRUCTIBLE + + /// stored reagent containers to be used for drawing from + var/list/obj/item/reagent_containers/sources + + /// selected index of reagent container to make ice cream with + var/selected_ice_cream_source + + /// flour cost of cone + var/cone_flour_cost = 2 + /// max cones held + var/cone_storage = 10 + /// milk cost of scoop + var/scoop_milk_cost = 2 + /// ice cost of scoop - this is mandatory + var/scoop_ice_cost = 2 + /// how much reagents it can pack into a single scoop of ice cream + var/scoop_infuse_amount = 2 + /// how much sugar is needed per scoop for it to taste good + var/scoop_sugar_cost = 1 + + /// self-explanatory + var/max_sources = 10 + +/obj/structure/icecream_cart/Initialize(mapload) + create_reagents(1000) + . = ..() + +/obj/structure/icecream_cart/examine(mob/user, dist) + . = ..() + . += SPAN_NOTICE("Use a reagent container with an open lid on this to refill its core ingredients.") + . += SPAN_NOTICE("Click-drag a reagent container with an open lid on this to add it as a mixing source.") + . += SPAN_NOTICE("Click on this with an intact ice-cream cone to dispense a dollop of ice cream into it.") + +/obj/structure/icecream_cart/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "IcecreamCart") + ui.open() + +/obj/structure/icecream_cart/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) + . = ..() + .["scoopSource"] = selected_ice_cream_source + +/obj/structure/icecream_cart/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) + . = ..() + .["coneFlourCost"] = cone_flour_cost + .["scoopMilkCost"] = scoop_milk_cost + .["scoopIceCost"] = scoop_ice_cost + .["scoopInfuseCost"] = scoop_infuse_amount + var/list/collect_sources = list() + var/list/collect_base = list( + "milk" = reagents.get_reagent_amount(/datum/reagent/drink/milk), + "flour" = reagents.get_reagent_amount(/datum/reagent/nutriment/flour), + "sugar" = reagents.get_reagent_amount(/datum/reagent/sugar), + "ice" = reagents.get_reagent_amount(/datum/reagent/drink/ice), + ) + for(var/obj/item/reagent_containers/container as anything in sources) + collect_sources[++collect_sources.len] = list( + "name" = container.name, + "volume" = container.reagents.total_volume, + "maxVolume" = container.reagents.maximum_volume, + "color" = container.reagents.get_color(), + "ref" = ref(container), + ) + .["baseIngredients"] = collect_base + .["sources"] = collect_sources + +/obj/structure/icecream_cart/ui_act(action, list/params, datum/tgui/ui) + . = ..() + if(.) + return + switch(action) + if("selectProduce") + var/index = text2num(params["index"]) + selected_ice_cream_source = (sources && index >= 1 && index <= length(sources))? index : null + return TRUE + if("ejectSource") + var/index = text2num(params["index"]) + var/obj/item/reagent_containers/container = SAFEINDEXACCESS(sources, index) + if(isnull(container)) + return TRUE + usr.grab_item_from_interacted_with(container, src) + sources -= container + usr.visible_action_feedback( + target = src, + hard_range = MESSAGE_RANGE_CONFIGURATION, + visible_hard = SPAN_NOTICE("[usr] removes [container] from [src]."), + ) + update_static_data() + return TRUE + if("produceCone") + if(!reagents.has_reagent(/datum/reagent/nutriment/flour, cone_flour_cost)) + usr.action_feedback(SPAN_WARNING("[src] doesn't have enough flour left for a new cone."), src) + return TRUE + if(!give_cone(produce_cone(), usr)) + return TRUE + usr.action_feedback(SPAN_NOTICE("You create an empty waffle cone."), src) + return TRUE + +/obj/structure/icecream_cart/proc/produce_cone(force) + if(!force) + if(!reagents.has_reagent(/datum/reagent/nutriment/flour, cone_flour_cost)) + return FALSE + reagents.remove_reagent(/datum/reagent/nutriment/flour, cone_flour_cost) + // todo: doesn't require full resend + update_static_data() + var/obj/item/reagent_containers/food/snacks/ice_cream/cone = new(src) + return cone + +/obj/structure/icecream_cart/proc/give_cone(obj/item/reagent_containers/food/snacks/ice_cream/cone, mob/give_to) + if(isnull(cone)) + return FALSE + give_to.put_in_hands_or_drop(cone, drop_loc = drop_location()) + return TRUE + +/obj/structure/icecream_cart/proc/fill_cone(obj/item/reagent_containers/food/snacks/ice_cream/cone, force, mob/user) + if(!reagents.has_reagent(/datum/reagent/drink/ice, scoop_ice_cost)) + user.action_feedback(SPAN_WARNING("There is not enough ice left in [src] to make a dollop."), src) + return FALSE + if(!reagents.has_reagent(/datum/reagent/drink/milk, scoop_milk_cost)) + user.action_feedback(SPAN_WARNING("There is not enough milk left in [src] to make a dollop."), src) + return FALSE + var/has_sugar = !reagents.has_reagent(/datum/reagent/sugar, scoop_sugar_cost) + reagents.remove_reagent(/datum/reagent/drink/ice, scoop_ice_cost) + reagents.remove_reagent(/datum/reagent/drink/milk, scoop_milk_cost) + if(has_sugar) + reagents.remove_reagent(/datum/reagent/sugar, scoop_sugar_cost) + var/obj/item/reagent_containers/infuse_source = SAFEINDEXACCESS(sources, selected_ice_cream_source) + cone.add_scoop(infuse_source?.reagents || /datum/reagent/drink/milk, scoop_infuse_amount, has_sugar, TRUE) + return TRUE + +/obj/structure/icecream_cart/attackby(obj/item/I, mob/user, list/params, clickchain_flags, damage_multiplier) + if(user.a_intent == INTENT_HARM) + return ..() + // handle cones + if(istype(I, /obj/item/reagent_containers/food/snacks/ice_cream)) + var/obj/item/reagent_containers/food/snacks/ice_cream/ice_cream = I + if(!ice_cream.can_keep_scooping) + user.action_feedback(SPAN_WARNING("[ice_cream] was already bitten out of!"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(ice_cream.scoop_current >= ice_cream.scoop_max) + user.action_feedback(SPAN_WARNING("[ice_cream] is more than topped off already!"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(!fill_cone(ice_cream, user = user)) + return CLICKCHAIN_DO_NOT_PROPAGATE + user.visible_action_feedback( + target = src, + hard_range = MESSAGE_RANGE_CONSTRUCTION, + visible_hard = SPAN_NOTICE("[user] fills \the [ice_cream] with [ice_cream.scoop_current > 1? "another" : "a"] delicious dollop of ice cream from \the [src].") + ) + update_static_data() + return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING + // handle filling + if(!istype(I, /obj/item/reagent_containers)) + // not a container + return ..() + var/obj/item/reagent_containers/container = I + if(!container.reagents) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(!container.is_open_container()) + user.action_feedback(SPAN_WARNING("[container] is not an open container. Did you try removing the lid, if it has one?"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + var/units_transferred = container.reagents.transfer_to_holder( + target = reagents, + reagents = list( + /datum/reagent/nutriment/flour, + /datum/reagent/drink/ice, + /datum/reagent/drink/milk, + ), + ) + if(!units_transferred) + user.action_feedback(SPAN_WARNING("[container] has no valid reagents to transfer to [src]. Did you mean to insert the container as a reagent source instead? (Click-drag)"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + user.visible_action_feedback( + target = src, + hard_range = MESSAGE_RANGE_CONFIGURATION, + visible_hard = SPAN_NOTICE("[user] refills [src] with [container]."), + visible_self = SPAN_NOTICE("You refill [src] with [units_transferred] units of reagents from [container]."), + ) + // todo: this doesn't need a full data push + update_static_data() + return CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE + +/obj/structure/icecream_cart/MouseDroppedOn(atom/dropping, mob/user, proximity, params) + . = ..() + if(. & CLICKCHAIN_DO_NOT_PROPAGATE) + return + if(!istype(dropping, /obj/item/reagent_containers)) + return + var/obj/item/reagent_containers/container = dropping + if(!container.reagents) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(!container.is_open_container()) + user.action_feedback(SPAN_WARNING("[container] is not an open container. Did you try removing the lid, if it has one?"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(length(sources) > max_sources) + user.action_feedback(SPAN_WARNING("[src] already has too many containers in it. Remove one first."), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + user.visible_action_feedback( + src, + hard_range = MESSAGE_RANGE_CONFIGURATION, + visible_hard = SPAN_NOTICE("[user] inserts [dropping] into one of [src]'s reagent slots."), + ) + container.forceMove(src) + LAZYADD(sources, container) + update_static_data() + return CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE + +/obj/structure/icecream_cart/loaded + var/prefill_amount = 60 + +/obj/structure/icecream_cart/loaded/Initialize() + . = ..() + reagents.add_reagent(/datum/reagent/drink/ice, prefill_amount) + reagents.add_reagent(/datum/reagent/drink/milk, prefill_amount) + reagents.add_reagent(/datum/reagent/sugar, prefill_amount) + reagents.add_reagent(/datum/reagent/nutriment/flour, prefill_amount) diff --git a/code/modules/gamemaster/actions/atmos_leak.dm b/code/modules/gamemaster/actions/atmos_leak.dm index 59dd4422cd..bda6f5c486 100644 --- a/code/modules/gamemaster/actions/atmos_leak.dm +++ b/code/modules/gamemaster/actions/atmos_leak.dm @@ -69,7 +69,7 @@ // Fow now just add a bunch of it to the air var/datum/gas_mixture/air_contents = new air_contents.temperature = T20C + ((severity - 1) * rand(-50, 50)) - air_contents.gas[gas_type] = 10 * MOLES_CELLSTANDARD + air_contents.gas[gas_type] = 10 * CELL_MOLES target_turf.assume_air(air_contents) playsound(target_turf, 'sound/effects/smoke.ogg', 50, 1) diff --git a/code/modules/gamemaster/actions/canister_leak.dm b/code/modules/gamemaster/actions/canister_leak.dm index b15465ce62..11aac50d32 100644 --- a/code/modules/gamemaster/actions/canister_leak.dm +++ b/code/modules/gamemaster/actions/canister_leak.dm @@ -15,7 +15,7 @@ // List of all non-destroyed canisters on station levels var/list/all_canisters = list() for(var/obj/machinery/portable_atmospherics/canister/C in GLOB.machines) - if(!C.destroyed && (C.z in (LEGACY_MAP_DATUM).station_levels) && C.air_contents.total_moles >= MOLES_CELLSTANDARD) + if(!C.destroyed && (C.z in (LEGACY_MAP_DATUM).station_levels) && C.air_contents.total_moles >= CELL_MOLES) all_canisters += C var/obj/machinery/portable_atmospherics/canister/C = pick(all_canisters) log_debug(SPAN_DEBUGWARNING("canister_leak event: Canister [ADMIN_JMP(C)]) destroyed.")) diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index 582bfd5ff5..0564c630fc 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -51,7 +51,9 @@ if(!H.reagents.has_reagent("dexalin")) for(var/organ_name in BP_ALL) var/obj/item/organ/external/E = H.get_organ(organ_name) - E.take_damage(0, 5, 0) + E.inflict_bodypart_damage( + burn = 5, + ) /datum/genetics/side_effect/bone_snap name = "Bone Snap" @@ -67,7 +69,9 @@ if(!H.reagents.has_reagent("bicaridine")) var/organ_name = pick(BP_ALL) var/obj/item/organ/external/E = H.get_organ(organ_name) - E.take_damage(20, 0, 0) + E.inflict_bodypart_damage( + brute = 20, + ) E.fracture() /*/datum/genetics/side_effect/monkey diff --git a/code/modules/ghostroles/instantiator.dm b/code/modules/ghostroles/instantiator.dm index 1818870848..2b532457dd 100644 --- a/code/modules/ghostroles/instantiator.dm +++ b/code/modules/ghostroles/instantiator.dm @@ -178,7 +178,6 @@ //var/species_restricted = null /datum/ghostrole_instantiator/human/player_static/Create(client/C, atom/location, list/params) - var/mob/living/carbon/human/H = ..() var/list/errors = list() // todo: respect warnings; we ignore them right now so we don't block joins. if(!C.prefs.spawn_checks(PREF_COPY_TO_FOR_GHOSTROLE | PREF_COPY_TO_NO_CHECK_SPECIES, errors)) @@ -189,6 +188,7 @@ to_chat(C, SPAN_WARNING("

--- Character Species Is Not Allowed In This Role - Please resolve these to continue ---


-    [jointext(errors, "
-    ")]")) return + var/mob/living/carbon/human/H = ..() LoadSavefile(C, H) return H diff --git a/code/modules/ghostroles/menu.dm b/code/modules/ghostroles/menu.dm index 14e914526a..5d86f3cb84 100644 --- a/code/modules/ghostroles/menu.dm +++ b/code/modules/ghostroles/menu.dm @@ -2,7 +2,7 @@ GLOBAL_DATUM_INIT(ghostrole_menu, /datum/ghostrole_menu, new) /datum/ghostrole_menu -/datum/ghostrole_menu/ui_state(mob/user, datum/tgui_module/module) +/datum/ghostrole_menu/ui_state() return GLOB.observer_state /datum/ghostrole_menu/ui_interact(mob/user, datum/tgui/ui) @@ -11,7 +11,7 @@ GLOBAL_DATUM_INIT(ghostrole_menu, /datum/ghostrole_menu, new) ui = new(user, src, "SpawnersMenu") ui.open() -/datum/ghostrole_menu/ui_static_data(mob/user) +/datum/ghostrole_menu/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/list/spawners = list() .["spawners"] = spawners @@ -31,7 +31,7 @@ GLOBAL_DATUM_INIT(ghostrole_menu, /datum/ghostrole_menu, new) data["amount_left"] = slots == INFINITY? -1 : slots spawners += list(data) // wrap -/datum/ghostrole_menu/ui_act(action, params) +/datum/ghostrole_menu/ui_act(action, list/params, datum/tgui/ui) if(..()) return if(!isobserver(usr)) diff --git a/code/modules/guidebook/guidebook.dm b/code/modules/guidebook/guidebook.dm index 357b3d303f..6aa92d6e6f 100644 --- a/code/modules/guidebook/guidebook.dm +++ b/code/modules/guidebook/guidebook.dm @@ -12,14 +12,14 @@ GLOBAL_DATUM_INIT(guidebook, /datum/guidebook, new) /// open instances mapped to list of ids var/list/opened = list() -/datum/guidebook/ui_state(mob/user, datum/tgui_module/module) +/datum/guidebook/ui_state() return GLOB.always_state -/datum/guidebook/ui_close(mob/user, datum/tgui_module/module) +/datum/guidebook/on_ui_close(mob/user, datum/tgui/ui, embedded) opened -= user return ..() -/datum/guidebook/on_ui_transfer(mob/old_mob, mob/new_mob, datum/tgui/ui) +/datum/guidebook/on_ui_transfer(mob/old_mob, mob/new_mob, datum/tgui/ui, embedded) opened[new_mob] = opened[old_mob] opened -= old_mob return ..() diff --git a/code/modules/hardsuits/_rig.dm b/code/modules/hardsuits/_rig.dm index d73aa4e3c3..eabe8aee39 100644 --- a/code/modules/hardsuits/_rig.dm +++ b/code/modules/hardsuits/_rig.dm @@ -289,7 +289,11 @@ toggle_piece("chest", M, ONLY_DEPLOY) toggle_piece("boots", M, ONLY_DEPLOY) if(suit_is_deployed()) - M.adjustBruteLossByPart(70, BP_TORSO) + M.take_targeted_damage( + brute = 70, + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE | DAMAGE_MODE_SHRED, + body_zone = BP_TORSO, + ) for(var/harm = 8; harm > 0; harm--) M.adjustBruteLoss(10) playsound(src.loc, 'sound/weapons/gunshot_generic_rifle.ogg', 40, 1) diff --git a/code/modules/hardsuits/rig_pieces.dm b/code/modules/hardsuits/rig_pieces.dm index 580ccc9138..31cea56b03 100644 --- a/code/modules/hardsuits/rig_pieces.dm +++ b/code/modules/hardsuits/rig_pieces.dm @@ -8,8 +8,8 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | ALLOW_SURVIVALFOOD | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB | ALLOWINTERNALS inv_hide_flags = HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_cover_flags = HEAD|FACE|EYES - heat_protection = HEAD|FACE|EYES - cold_protection = HEAD|FACE|EYES + heat_protection_cover = HEAD|FACE|EYES + cold_protection_cover = HEAD|FACE|EYES brightness_on = 4 max_pressure_protection = null @@ -51,8 +51,8 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB atom_flags = PHORONGUARD body_cover_flags = HANDS - heat_protection = HANDS - cold_protection = HANDS + heat_protection_cover = HANDS + cold_protection_cover = HANDS weight = 0 encumbrance = 0 @@ -89,8 +89,8 @@ atom_flags = PHORONGUARD clothing_flags = CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB body_cover_flags = FEET - cold_protection = FEET - heat_protection = FEET + cold_protection_cover = FEET + heat_protection_cover = FEET icon_base = null damage_force = 5 // if you're kicking someone with something meant to keep you locked on a hunk of metal... @@ -132,10 +132,10 @@ //Flags body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS atom_flags = PHORONGUARD inv_hide_flags = HIDEJUMPSUIT|HIDETAIL - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS weight = 0 encumbrance = 0 @@ -232,8 +232,8 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | ALLOWINTERNALS | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB atom_flags = PHORONGUARD body_cover_flags = HEAD|FACE|EYES - heat_protection = HEAD|FACE|EYES - cold_protection = HEAD|FACE|EYES + heat_protection_cover = HEAD|FACE|EYES + cold_protection_cover = HEAD|FACE|EYES /obj/item/clothing/suit/lightrig name = "suit" @@ -242,8 +242,8 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB atom_flags = PHORONGUARD body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /obj/item/clothing/shoes/lightrig name = "boots" @@ -251,8 +251,8 @@ clothing_flags = CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB species_restricted = null body_cover_flags = FEET - cold_protection = FEET - heat_protection = FEET + cold_protection_cover = FEET + heat_protection_cover = FEET /obj/item/clothing/gloves/gauntlets/lightrig name = "gloves" @@ -260,5 +260,5 @@ atom_flags = PHORONGUARD species_restricted = null body_cover_flags = HANDS - heat_protection = HANDS - cold_protection = HANDS + heat_protection_cover = HANDS + cold_protection_cover = HANDS diff --git a/code/modules/hardsuits/rig_verbs.dm b/code/modules/hardsuits/rig_verbs.dm index 64a4d36790..d2cdb01843 100644 --- a/code/modules/hardsuits/rig_verbs.dm +++ b/code/modules/hardsuits/rig_verbs.dm @@ -137,7 +137,7 @@ to_chat(usr, "The hardsuit is not being worn.") return - if(!check_suit_access(usr)) + if(!is_activated() && !check_suit_access(usr)) return toggle_seals(wearer) diff --git a/code/modules/holidays/halloween_loadout_masquarade.dm b/code/modules/holidays/halloween_loadout_masquarade.dm index 1bd50f8cf3..535d7c1449 100644 --- a/code/modules/holidays/halloween_loadout_masquarade.dm +++ b/code/modules/holidays/halloween_loadout_masquarade.dm @@ -53,7 +53,7 @@ inhand_state = "black" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_armor display_name = "Sneaksuit Armor" @@ -67,7 +67,7 @@ inhand_state = "armor" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = UPPER_TORSO|LOWER_TORSO - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_gloves display_name = "Sneaksuit Gloves" @@ -81,7 +81,7 @@ inhand_state = "black" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = HANDS - cold_protection = HANDS + cold_protection_cover = HANDS /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_helmet display_name = "Sneaksuit Helmet" @@ -96,7 +96,7 @@ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_shoes display_name = "Sneaksuit Boots" @@ -110,7 +110,7 @@ inhand_state = "cult" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = FEET - cold_protection = FEET + cold_protection_cover = FEET /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_mask display_name = "Sneaksuit Mask" @@ -125,7 +125,7 @@ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/syndicate/contractor_helmet display_name = "Contractor Helmet" @@ -140,7 +140,7 @@ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/syndicate/contractor_suit display_name = "Contractor Suit" @@ -154,7 +154,7 @@ inhand_state = "armor" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET /datum/loadout_entry/seasonal/masquarade/syndicate/esword display_name = "Energy Sword (toy)" @@ -188,7 +188,7 @@ default_worn_icon = 'icons/antagonists/changeling/on_mob/clothing.dmi' body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/changeling/chitin_suit display_name = "Chitin Suit" @@ -200,7 +200,7 @@ icon = 'icons/antagonists/changeling/items/clothing.dmi' default_worn_icon = 'icons/antagonists/changeling/on_mob/clothing.dmi' body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET /datum/loadout_entry/seasonal/masquarade/changeling/flesh_hood display_name = "Flesh Hood" @@ -213,7 +213,7 @@ default_worn_icon = 'icons/antagonists/changeling/on_mob/clothing.dmi' body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/changeling/flesh_suit display_name = "Flesh Suit" @@ -225,7 +225,7 @@ icon = 'icons/antagonists/changeling/items/clothing.dmi' default_worn_icon = 'icons/antagonists/changeling/on_mob/clothing.dmi' body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET /datum/loadout_entry/seasonal/masquarade/changeling/arm_blade display_name = "Arm Blade" @@ -294,7 +294,7 @@ icon_state = "clockwork_helmet" body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/clockcult/suit display_name = "Armor" @@ -306,7 +306,7 @@ default_worn_icon = 'icons/antagonists/clockcult/on_mob/clothing.dmi' icon_state = "clockwork_cuirass" body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /datum/loadout_entry/seasonal/masquarade/clockcult/boots display_name = "Boots" @@ -318,7 +318,7 @@ default_worn_icon = 'icons/antagonists/clockcult/on_mob/clothing.dmi' icon_state = "clockwork_treads" body_cover_flags = FEET - cold_protection = FEET + cold_protection_cover = FEET /datum/loadout_entry/seasonal/masquarade/clockcult/gloves display_name = "Gloves" @@ -330,7 +330,7 @@ default_worn_icon = 'icons/antagonists/clockcult/on_mob/clothing.dmi' icon_state = "clockwork_gauntlets" body_cover_flags = HANDS - cold_protection = HANDS + cold_protection_cover = HANDS /datum/loadout_entry/seasonal/masquarade/clockcult/slab display_name = "Slab" @@ -447,7 +447,7 @@ icon_state = "cult" hoodtype = /obj/item/clothing/head/hood/fake_cult_hardsuit body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_cult_hardsuit @@ -456,7 +456,7 @@ icon_state = "culthelm" body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /datum/loadout_entry/seasonal/masquarade/cult/robes_new @@ -469,7 +469,7 @@ icon_state = "cultrobesalt" hoodtype = /obj/item/clothing/head/hood/fake_cult_robes_new body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_cult_robes_new @@ -477,7 +477,7 @@ icon = 'icons/clothing/suit/antag/cult.dmi' icon_state = "culthoodalt" body_cover_flags = HEAD - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /datum/loadout_entry/seasonal/masquarade/cult/robes_old @@ -490,7 +490,7 @@ icon_state = "cultrobes" hoodtype = /obj/item/clothing/head/hood/fake_cult_robes_old body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_cult_robes_old @@ -498,7 +498,7 @@ icon = 'icons/clothing/suit/antag/cult.dmi' icon_state = "culthood" body_cover_flags = HEAD - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /datum/loadout_entry/seasonal/masquarade/cult/sword @@ -522,7 +522,7 @@ icon_state = "eldritcharmor" hoodtype = /obj/item/clothing/head/hood/fake_heretic body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_heretic @@ -530,7 +530,7 @@ icon = 'icons/clothing/suit/antag/heretic.dmi' icon_state = "eldritchhood" body_cover_flags = HEAD - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /datum/loadout_entry/seasonal/masquarade/heretic/void_cloak @@ -543,7 +543,7 @@ icon_state = "voidcloak" hoodtype = /obj/item/clothing/head/hood/fake_void body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_void @@ -552,7 +552,7 @@ icon_state = "voidhood" body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /* diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 4d8fd05a68..9580722477 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -143,7 +143,7 @@ ui = new(user, src, "BotanyIsolator", name) ui.open() -/obj/machinery/botany/extractor/ui_data(mob/user) +/obj/machinery/botany/extractor/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/geneMasks = SSplants.gene_masked_list @@ -271,7 +271,7 @@ ui = new(user, src, "BotanyEditor", name) ui.open() -/obj/machinery/botany/editor/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/botany/editor/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["activity"] = active diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index ec86d7b215..2d8ddb5c68 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -244,7 +244,7 @@ ui = new(user, src, "SeedStorage", name) ui.open() -/obj/machinery/seed_storage/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/seed_storage/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(smart) diff --git a/code/modules/instruments/instruments/item.dm b/code/modules/instruments/instruments/item.dm index 192b4fdf77..4b5cf182a1 100644 --- a/code/modules/instruments/instruments/item.dm +++ b/code/modules/instruments/instruments/item.dm @@ -264,7 +264,7 @@ SLOT_ID_LEFT_HAND = 'icons/mob/inhands/equipment/horns_lefthand.dmi', SLOT_ID_RIGHT_HAND = 'icons/mob/inhands/equipment/horns_righthand.dmi' ) - attack_verb = list("beautifully honks") + attack_verb = list("beautifully honked") allowed_instrument_ids = list("honk", "bikehorn") w_class = WEIGHT_CLASS_TINY damage_force = 0 diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 8f01bafa90..2a9dc47f33 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -153,7 +153,7 @@ return battery // TGUI -/obj/item/electronic_assembly/ui_state(mob/user, datum/tgui_module/module) +/obj/item/electronic_assembly/ui_state() return GLOB.physical_state /obj/item/electronic_assembly/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) @@ -162,7 +162,7 @@ ui = new(user, src, "ICAssembly", name, parent_ui) ui.open() -/obj/item/electronic_assembly/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/electronic_assembly/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/total_parts = 0 diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index 85046f6c44..c3a9c4b43c 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -35,7 +35,7 @@ detail_overlay.color = detail_color add_overlay(detail_overlay) -/obj/item/integrated_electronics/detailer/ui_state(mob/user, datum/tgui_module/module) +/obj/item/integrated_electronics/detailer/ui_state() return GLOB.inventory_state /obj/item/integrated_electronics/detailer/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) @@ -44,7 +44,7 @@ ui = new(user, src, "ICDetailer", name) ui.open() -/obj/item/integrated_electronics/detailer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/integrated_electronics/detailer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["detail_color"] = detail_color data["color_list"] = color_list diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 9e5dd206b6..8786d1a701 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -125,10 +125,10 @@ a creative player the means to solve many problems. Circuits are held inside an to_chat(M, SPAN_NOTICE("The circuit '[src.name]' is now labeled '[input]'.")) displayed_name = input -/obj/item/integrated_circuit/ui_state(mob/user, datum/tgui_module/module) +/obj/item/integrated_circuit/ui_state() return GLOB.physical_state -/obj/item/integrated_circuit/ui_host(mob/user, datum/tgui_module/module) +/obj/item/integrated_circuit/ui_host() if(istype(loc, /obj/item/electronic_assembly)) return loc.ui_host() return ..() @@ -139,7 +139,7 @@ a creative player the means to solve many problems. Circuits are held inside an ui = new(user, src, "ICCircuit", name, parent_ui) ui.open() -/obj/item/integrated_circuit/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/integrated_circuit/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["name"] = name diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index 1b33e1f4d0..44a7e43c01 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -176,7 +176,7 @@ return ui_interact(user) -/obj/item/integrated_circuit_printer/ui_state(mob/user, datum/tgui_module/module) +/obj/item/integrated_circuit_printer/ui_state() return GLOB.physical_state /obj/item/integrated_circuit_printer/ui_interact(mob/user, datum/tgui/ui) @@ -189,7 +189,7 @@ ui = new(user, src, "ICPrinter", name) // 500, 600 ui.open() -/obj/item/integrated_circuit_printer/ui_static_data(mob/user) +/obj/item/integrated_circuit_printer/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/categories = list() @@ -233,7 +233,7 @@ return data -/obj/item/integrated_circuit_printer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/integrated_circuit_printer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["metal"] = cur_metal diff --git a/code/modules/jobs/job_types/station/civillian/clown.dm b/code/modules/jobs/job_types/station/civillian/clown.dm index 6bac381f11..3593791a97 100644 --- a/code/modules/jobs/job_types/station/civillian/clown.dm +++ b/code/modules/jobs/job_types/station/civillian/clown.dm @@ -4,7 +4,7 @@ flag = CLOWN departments = list(DEPARTMENT_CIVILIAN) department_flag = ENGSEC - total_positions = 1 + total_positions = 2 spawn_positions = 1 supervisors = "the spirit of laughter" selection_color = "#515151" diff --git a/code/modules/jobs/job_types/station/civillian/librarian.dm b/code/modules/jobs/job_types/station/civillian/librarian.dm index f9ece96690..4ae68d778c 100644 --- a/code/modules/jobs/job_types/station/civillian/librarian.dm +++ b/code/modules/jobs/job_types/station/civillian/librarian.dm @@ -47,11 +47,11 @@ /datum/prototype/struct/alt_title/librarian/historian title = "Historian" - title_blurb = "The Historian uses the Library as a base of operation to record any important events occuring on station." + title_blurb = "The Historian uses the Library as a base of operation to record any important events occurring on station." /datum/prototype/struct/alt_title/librarian/archivist title = "Archivist" - title_blurb = "The Archivist uses the Library as a base of operation to record any important events occuring on station." + title_blurb = "The Archivist uses the Library as a base of operation to record any important events occurring on station." /datum/prototype/struct/alt_title/librarian/professor title = "Professor" diff --git a/code/modules/jobs/job_types/station/civillian/mime.dm b/code/modules/jobs/job_types/station/civillian/mime.dm index f49c9bb4d3..256ac72659 100644 --- a/code/modules/jobs/job_types/station/civillian/mime.dm +++ b/code/modules/jobs/job_types/station/civillian/mime.dm @@ -4,7 +4,7 @@ flag = MIME departments = list(DEPARTMENT_CIVILIAN) department_flag = ENGSEC - total_positions = 1 + total_positions = 2 spawn_positions = 1 supervisors = "the spirit of performance" selection_color = "#515151" diff --git a/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm b/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm index d749659f5b..b6a6dae51a 100644 --- a/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm +++ b/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm @@ -41,7 +41,7 @@ // Atmos Tech Alt Titles /datum/prototype/struct/alt_title/life_support title = "Life Support Technician" - title_blurb = "A Life Support Technician is an Atmospheric Technician who specializes in establishing and maintaining breatheable air in a needed area, whether that's the primary facility or a forward base." + title_blurb = "A Life Support Technician is an Atmospheric Technician who specializes in establishing and maintaining breathable air in a needed area, whether that's the primary facility or a forward base." /datum/prototype/struct/alt_title/pipe_spec title = "Pipe Network Specialist" diff --git a/code/modules/jobs/job_types/station/engineering/senior_engineer.dm b/code/modules/jobs/job_types/station/engineering/senior_engineer.dm index f127253365..f87eb29a03 100644 --- a/code/modules/jobs/job_types/station/engineering/senior_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/senior_engineer.dm @@ -30,7 +30,7 @@ outfit_type = /datum/outfit/job/station/station_engineer/senior desc = "A Senior Engineer fulfills similar duties to other engineers, but usually occupies spare time with with training of other, newer Engineers \ - and giving advice in tricky engineering situtations. You are not in command of the Engineering departement, but should assist the CE in accordance with Standard Operating Procedures." + and giving advice in tricky engineering situations. You are not in command of the Engineering department, but should assist the CE in accordance with Standard Operating Procedures." alt_titles = list( "Engineering Training Specialist" = /datum/prototype/struct/alt_title/engi_trainer, diff --git a/code/modules/jobs/job_types/station/engineering/station_engineer.dm b/code/modules/jobs/job_types/station/engineering/station_engineer.dm index 0d4cf9dbda..d3aa329c58 100644 --- a/code/modules/jobs/job_types/station/engineering/station_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/station_engineer.dm @@ -52,7 +52,7 @@ /datum/prototype/struct/alt_title/electrician title = "Electrician" - title_blurb = "An Electrician's primary duty is making sure power is properly distributed thoughout the facility, utilizing solars, substations, and other \ + title_blurb = "An Electrician's primary duty is making sure power is properly distributed throughout the facility, utilizing solars, substations, and other \ methods to ensure every department has power in an emergency." /datum/prototype/struct/alt_title/apprentice_engineer diff --git a/code/modules/jobs/job_types/station/medical/head_nurse.dm b/code/modules/jobs/job_types/station/medical/head_nurse.dm index 546cba82fc..4b7185986e 100644 --- a/code/modules/jobs/job_types/station/medical/head_nurse.dm +++ b/code/modules/jobs/job_types/station/medical/head_nurse.dm @@ -25,7 +25,7 @@ ) outfit_type = /datum/outfit/job/station/medical_doctor/senior_physician desc = "A Senior Physician is an experienced medical professional who fulfills a similar role to other doctors but usually occupies spare time with with training of other, newer doctors \ - and giving advice in tricky medical situtations. You are not in command of the Medical departement, but should assist the CMO in accordance with Standard Operating Procedures." + and giving advice in tricky medical situations. You are not in command of the Medical department, but should assist the CMO in accordance with Standard Operating Procedures." minimal_player_age = 14 minimum_character_age = 25 diff --git a/code/modules/jobs/job_types/station/medical/medical_doctor.dm b/code/modules/jobs/job_types/station/medical/medical_doctor.dm index 2ea4ceb48a..b05c9d133a 100644 --- a/code/modules/jobs/job_types/station/medical/medical_doctor.dm +++ b/code/modules/jobs/job_types/station/medical/medical_doctor.dm @@ -48,7 +48,7 @@ /datum/prototype/struct/alt_title/surgeon title = "Surgeon" - title_blurb = "A Surgeon specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachement. They are expected \ + title_blurb = "A Surgeon specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachment. They are expected \ to know the ins and outs of anesthesia and surgery." title_outfit = /datum/outfit/job/station/medical_doctor/surgeon @@ -74,8 +74,8 @@ /datum/prototype/struct/alt_title/doctor/resident title = "Medical Resident" - title_blurb = "A Medical Resident is someone who has a medical dregree but is still in their resdiency, training under the supervision of more experienced doctors." - + title_blurb = "A Medical Resident is someone who has a medical degree but is still in their residency, training under the supervision of more experienced doctors." + /datum/prototype/struct/alt_title/doctor/intern title = "Medical Intern" title_blurb = "A Medical Intern is someone just learning the ropes of the medical field, learning from and answering to other medbay staff." diff --git a/code/modules/jobs/job_types/station/science/research_director.dm b/code/modules/jobs/job_types/station/science/research_director.dm index 38d4d6d443..c6209e3152 100644 --- a/code/modules/jobs/job_types/station/science/research_director.dm +++ b/code/modules/jobs/job_types/station/science/research_director.dm @@ -53,7 +53,7 @@ outfit_type = /datum/outfit/job/station/research_director desc = "The Research Director manages and maintains the Research department. They are required to ensure the safety of the entire crew, \ - at least with regards to anything occuring in the Research department, and to inform the crew of any disruptions that \ + at least with regards to anything occurring in the Research department, and to inform the crew of any disruptions that \ might originate from Research. The Research Director often has at least passing knowledge of most of the Research department, but \ are encouraged to allow their staff to perform their own duties." alt_titles = list( diff --git a/code/modules/jobs/job_types/station/science/scientist.dm b/code/modules/jobs/job_types/station/science/scientist.dm index daef006d32..1083f5e178 100644 --- a/code/modules/jobs/job_types/station/science/scientist.dm +++ b/code/modules/jobs/job_types/station/science/scientist.dm @@ -56,16 +56,16 @@ /datum/prototype/struct/alt_title/scientist/xenoarch title = "Xenoarchaeologist" title_blurb = "A Xenoarchaeologist enters digsites in search of artifacts of alien origin. These digsites are frequently in vacuum or other inhospitable \ - locations, and as such a Xenoarchaeologist should be prepared to handle hostile evironmental conditions." + locations, and as such a Xenoarchaeologist should be prepared to handle hostile environmental conditions." /datum/prototype/struct/alt_title/scientist/anomalist title = "Anomalist" - title_blurb = "An Anomalist is a Scientist whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \ + title_blurb = "An Anomalist is a Scientist whose expertise is analyzing alien artifacts. They are familiar with the most common methods of testing artifact \ function. They work closely with Xenoarchaeologists, or Miners, if either role is present." /datum/prototype/struct/alt_title/scientist/circuit title = "Circuit Designer" - title_blurb = "A Circuit Designer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ + title_blurb = "A Circuit Designer is a Scientist whose expertise is working with integrated circuits. They are familiar with the workings and programming of those devices. \ They work to create various useful devices using the capabilities of integrated circuitry." /datum/prototype/struct/alt_title/scientist/fieldtech diff --git a/code/modules/jobs/job_types/station/science/senior_researcher.dm b/code/modules/jobs/job_types/station/science/senior_researcher.dm index 17652bf1a8..7d174559c1 100644 --- a/code/modules/jobs/job_types/station/science/senior_researcher.dm +++ b/code/modules/jobs/job_types/station/science/senior_researcher.dm @@ -29,7 +29,7 @@ outfit_type = /datum/outfit/job/station/scientist/senior_researcher desc = "A Senior Researcher fulfills similar duties to other scientists, but usually occupies spare time with with training of other, newer scientists \ - and giving advice to ensure safety. You are not in command of the Science departement, but should assist the RD in accordance with Standard Operating Procedures." + and giving advice to ensure safety. You are not in command of the Science department, but should assist the RD in accordance with Standard Operating Procedures." alt_titles = list( "Research Training Specialist" = /datum/prototype/struct/alt_title/sci_trainer diff --git a/code/modules/loadout/loadout_head.dm b/code/modules/loadout/loadout_head.dm index 32dff60cd0..2f89a4d06c 100644 --- a/code/modules/loadout/loadout_head.dm +++ b/code/modules/loadout/loadout_head.dm @@ -341,6 +341,11 @@ name = "Audacious Wide Brimmed Hat" path = /obj/item/clothing/head/bard +/datum/loadout_entry/head/aureate_hood + name = "Aureate Hood" + path = /obj/item/clothing/head/hood/aureate + + //Tajaran head wears /datum/loadout_entry/head/furhat diff --git a/code/modules/loadout/loadout_role_restricted.dm b/code/modules/loadout/loadout_role_restricted.dm index 8fa1f87e51..38fb3f28f2 100644 --- a/code/modules/loadout/loadout_role_restricted.dm +++ b/code/modules/loadout/loadout_role_restricted.dm @@ -37,7 +37,7 @@ //Medical /datum/loadout_entry/restricted/medical subcategory = "Medical" - allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Psychiatrist", "Field Medic", "Head Nurse") + allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Psychiatrist", "Field Medic", "Senior Physician") /datum/loadout_entry/restricted/medical/eyes slot = SLOT_ID_GLASSES @@ -207,7 +207,7 @@ //Medical + Science /datum/loadout_entry/restricted/med_sci subcategory = "Med-Sci" - allowed_roles = list("Research Director", "Scientist", "Xenobiologist", "Roboticist", "Explorer", "Senior Researcher", "Pathfinder", "Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Psychiatrist", "Field Medic", "Head Nurse") + allowed_roles = list("Research Director", "Scientist", "Xenobiologist", "Roboticist", "Explorer", "Senior Researcher", "Pathfinder", "Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Psychiatrist", "Field Medic", "Senior Physician") /datum/loadout_entry/restricted/med_sci/head slot = SLOT_ID_HEAD diff --git a/code/modules/loadout/loadout_suit.dm b/code/modules/loadout/loadout_suit.dm index 87e1a75a17..2803d9e9d0 100644 --- a/code/modules/loadout/loadout_suit.dm +++ b/code/modules/loadout/loadout_suit.dm @@ -608,6 +608,11 @@ name = "Cropped Sweater (Female)" path = /obj/item/clothing/suit/cropped_sweater/female +/datum/loadout_entry/suit/aureate_kimono + name = "Aureate Kimono" + path = /obj/item/clothing/suit/storage/aureate + + //Tajaran wears //Cloak no hoods diff --git a/code/modules/loot/packs/gear.dm b/code/modules/loot/packs/gear.dm index 1b46a2b9dd..d4735a9e7b 100644 --- a/code/modules/loot/packs/gear.dm +++ b/code/modules/loot/packs/gear.dm @@ -15,6 +15,7 @@ /obj/item/tape_recorder, /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/head/helmet/space/void/mining, + /obj/random/ore_bag, ) /datum/prototype/struct/loot_pack/gear/space_miner/advanced @@ -22,4 +23,5 @@ /obj/item/pickaxe/diamonddrill, /obj/item/tape_recorder, /obj/item/hardsuit/industrial/equipped, + /obj/item/storage/bag/ore/bluespace, ) diff --git a/code/modules/mapping/map_helpers/paint.dm b/code/modules/mapping/map_helpers/paint.dm index a710d78b08..dde56e83d7 100644 --- a/code/modules/mapping/map_helpers/paint.dm +++ b/code/modules/mapping/map_helpers/paint.dm @@ -2,6 +2,7 @@ #define CREATE_PAINT_STRIPE(x, c) /obj/effect/paint_stripe/x/color=c // todo: why tf isn't this a map helper +// TODO: make this a map helper for my sanity. @Zandario /obj/effect/paint name = "coat of paint" @@ -15,16 +16,33 @@ return INITIALIZE_HINT_LATELOAD /obj/effect/paint/LateInitialize() - var/turf/simulated/wall/W = get_turf(src) - if(istype(W)) - W.paint_color = color - W.stripe_color = color - W.update_overlays() - var/obj/structure/wall_frame/WF = locate() in loc - if(WF) - WF.paint_color = color - WF.stripe_color = color - WF.update_icon() + for(var/obj/effect/paint/paint in loc) + if(paint == src) + continue + WARNING("Duplicate paint found at [x], [y], [z]") + qdel(src) + return + + var/did_anything = FALSE + + if(istype(loc, /turf/simulated/wall)) + var/turf/simulated/wall/target_wall = loc + if(!isnull(color)) + target_wall.paint_wall(color) + did_anything = TRUE + + else + var/obj/structure/wall_frame/low_wall = locate() in loc + if(low_wall) + if(!isnull(color)) + low_wall.paint_color = color + low_wall.stripe_color = color + low_wall.update_appearance() + did_anything = TRUE + + if(!did_anything) + WARNING("Redundant paint helper found at [x], [y], [z]") + qdel(src) //Stripes the wall it spawns on, then dies @@ -40,14 +58,32 @@ return INITIALIZE_HINT_LATELOAD /obj/effect/paint_stripe/LateInitialize() - var/turf/simulated/wall/W = get_turf(src) - if(istype(W)) - W.stripe_color = color - W.update_overlays() - var/obj/structure/wall_frame/WF = locate() in loc - if(WF) - WF.stripe_color = color - WF.update_icon() + for(var/obj/effect/paint_stripe/paint in loc) + if(paint == src) + continue + WARNING("Duplicate paint stripe found at [x], [y], [z]") + qdel(src) + return + + var/did_anything = FALSE + + if(istype(loc, /turf/simulated/wall)) + var/turf/simulated/wall/target_wall = loc + if(!isnull(color)) + target_wall.paint_stripe(color) + did_anything = TRUE + + else + var/obj/structure/wall_frame/low_wall = locate() in loc + if(low_wall) + if(!isnull(color)) + low_wall.stripe_color = color + low_wall.update_appearance() + did_anything = TRUE + + if(!did_anything) + WARNING("Redundant paint helper found at [x], [y], [z]") + qdel(src) //paint defines diff --git a/code/modules/mapping/spawner/window.dm b/code/modules/mapping/spawner/window.dm index 04d3d03495..4e8a8017b0 100644 --- a/code/modules/mapping/spawner/window.dm +++ b/code/modules/mapping/spawner/window.dm @@ -1,6 +1,7 @@ /obj/spawner/window icon = 'icons/mapping/spawners/windows.dmi' icon_state = "window_grille_pane" + layer = WINDOW_LAYER late = TRUE /// spawn full windows or panes on grille? diff --git a/code/modules/maps/generic/shuttles/station_shuttles/euthenia_shuttles.dm b/code/modules/maps/generic/shuttles/station_shuttles/euthenia_shuttles.dm new file mode 100644 index 0000000000..47be89e850 --- /dev/null +++ b/code/modules/maps/generic/shuttles/station_shuttles/euthenia_shuttles.dm @@ -0,0 +1,35 @@ +/datum/shuttle/autodock/overmap/euthenia_shuttles + name = "Beruang Trade Ship" + warmup_time = 0 + shuttle_area = list(/area/shuttle/trade_ship/cockpit, /area/shuttle/trade_ship/general) + current_location = "tradeport_hangar" + docking_controller_tag = "tradeport_hangar_docker" + fuel_consumption = 5 + move_time = 10 + defer_initialisation = TRUE + +/obj/overmap/entity/visitable/ship/landable/trade + name = "Beruang Trade Ship" + desc = "You know our motto: 'We deliver!'" + color = "#754116" //Brown + fore_dir = WEST + vessel_mass = 4000 + vessel_size = SHIP_SIZE_SMALL + shuttle = "Beruang Trade Ship" + +/obj/machinery/computer/shuttle_control/explore/trade + name = "short jump console" + shuttle_tag = "Beruang Trade Ship" + +/area/shuttle/trade_ship + requires_power = 1 + icon_state = "shuttle2" + area_flags = AREA_RAD_SHIELDED + +/area/shuttle/trade_ship/general + name = "\improper Beruang Trade Shuttle" + +/area/shuttle/trade_ship/cockpit + name = "\improper Beruang Trade Shuttle Cockpit" + +/datum/shuttle/autodock/overmap/euthenia_shuttles/skipper diff --git a/code/modules/maps/overmap/space/talon/talon.dm b/code/modules/maps/overmap/space/talon/talon.dm index 256250109e..6c89bea14d 100644 --- a/code/modules/maps/overmap/space/talon/talon.dm +++ b/code/modules/maps/overmap/space/talon/talon.dm @@ -169,14 +169,17 @@ Once in open space, consider disabling nonessential power-consuming electronics output_level = output_level_max input_attempt = TRUE +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/talon, 28) /obj/machinery/power/apc/talon req_access = list() req_one_access = list(ACCESS_FACTION_TALON) alarms_hidden = 1 +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/talon/hyper, 28) /obj/machinery/power/apc/talon/hyper cell_type = /obj/item/cell/hyper +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/talon, 26) /obj/machinery/air_alarm/talon req_access = list() req_one_access = list(ACCESS_FACTION_TALON) diff --git a/code/modules/media/walkpod.dm b/code/modules/media/walkpod.dm index 139f199fda..72b1811381 100644 --- a/code/modules/media/walkpod.dm +++ b/code/modules/media/walkpod.dm @@ -171,7 +171,7 @@ ui = new(user, src, "Jukebox", "PodZu Music Player") ui.open() -/obj/item/device/walkpod/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/device/walkpod/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["playing"] = playing @@ -193,7 +193,7 @@ return data -/obj/item/device/walkpod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/device/walkpod/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 8af7afc2a2..f3cbc6e268 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -14,9 +14,11 @@ var/list/obj/machinery/mining/brace/supports = list() var/supported = 0 var/active = 0 + var/orecount = 0 //current amount of ores it's holding var/list/resource_field = list() var/obj/item/radio/intercom/faultreporter = new /obj/item/radio/intercom{channels=list("Supply")}(null) - var/gps_tag = "DRILL0" + var/drill_id = 0 + var/datum/component/gps_signal/gps_component var/list/ore_types = list( MAT_HEMATITE = /obj/item/stack/ore/iron, MAT_URANIUM = /obj/item/stack/ore/uranium, @@ -44,7 +46,8 @@ var/need_player_check = 0 /obj/machinery/mining/drill/Initialize(mapload) - AddComponent(/datum/component/gps_signal, gps_tag) + gps_component = AddComponent(/datum/component/gps_signal, "DRILL#[drill_id]") + change_id(drill_id) //yes, this means mappers can assign it their own ID number on roundstart . = ..() component_parts = list( new /obj/item/stock_parts/matter_bin(src), @@ -54,6 +57,13 @@ ) RefreshParts() +/obj/machinery/mining/drill/examine() + . += ..() + . += SPAN_NOTICE("It looks like the storage cache can fit about [capacity - orecount] more ores before it reaches capacity.") + . += SPAN_NOTICE("The charge meter for the cell in the drill reads about [round(cell.percent())]%.") + . += SPAN_INFO("Alt-click to empty the drill's cache, if you have an ore satchel on you or an ore box nearby.") + . += SPAN_INFO("Use a multitool to change the drill's ID.") + /obj/machinery/mining/drill/get_cell(inducer) return cell @@ -104,7 +114,7 @@ for(var/metal in GLOB.ore_types) - var/orecount = 0 + orecount = 0 for(var/obj/item/stack/ore/s in contents) orecount += s.amount @@ -156,8 +166,8 @@ if(istype(O, /obj/item/multitool)) var/newtag = text2num(sanitizeSafe(input(user, "Enter new ID number or leave empty to cancel.", "Assign ID number") as text, 4)) if(newtag) - name = "[initial(name)] #[newtag]" - to_chat(user, "You changed the drill ID to: [newtag]") + change_id(newtag) + to_chat(user, "You changed the drill ID to: [drill_id]") return if(default_deconstruction_screwdriver(user, O)) return @@ -290,21 +300,40 @@ return 1 return 0 -/obj/machinery/mining/drill/verb/unload() +/obj/machinery/mining/drill/verb/unload_drill() set name = "Unload Drill" set category = "Object" set src in oview(1) - if(usr.stat) return + unload(usr) + +/obj/machinery/mining/drill/AltClick(user) + . = ..() + unload(user) + +/obj/machinery/mining/drill/proc/unload(mob/user) + if(user.stat || !user.Adjacent(src)) return var/obj/structure/ore_box/B = locate() in orange(1) + var/obj/item/storage/bag/ore/S = locate() in user.contents if(B) for(var/obj/item/stack/ore/O in contents) B.take(O) - to_chat(usr, "You unload the drill's storage cache into the ore box.") + to_chat(user, "You unload the drill's storage cache into [B].") + else if(S) + var/tookall = TRUE + for(var/obj/item/stack/ore/O in contents) + if(!S.take(O)) + tookall = FALSE + break + to_chat(user, "You unload [tookall ? "all" : "some"] of the drill's storage cache into [S].") else - to_chat(usr, "You must move an ore box up to the drill before you can unload it.") + to_chat(user, "You must move an ore box up to the drill or have an ore satchel before you can unload it.") +/obj/machinery/mining/drill/proc/change_id(newid = 0) + drill_id = newid + name = "[initial(name)] #[drill_id]" + gps_component.set_gps_tag("DRILL#[drill_id]") /obj/machinery/mining/brace name = "mining drill brace" @@ -318,6 +347,7 @@ . = ..() if(brace_tier >= 3) . += SPAN_NOTICE("The internals of the brace look resilient enough to support a drill by itself.") + . += SPAN_INFO("Alt-click to rotate the brace.") /obj/machinery/mining/brace/Initialize() . = ..() @@ -393,11 +423,19 @@ set category = "Object" set src in oview(1) - if(usr.stat) return + rotating_clockwise(usr) + +/obj/machinery/mining/brace/AltClick(user) //TODO: just make select objects rotatable with altclick for fucks sake + . = ..() + rotating_clockwise(user) + +/obj/machinery/mining/brace/proc/rotating_clockwise(mob/user) + if(user.stat || !user.Adjacent(src)) return if (src.anchored) - to_chat(usr, "It is anchored in place!") + to_chat(user, SPAN_WARNING("[src] is anchored in place!")) return 0 + to_chat(user, SPAN_NOTICE("You rotate [src] clockwise.")) src.setDir(turn(src.dir, 270)) return 1 diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index ead6d02743..c155b35460 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -42,105 +42,94 @@ if(!inserted_id) if(!user.attempt_insert_item_for_installation(I, src)) return + playsound(src, 'sound/machines/terminal_insert_disc.ogg', clickvol, TRUE) inserted_id = I interact(user) return ..() /obj/machinery/mineral/processing_unit_console/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) - . = ..() - - user.set_machine(src) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "MaterialProcessor", name) + ui.open() - var/dat = "

Ore processor console

" +/obj/machinery/mineral/processing_unit_console/ui_data(mob/user, datum/tgui/ui) + var/list/data = list() - dat += "Current unclaimed points: [machine.points]
" - if(istype(inserted_id)) - dat += "You have [inserted_id.mining_points] mining points collected. Eject ID.
" - dat += "Claim points.
" + var/list/ores = list() + for(var/orename in GLOB.ore_data) + var/datum/ore/O = GLOB.ore_data[orename] + ores.Add(list(list( + "name" = O.name, + "displayName" = O.display_name, + "processing" = machine.ores_processing[O.name], + "amount" = machine.ores_stored[O.name], + "ref" = REF(O) + ))) + + data["ores"] = ores + data["on"] = machine.active + data["fast"] = machine.speed_process + data["unclaimedPoints"] = machine.points + if(inserted_id) + data["idName"] = inserted_id.registered_name + data["idPoints"] = inserted_id.mining_points else - dat += "No ID inserted. Insert ID.
" - dat += "High-speed processing is [(machine.speed_process ? "active" : "inactive")]." - dat += "
" - - for(var/ore in machine.ores_processing) - - if(!machine.ores_stored[ore] && !show_all_ores) - continue - var/datum/ore/O = GLOB.ore_data[ore] - if(!O) - continue - dat += "" - - dat += "
[capitalize(O.display_name)][machine.ores_stored[ore]]" - if(machine.ores_processing[ore]) - switch(machine.ores_processing[ore]) - if(PROCESS_NONE) - dat += "not processing" - if(PROCESS_SMELT) - dat += "smelting" - if(PROCESS_COMPRESS) - dat += "compressing" - if(PROCESS_ALLOY) - dat += "alloying" - else - dat += "not processing" - dat += ".\[change\]
" - dat += "Currently displaying [show_all_ores ? "all ore types" : "only available ore types"]. \[[show_all_ores ? "show less" : "show more"]\]
" - dat += "The ore processor is currently [(machine.active ? "processing" : "disabled")]." - user << browse(dat, "window=processor_console;size=400x500") - onclose(user, "processor_console") - return + data["idName"] = "" + data["idPoints"] = 0 + return data -/obj/machinery/mineral/processing_unit_console/Topic(href, href_list) +/obj/machinery/mineral/processing_unit_console/ui_act(action, list/params, datum/tgui/ui) if(..()) - return 1 - usr.set_machine(src) - src.add_fingerprint(usr) - - if(href_list["toggle_smelting"]) + return TRUE - var/choice = input("What setting do you wish to use for processing [href_list["toggle_smelting"]]?") as null|anything in list("Smelting","Compressing","Alloying","Nothing") - if(!choice) return + . = TRUE - switch(choice) - if("Nothing") choice = PROCESS_NONE - if("Smelting") choice = PROCESS_SMELT - if("Compressing") choice = PROCESS_COMPRESS - if("Alloying") choice = PROCESS_ALLOY - - machine.ores_processing[href_list["toggle_smelting"]] = choice - - if(href_list["toggle_power"]) - - machine.active = !machine.active + add_fingerprint(usr) + usr.set_machine(src) - if(href_list["toggle_ores"]) + if(action && !issilicon(usr)) + playsound(ui_host(), SFX_ALIAS_TERMINAL, clickvol, TRUE) - show_all_ores = !show_all_ores + switch(action) + if("change_mode") + machine.ores_processing[params["ore"]] = params["mode"] + return TRUE - if(href_list["toggle_speed"]) + if("toggle_power") + machine.active = !machine.active + playsound(src.loc, 'sound/machines/terminal_prompt_confirm.ogg', clickvol, 0) + return TRUE - machine.toggle_speed() + if("toggle_speed") + machine.toggle_speed() + return TRUE - if(href_list["choice"]) - if(istype(inserted_id)) - if(href_list["choice"] == "eject") + if("eject_id") + if(istype(inserted_id)) usr.grab_item_from_interacted_with(inserted_id, src) + playsound(src, 'sound/machines/terminal_eject.ogg', clickvol, 0) inserted_id = null - if(href_list["choice"] == "claim") + return TRUE + if("claim_points") + if(istype(inserted_id)) inserted_id.mining_points += machine.points machine.points = 0 - else if(href_list["choice"] == "insert") + playsound(src.loc, 'sound/machines/ping.ogg', clickvol, 0) + return TRUE + if("insert_id") var/obj/item/card/id/I = usr.get_active_held_item() if(istype(I)) if(!usr.attempt_insert_item_for_installation(I, src)) return + playsound(src, 'sound/machines/terminal_insert_disc.ogg', clickvol, 0) inserted_id = I + return TRUE else to_chat(usr, "No valid ID.") - src.updateUsrDialog() + return FALSE /**********************Mineral processing unit**************************/ diff --git a/code/modules/mining/ore_redemption_machine/engineering_points_vendor.dm b/code/modules/mining/ore_redemption_machine/engineering_points_vendor.dm index 12e3ed2a5e..9c4cb2edaf 100644 --- a/code/modules/mining/ore_redemption_machine/engineering_points_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/engineering_points_vendor.dm @@ -12,10 +12,7 @@ //circuit = /obj/item/circuitboard/engineering_equip prize_list = list( //Mining vendor steals - new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 3), - new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 3), - new /datum/data/mining_equipment("Special Blend Whiskey", /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, 5), - new /datum/data/mining_equipment("Random Booze", /obj/random/alcohol, 3), + new /datum/data/mining_equipment("Vodka", /obj/item/reagent_containers/food/drinks/bottle/vodka, 3), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 5), new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 2), new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 9), @@ -29,10 +26,7 @@ new /datum/data/mining_equipment("Hardsuit - Plasma Cutter", /obj/item/hardsuit_module/device/plasmacutter, 10), new /datum/data/mining_equipment("Hardsuit - Maneuvering Jets", /obj/item/hardsuit_module/maneuvering_jets, 12), new /datum/data/mining_equipment("Hardsuit - Intelligence Storage", /obj/item/hardsuit_module/ai_container, 25), - new /datum/data/mining_equipment("Injector (L) - Glucose", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50), new /datum/data/mining_equipment("Injector (L) - Panacea", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 50), - new /datum/data/mining_equipment("Injector (L) - Trauma", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), - new /datum/data/mining_equipment("Nanopaste Tube", /obj/item/stack/nanopaste, 10), //Mining vendor steals - Ends //Power tools like the CE gets, if kev comes crying: https://cdn.discordapp.com/attachments/296237931587305472/956517623519141908/unknown.png new /datum/data/mining_equipment("Advanced Hardsuit", /obj/item/hardsuit/ce, 150), diff --git a/code/modules/mob/_modifiers/unholy.dm b/code/modules/mob/_modifiers/unholy.dm index ffb5205566..12fb739a88 100644 --- a/code/modules/mob/_modifiers/unholy.dm +++ b/code/modules/mob/_modifiers/unholy.dm @@ -134,7 +134,7 @@ for(var/obj/item/organ/E in H.bad_external_organs) // Fix bones var/obj/item/organ/external/affected = E - if((affected.damage < affected.min_broken_damage * config_legacy.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN // fix IB affected.cure_specific_wound(/datum/wound/internal_bleeding, all = TRUE) diff --git a/code/modules/mob/characteristics/ui.dm b/code/modules/mob/characteristics/ui.dm index 2f4823d906..2a1289597f 100644 --- a/code/modules/mob/characteristics/ui.dm +++ b/code/modules/mob/characteristics/ui.dm @@ -3,9 +3,9 @@ /datum/characteristics_holder/ui_act(action, list/params, datum/tgui/ui) . = ..() -/datum/characteristics_holder/ui_static_data(mob/user) +/datum/characteristics_holder/ui_static_data(mob/user, datum/tgui/ui) . = ..() -/datum/characteristics_holder/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/characteristics_holder/ui_data(mob/user, datum/tgui/ui) . = ..() diff --git a/code/modules/mob/grab.dm b/code/modules/mob/grab.dm index f884657aad..dac151afa4 100644 --- a/code/modules/mob/grab.dm +++ b/code/modules/mob/grab.dm @@ -250,7 +250,7 @@ range = MESSAGE_RANGE_COMBAT_LOUD, visible = SPAN_DANGER("[clickchain.performer] shoves [affecting] against \the [target]!") ) - affecting.take_organ_damage(10) + affecting.take_random_targeted_damage(brute = 10) affecting.afflict_knockdown(0.5 SECONDS) qdel(src) return CLICKCHAIN_DO_NOT_PROPAGATE @@ -260,7 +260,7 @@ range = MESSAGE_RANGE_COMBAT_LOUD, visible = SPAN_DANGER("[clickchain.performer] slams [affecting] against \the [target]!") ) - affecting.take_organ_damage(20) + affecting.take_random_targeted_damage(brute = 20) affecting.afflict_paralyze(1 SECONDS) affecting.afflict_knockdown(2 SECONDS) qdel(src) @@ -271,7 +271,7 @@ range = MESSAGE_RANGE_COMBAT_LOUD, visible = SPAN_DANGER("[clickchain.performer] smashes [affecting] against \the [target]!") ) - affecting.take_organ_damage(30) + affecting.take_random_targeted_damage(brute = 30) affecting.afflict_paralyze(3 SECONDS) affecting.afflict_knockdown(4.5 SECONDS) qdel(src) diff --git a/code/modules/mob/health.dm b/code/modules/mob/health.dm index 80fefae3fd..f6f263f0f2 100644 --- a/code/modules/mob/health.dm +++ b/code/modules/mob/health.dm @@ -49,6 +49,7 @@ dead_mob_list += src if(update_mobility) update_mobility() + update_hud_med_status() return TRUE /** diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 33c15e5d89..a8e00c7ec7 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -144,11 +144,6 @@ slot_flags = SLOT_HOLSTER origin_tech = list(TECH_BIO = 3) -/obj/item/holder/protoblob - slot_flags = SLOT_HEAD | SLOT_OCLOTHING | SLOT_HOLSTER | SLOT_ICLOTHING | SLOT_ID | SLOT_MASK - w_class = ITEMSIZE_TINY - allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) - /obj/item/holder/fish/afterattack(atom/target, mob/user, clickchain_flags, list/params) if(!target) @@ -160,6 +155,12 @@ if(prob(10)) L.afflict_stun(20 * 2) +/obj/item/holder/protoblob + clothing_flags = ALLOWINTERNALS + slot_flags = SLOT_HEAD | SLOT_OCLOTHING | SLOT_HOLSTER | SLOT_ICLOTHING | SLOT_ID | SLOT_MASK | SLOT_GLOVES | SLOT_BACK | SLOT_BELT | SLOT_FEET | SLOT_EARS | SLOT_EYES + w_class = ITEMSIZE_TINY + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) + //Roach Types /obj/item/holder/roach w_class = ITEMSIZE_TINY diff --git a/code/modules/mob/inventory/items.dm b/code/modules/mob/inventory/items.dm index 192fa6c543..ea29bdf9ad 100644 --- a/code/modules/mob/inventory/items.dm +++ b/code/modules/mob/inventory/items.dm @@ -151,6 +151,8 @@ item_flags |= ITEM_IN_INVENTORY // TODO: THIS IS SHITCODE, MOVE TO EVENT DRIVEN. user.handle_actions() + // todo: should this be here + transform = null if(isturf(oldLoc) && !(flags & (INV_OP_SILENT | INV_OP_DIRECTLY_EQUIPPING))) playsound(src, pickup_sound, 20, ignore_walls = FALSE) diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index f4adefa060..c5d53d9a73 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -30,7 +30,7 @@ xeno_harm_strength = 9 req_one_access = list(ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_ROBOTICS) botcard_access = list(ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_ROBOTICS, ACCESS_SCIENCE_XENOBIO, ACCESS_SCIENCE_XENOARCH, ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_ENGINEERING_MAINT) - var/xeno_stun_strength = 6 + xeno_stun_strength = 6 /mob/living/bot/secbot/ed209/slime/update_icons() if(on && busy) @@ -56,13 +56,6 @@ P.old_style_target(A) P.fire() -/mob/living/bot/secbot/ed209/slime/UnarmedAttack(var/mob/living/L, var/proximity) - ..() - - if(istype(L, /mob/living/simple_mob/slime/xenobio)) - var/mob/living/simple_mob/slime/xenobio/S = L - S.slimebatoned(src, xeno_stun_strength) - // Assembly /obj/item/secbot_assembly/ed209_assembly/slime diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 167655f73e..08b8d8664c 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -107,11 +107,11 @@ update_icons() var/cleantime = istype(D, /obj/effect/debris/cleanable/dirt) ? 10 : 50 if(do_after(src, cleantime)) - if(istype(loc, /turf/simulated)) - var/turf/simulated/f = loc - f.dirt = FALSE if(!D) return + if(istype(get_turf(D), /turf/simulated)) + var/turf/simulated/f = get_turf(D) + f.dirt = 0 qdel(D) if(D == target) target = null @@ -149,7 +149,7 @@ ui = new(user, src, "Cleanbot", name) ui.open() -/mob/living/bot/cleanbot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/cleanbot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on data["open"] = open diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm index e136b78e11..86ad18ba4f 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -81,7 +81,7 @@ qdel(src) return -/mob/living/bot/cleanbot/edCLN/ui_data(mob/user) +/mob/living/bot/cleanbot/edCLN/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["version"] = "v3.0" data["rgbpanel"] = TRUE diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 78ad53957f..368a1ccc48 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -42,7 +42,7 @@ ui = new(user, src, "Farmbot", name) ui.open() -/mob/living/bot/farmbot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/farmbot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm index 88c8190693..211c434951 100644 --- a/code/modules/mob/living/bot/floorbot.dm +++ b/code/modules/mob/living/bot/floorbot.dm @@ -65,7 +65,7 @@ ui = new(user, src, "Floorbot", name) ui.open() -/mob/living/bot/floorbot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/floorbot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on @@ -74,7 +74,7 @@ data["amount"] = amount - data["possible_bmode"] = list("NORTH", "EAST", "SOUTH", "WEST") + data["possible_bmode"] = list("OFF","NORTH", "EAST", "SOUTH", "WEST") data["improvefloors"] = null data["eattiles"] = null @@ -85,7 +85,7 @@ data["improvefloors"] = improvefloors data["eattiles"] = eattiles data["maketiles"] = maketiles - data["bmode"] = dir2text(targetdirection) + data["bmode"] = targetdirection ? dir2text(targetdirection) : "OFF" return data @@ -132,7 +132,10 @@ . = TRUE if("bridgemode") - targetdirection = text2dir(params["dir"]) + if(params["dir"] != "OFF") + targetdirection = text2dir(params["dir"]) + else + targetdirection = null . = TRUE /mob/living/bot/floorbot/handleRegular() @@ -429,7 +432,7 @@ switch(build_step) if(ASSEMBLY_FIRST_STEP) if(isprox(W)) - if(!user.attempt_insert_item_for_installation(W, src)) + if(!user.attempt_consume_item_for_construction(W)) return to_chat(user, SPAN_NOTICE("You add the proximity sensor to [src].")) name = "incomplete floorbot assembly" diff --git a/code/modules/mob/living/bot/medibot.dm b/code/modules/mob/living/bot/medibot.dm index 4c180701c3..bc25e6d098 100644 --- a/code/modules/mob/living/bot/medibot.dm +++ b/code/modules/mob/living/bot/medibot.dm @@ -268,7 +268,7 @@ ui = new(user, src, "Medibot", name) ui.open() -/mob/living/bot/medibot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/medibot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on data["open"] = open diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index 44284820f8..ceeea75368 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -79,7 +79,7 @@ ui = new(user, src, "MuleBot", "Mulebot [suffix ? "([suffix])" : ""]") ui.open() -/mob/living/bot/mulebot/ui_data(mob/user) +/mob/living/bot/mulebot/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "suffix" = suffix, "power" = on, @@ -93,7 +93,7 @@ ) return data -/mob/living/bot/mulebot/ui_act(action, params) +/mob/living/bot/mulebot/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 6a2c2cd4dd..da0e584d1f 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -42,6 +42,7 @@ var/can_next_insult = 0 // Uses world.time var/stun_strength = 60 // For humans. var/xeno_harm_strength = 15 // How hard to hit simple_mobs. + var/xeno_stun_strength = 3 // How hard to slimebatoned()'d naughty slimes. Normal securitrons aren't all that good at it but can do it. var/baton_glow = "#FF6A00" var/used_weapon = /obj/item/melee/baton //Weapon used by the bot @@ -104,7 +105,7 @@ req_one_access = list(ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_ROBOTICS) botcard_access = list(ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_ROBOTICS, ACCESS_SCIENCE_XENOBIO, ACCESS_SCIENCE_XENOARCH, ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_ENGINEERING_MAINT) used_weapon = /obj/item/melee/baton/slime - var/xeno_stun_strength = 5 // How hard to slimebatoned()'d naughty slimes. 5 works out to 2 discipline and 5 weaken. + xeno_stun_strength = 5 // 5 works out to 2 discipline and 5 weaken. /datum/category_item/catalogue/technology/bot/secbot/slime/slimesky name = "Bot - Doctor Slimesky" @@ -137,7 +138,7 @@ ui = new(user, src, "Secbot", name) ui.open() -/mob/living/bot/secbot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/secbot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on @@ -360,7 +361,7 @@ var/mob/living/carbon/human/H = M var/cuff = TRUE - if(!H.lying || H.handcuffed || arrest_type) + if(CHECK_MOBILITY(H, MOBILITY_CAN_MOVE | MOBILITY_CAN_USE) || H.handcuffed || arrest_type) cuff = FALSE if(!cuff) H.stun_effect_act(0, stun_strength, null) @@ -390,6 +391,13 @@ busy = FALSE else if(istype(M, /mob/living)) var/mob/living/L = M + if(istype(L, /mob/living/simple_mob/slime/xenobio)) + var/mob/living/simple_mob/slime/xenobio/S = L + var/datum/ai_holder/simple_mob/xenobio_slime/sai = S.ai_holder + if(!S.is_justified_to_discipline() && !sai?.rabid) //will kill angry slimes. + attacked = FALSE //quit abusing the damn slimes. I don't care if they're hurting you. + return + S.slimebatoned(src, xeno_stun_strength) L.adjustBruteLoss(xeno_harm_strength) do_attack_animation(M) playsound(loc, "swing_hit", 50, 1, -1) @@ -401,13 +409,6 @@ visible_message("\The [M] was beaten by \the [src] with a stun baton!") insult(L) -/mob/living/bot/secbot/slime/UnarmedAttack(var/mob/living/L, var/proximity) - ..() - - if(istype(L, /mob/living/simple_mob/slime/xenobio)) - var/mob/living/simple_mob/slime/xenobio/S = L - S.slimebatoned(src, xeno_stun_strength) - /mob/living/bot/secbot/explode() visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) @@ -435,7 +436,7 @@ return "unidentified lifeform" /mob/living/bot/secbot/proc/check_threat(var/mob/living/M) - if(!M || !istype(M) || M.stat == DEAD || src == M) + if(!M || !istype(M) || M.stat == DEAD || src == M || (isslime(M) && M.incapacitated())) threat = 0 else if(emagged && !M.incapacitated()) //check incapacitated so emagged secbots don't keep attacking the same target forever diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0f4c3c6efd..eb87ea70b4 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -32,7 +32,7 @@ for(var/mob/M in src) if(M in src.stomach_contents) src.stomach_contents.Remove(M) - M.loc = src.loc + M.forceMove(loc) for(var/mob/N in viewers(src, null)) if(N.client) N.show_message("[M] bursts out of [src]!", 2) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index b32a7f8efd..8cea5e3981 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -1,8 +1,20 @@ +/** + * The root type of complex mobs. + * + * These mobs have: + * * organ / bodypart simulation + * * reagent metabolism + * * species + * * virus simulation + * * and more. + * + * todo: this should be carbon.dm at some point + */ /mob/living/carbon gender = MALE throw_force = 10 - //? Composition + //* Composition *// /// species - datumized handling of racial intrinsics like health, environmental, breathing, etc. set using set_species() **only** var/datum/species/species diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm new file mode 100644 index 0000000000..0f6d2d9f2c --- /dev/null +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -0,0 +1,46 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* Raw Damage *// + +/mob/living/carbon/take_random_targeted_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + var/list/obj/item/organ/external/targets = get_damageable_external_organs() + if(!length(targets)) + return 0 + var/obj/item/organ/external/target = pick(targets) + return take_targeted_damage(brute, burn, damage_mode, target.organ_tag, weapon_descriptor, defer_updates) + +/mob/living/carbon/take_targeted_damage(brute, burn, damage_mode, body_zone, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + + var/obj/item/organ/external/bodypart = get_bodypart_for_zone(body_zone) + if(isnull(bodypart)) + if(damage_mode & DAMAGE_MODE_REDIRECT) + // todo: maybe don't random lmfao + return take_random_targeted_damage(brute, burn, damage_mode & ~(DAMAGE_MODE_REDIRECT), weapon_descriptor, defer_updates) + return 0 + + . = bodypart.inflict_bodypart_damage(brute, burn, damage_mode, weapon_descriptor, TRUE) + + if(!defer_updates && .) + update_health() + UpdateDamageIcon() + +/mob/living/carbon/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + + . = 0 + + var/list/obj/item/organ/external/targets = get_damageable_external_organs() + var/divisor = 1 / length(targets) + + for(var/obj/item/organ/external/target as anything in targets) + . += target.inflict_bodypart_damage(brute * divisor, burn * divisor, damage_mode, weapon_descriptor, TRUE) + + if(!defer_updates && .) + update_health() + UpdateDamageIcon() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f2742d163b..b3d354b938 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -162,27 +162,39 @@ if (prob(50) && !shielded) afflict_unconscious(20 * 10) - var/update = 0 // focus most of the blast on one organ var/obj/item/organ/external/take_blast = pick(organs) - update |= take_blast.take_damage(b_loss * 0.9, f_loss * 0.9, used_weapon = "Explosive blast") + take_blast.inflict_bodypart_damage( + brute = b_loss * 0.9, + burn = f_loss * 0.9, + weapon_descriptor = "concussive force", + ) // distribute the remaining 10% on all limbs equally b_loss *= 0.1 f_loss *= 0.1 - var/weapon_message = "Explosive Blast" - for(var/obj/item/organ/external/temp in organs) switch(temp.organ_tag) if(BP_HEAD) - update |= temp.take_damage(b_loss * 0.2, f_loss * 0.2, used_weapon = weapon_message) + temp.inflict_bodypart_damage( + brute = b_loss * 0.2, + burn = f_loss * 0.2, + weapon_descriptor = "concussive force", + ) if(BP_TORSO) - update |= temp.take_damage(b_loss * 0.4, f_loss * 0.4, used_weapon = weapon_message) + temp.inflict_bodypart_damage( + brute = b_loss * 0.4, + burn = f_loss * 0.4, + weapon_descriptor = "concussive force", + ) else - update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message) - if(update) UpdateDamageIcon() + temp.inflict_bodypart_damage( + brute = b_loss * 0.05, + burn = f_loss * 0.05, + weapon_descriptor = "concussive force", + ) /mob/living/carbon/human/proc/implant_loyalty(override = FALSE) // Won't override by default. if(!config_legacy.use_loyalty_implants && !override) return // Nuh-uh. @@ -1025,10 +1037,14 @@ "Your movement jostles [O] in your [organ.name] painfully.") custom_pain(msg, 40) if(istype(O, /obj/item/melee/spike)) - organ.take_damage(rand(3,9), 0, 0) // it has spikes on it it's going to stab you + organ.inflict_bodypart_damage( + brute = rand(3, 9), + ) to_chat(src, "The edges of [O] in your [organ.name] are not doing you any favors.") afflict_paralyze(20 * 2) // having a very jagged stick jammed into your bits is Bad for your health - organ.take_damage(rand(1,3), 0, 0) + organ.inflict_bodypart_damage( + brute = rand(1, 3), + ) if(!(organ.robotic >= ORGAN_ROBOT) && (should_have_organ(O_HEART))) //There is no blood in protheses. organ.status |= ORGAN_BLEEDING @@ -1154,6 +1170,11 @@ var/datum/mob_descriptor/descriptor = species.descriptors[desctype] descriptors[desctype] = descriptor.default_value + if(ispath(species.custom_ability_handler, /datum/ability_handler)) + ab_handler = new species.custom_ability_handler() + else + ab_handler = new /datum/ability_handler() + // dumb shit transformation shit here if(example) if(!(example == src)) @@ -1640,3 +1661,8 @@ return // groan . += ((size_multiplier * icon_scale_x) - 1) * ((dir & EAST)? -16 : 16) + +/mob/living/carbon/human/ClickOn(var/atom/A) + if(ab_handler?.process_click(src, A)) + return + ..() diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 8f13d57d47..7a74efb5c0 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -8,10 +8,16 @@ var/total_burn = 0 var/total_brute = 0 for(var/obj/item/organ/external/O in organs) //hardcoded to streamline things a bit - if((O.robotic >= ORGAN_ROBOT) && !O.vital) - continue //*non-vital* robot limbs don't count towards shock and crit - total_brute += O.brute_dam - total_burn += O.burn_dam + if(!O.vital) + if(O.robotic >= ORGAN_ROBOT) + continue //*non-vital* robot limbs don't count towards shock and crit + else + // todo: pending med rework, we count non vital organic limbs for less damage, but not less for shock! + total_brute += O.brute_dam * 0.75 + total_burn += O.burn_dam * 0.75 + else + total_brute += O.brute_dam + total_burn += O.burn_dam var/old = health health = getMaxHealth() - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute @@ -157,50 +163,6 @@ heal_overall_damage(0, -amount, include_robo) update_hud_med_all() -/mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null) - amount = amount*species.brute_mod - if (organ_name in organs_by_name) - var/obj/item/organ/external/O = get_organ(organ_name) - - if(amount > 0) - for(var/datum/modifier/M in modifiers) - if(!isnull(M.incoming_damage_percent)) - amount *= M.incoming_damage_percent - if(!isnull(M.incoming_brute_damage_percent)) - amount *= M.incoming_brute_damage_percent - if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //NIF mod for damage resistance for this type of damage - O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) - else - for(var/datum/modifier/M in modifiers) - if(!isnull(M.incoming_healing_percent)) - amount *= M.incoming_healing_percent - //if you don't want to heal robot organs, they you will have to check that yourself before using this proc. - O.heal_damage(-amount, 0, internal=0, robo_repair=(O.robotic >= ORGAN_ROBOT)) - - update_hud_med_all() - -/mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null) - amount = amount*species.burn_mod - if (organ_name in organs_by_name) - var/obj/item/organ/external/O = get_organ(organ_name) - - if(amount > 0) - for(var/datum/modifier/M in modifiers) - if(!isnull(M.incoming_damage_percent)) - amount *= M.incoming_damage_percent - if(!isnull(M.incoming_fire_damage_percent)) - amount *= M.incoming_fire_damage_percent - if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} // NIF mod for damage resistance for this type of damage - O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) - else - for(var/datum/modifier/M in modifiers) - if(!isnull(M.incoming_healing_percent)) - amount *= M.incoming_healing_percent - //if you don't want to heal robot organs, they you will have to check that yourself before using this proc. - O.heal_damage(0, -amount, internal=0, robo_repair=(O.robotic >= ORGAN_ROBOT)) - - update_hud_med_all() - /mob/living/carbon/human/proc/Stasis(amount) if((species.species_flags & NO_SCAN) || isSynthetic()) in_stasis = 0 @@ -318,7 +280,7 @@ /mob/living/carbon/human/proc/get_damageable_organs() var/list/obj/item/organ/external/parts = list() for(var/obj/item/organ/external/O in organs) - if(O.is_damageable()) + if(O.is_damageable(TRUE)) parts += O return parts @@ -333,20 +295,6 @@ UpdateDamageIcon() update_health() -/* -In most cases it makes more sense to use apply_damage() instead! And make sure to check armour if applicable. -*/ -//Damages ONE external organ, organ gets randomly selected from damagable ones. -//It automatically updates damage overlays if necesary -//It automatically updates health status -/mob/living/carbon/human/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0) - var/list/obj/item/organ/external/parts = get_damageable_organs() - if(!parts.len) - return - var/obj/item/organ/external/picked = pick(parts) - if(picked.take_damage(brute,burn,sharp,edge)) - UpdateDamageIcon() - update_health() //Heal MANY external organs, in random order //'include_robo' only applies to healing, for legacy purposes, as all damage typically hurts both types of organs @@ -370,25 +318,6 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t if(update) UpdateDamageIcon() -// damage MANY external organs, in random order -/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0, var/used_weapon = null) - if(status_flags & STATUS_GODMODE) return //godmode - var/list/obj/item/organ/external/parts = get_damageable_organs() - var/update = 0 - while(parts.len && (brute>0 || burn>0) ) - var/obj/item/organ/external/picked = pick(parts) - - var/brute_was = picked.brute_dam - var/burn_was = picked.burn_dam - - update |= picked.take_damage(brute,burn,sharp,edge,used_weapon) - brute -= (picked.brute_dam - brute_was) - burn -= (picked.burn_dam - burn_was) - - parts -= picked - update_health() - if(update) - UpdateDamageIcon() //////////////////////////////////////////// @@ -408,16 +337,6 @@ This function restores all organs. for(var/obj/item/organ/external/current_organ in organs) current_organ.rejuvenate_legacy(ignore_prosthetic_prefs) -/mob/living/carbon/human/proc/HealDamage(zone, brute, burn) - var/obj/item/organ/external/E = get_organ(zone) - if(istype(E, /obj/item/organ/external)) - if (E.heal_damage(brute, burn)) - UpdateDamageIcon() - update_hud_med_health() - else - return 0 - return - /mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null) if(GLOB.Debug2) log_world("## DEBUG: human/apply_damage() was called on [src], with [damage] damage, an armor value of [blocked], and a soak value of [soaked].") @@ -470,8 +389,11 @@ This function restores all organs. if(!isnull(M.incoming_brute_damage_percent)) damage *= M.incoming_brute_damage_percent - if(organ.take_damage(damage, 0, sharp, edge, used_weapon)) - UpdateDamageIcon() + organ.inflict_bodypart_damage( + brute = damage, + damage_mode = (edge? DAMAGE_MODE_EDGE : NONE) | (sharp? DAMAGE_MODE_SHARP : NONE), + weapon_descriptor = used_weapon, + ) if(BURN) damageoverlaytemp = 20 damage = damage*species.burn_mod @@ -482,8 +404,11 @@ This function restores all organs. if(!isnull(M.incoming_brute_damage_percent)) damage *= M.incoming_fire_damage_percent - if(organ.take_damage(0, damage, sharp, edge, used_weapon)) - UpdateDamageIcon() + organ.inflict_bodypart_damage( + burn = damage, + damage_mode = (edge? DAMAGE_MODE_EDGE : NONE) | (sharp? DAMAGE_MODE_SHARP : NONE), + weapon_descriptor = used_weapon, + ) // Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life(). update_health() diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index c81aa638e6..c5e04d926b 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -326,7 +326,7 @@ meteor_act effective_force -= round(effective_force*0.8) //want the dislocation chance to be such that the limb is expected to dislocate after dealing a fraction of the damage needed to break the limb - var/dislocate_chance = effective_force/(dislocate_mult * organ.min_broken_damage * config_legacy.organ_health_multiplier)*100 + var/dislocate_chance = effective_force/(dislocate_mult * organ.min_broken_damage)*100 if(prob(dislocate_chance * (100 - blocked)/100)) visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") organ.dislocate(1) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index e04f9f3988..e400818df3 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -271,3 +271,5 @@ var/hiding_wings = FALSE var/hiding_tail = FALSE var/hiding_horns = FALSE + + var/datum/ability_handler/ab_handler diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 3284d339a5..d13864efd1 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -89,7 +89,7 @@ //No need to update all of these procs if the guy is dead. if(stat != DEAD && !stasis) - stabilize_body_temperature() //Body temperature adjusts itself (self-regulation) + stabilize_body_temperature(seconds) //Body temperature adjusts itself (self-regulation) weightgain() process_weaver_silk() handle_shock() @@ -313,7 +313,7 @@ to_chat(src, SPAN_WARNING("Warning: Ionization detected in control routes. Radiological threat suspected.")) #ifdef RAD_MOB_BURNS_SYNTHETICS if(radiation >= RAD_MOB_BURN_THRESHOLD) - take_overall_damage(burn = RAD_MOB_BURN_DAMAGE_FOR(radiation, seconds), used_weapon = "Radiation Burns") + take_overall_damage(burn = RAD_MOB_BURN_DAMAGE_FOR(radiation, seconds), weapon_descriptor = "radiation burns") #endif if(radiation >= RAD_MOB_TOXIN_THRESHOLD) adjustToxLoss(RAD_MOB_SYNTH_INSTABILITY_FOR(radiation, seconds)) @@ -330,7 +330,7 @@ if(prob(RAD_MOB_WARNING_CHANCE(radiation, seconds))) to_chat(src, SPAN_WARNING("You feel nauseous, and a hot presence burning through your flesh.")) if(radiation >= RAD_MOB_BURN_THRESHOLD) - take_overall_damage(burn = RAD_MOB_BURN_DAMAGE_FOR(radiation, seconds), used_weapon = "Radiation Burns") + take_overall_damage(burn = RAD_MOB_BURN_DAMAGE_FOR(radiation, seconds), weapon_descriptor = "radiation burns") if(radiation >= RAD_MOB_TOXIN_THRESHOLD) adjustToxLoss(RAD_MOB_TOXIN_DAMAGE_FOR(radiation, seconds)) // todo: autopsy data @@ -655,7 +655,7 @@ else temp_adj /= (BODYTEMP_HEAT_DIVISOR * 5) //don't raise temperature as much as if we were directly exposed - var/density = breath.total_moles / (MOLES_CELLSTANDARD * BREATH_PERCENTAGE) + var/density = breath.total_moles / (CELL_MOLES * BREATH_PERCENTAGE) temp_adj *= density if (temp_adj > BODYTEMP_HEATING_MAX) temp_adj = BODYTEMP_HEATING_MAX @@ -671,15 +671,24 @@ breath.update_values() return 1 -/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment) - if(!environment) - return +/** + * @params + * * environment - the gas mixture we're in + * * dt - seconds to simulate + */ +/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment, dt) + + // legacy: species special processes //Stuff like the xenomorph's plasma regen happens here. - species.handle_environment_special(src) + // todo: why the shit is this here + species.handle_environment_special(src, environment, dt) + // legacy: incorporeal (shadekin) check if(is_incorporeal()) return + // legacy: synth snowflake shit + // todo: kill this shit with fire if(isSynthetic()) // synth specific temperature values in the absence of a synthetic species var/mob/living/carbon/human/H = src //! I hate this, fuck you. Don't override shit in human life(). @Zandario @@ -708,69 +717,87 @@ ) if(bodytemperature > species.heat_discomfort_level && !(H.species.get_species_id() == SPECIES_ID_PROTEAN)) if(world.time >= last_synthcooling_message || last_synthcooling_message == 0) - if(src.nutrition <= 50) // do they have enough energy for this? + last_synthcooling_message = world.time + 60 SECONDS + if(src.nutrition <= 25) // do they have enough energy for this? to_chat(src, "Warning: Temperature at critically high levels.") to_chat(src, "Warning: Power critical. Unable to deploy cooling systems.") - return else to_chat(src, "Warning: Temperature at critically high levels.") add_modifier(/datum/modifier/synthcooling, 15 SECONDS) // enable cooling systems at cost of energy - src.nutrition -= 50 - last_synthcooling_message = world.time + 60 SECONDS + adjust_nutrition(-25) - //Moved pressure calculations here for use in skip-processing check. - var/pressure = environment.return_pressure() - var/adjusted_pressure = calculate_affecting_pressure(pressure) + var/absolute_pressure = isnull(environment)? 0 : environment.return_pressure() + var/affecting_pressure = calculate_affecting_pressure(absolute_pressure) + // legacy: contamination //Check for contaminants before anything else because we don't want to skip it. - for(var/g in environment.gas) + for(var/g in environment?.gas) if(global.gas_data.flags[g] & GAS_FLAG_CONTAMINANT && environment.gas[g] > 1) pl_effects() break - if(istype(loc, /turf/space)) // No FBPs overheating on space turfs inside mechs or people. - //Don't bother if the temperature drop is less than 0.1 anyways. Hopefully BYOND is smart enough to turn this constant expression into a constant - if(bodytemperature > (0.1 * HUMAN_HEAT_CAPACITY/(HUMAN_EXPOSED_SURFACE_AREA*STEFAN_BOLTZMANN_CONSTANT))**(1/4) + COSMIC_RADIATION_TEMPERATURE) - //Thermal radiation into space - var/heat_loss = HUMAN_EXPOSED_SURFACE_AREA * STEFAN_BOLTZMANN_CONSTANT * ((bodytemperature - COSMIC_RADIATION_TEMPERATURE)**4) - var/temperature_loss = heat_loss/HUMAN_HEAT_CAPACITY - bodytemperature -= temperature_loss - else - var/loc_temp = T0C - if(istype(loc, /obj/mecha)) - var/obj/mecha/M = loc - loc_temp = M.return_temperature() - else if(istype(loc, /obj/machinery/atmospherics/component/unary/cryo_cell)) - var/obj/machinery/atmospherics/component/unary/cryo_cell/CC = loc - loc_temp = CC.air_contents.temperature + // legacy: bodytemperature equalizaiton + // todo: we should rework most of this + // we simulate in space, or in somewhere with a gasmixture. otherwise, we don't care. + if(istype(loc, /turf/space)) + // in space, we use blackbody radiation + var/heat_loss = HUMAN_EXPOSED_SURFACE_AREA * STEFAN_BOLTZMANN_CONSTANT * ((bodytemperature - COSMIC_RADIATION_TEMPERATURE)**4) + var/temperature_loss = heat_loss/HUMAN_HEAT_CAPACITY + adjust_bodytemperature(-temperature_loss) + else if(!isnull(environment)) + // todo: this shit is all suboptimal + // otherwise, we use environment temperature + var/environment_temperature = environment.temperature + var/difference = environment_temperature - bodytemperature + // relative density multiplier + var/density_multiplier = environment.total_moles / CELL_MOLES + + density_multiplier = density_multiplier > 1? sqrt(density_multiplier) : density_multiplier + + var/thermal_insulation + + var/nominal = species.body_temperature || T20C + var/to_nominal = nominal - bodytemperature + var/is_stabilizing = (to_nominal > 0? 1 : -1) == (difference > 0? 1 : -1) + + var/adjust = is_stabilizing? \ + max( \ + difference * MOB_BODYTEMP_EQUALIZATION_FAVORABLE_RATIO * density_multiplier, \ + min(difference, MOB_BODYTEMP_EQUALIZATION_MIN_FAVORABLE) \ + ) : \ + clamp( \ + difference * MOB_BODYTEMP_EQUALIZATION_UNFAVORABLE_RATIO * density_multiplier, \ + min(difference, MOB_BODYTEMP_EQUALIZATION_MIN_UNFAVORABLE), \ + MOB_BODYTEMP_EQUALIZATION_MAX_UNFAVORABLE \ + ) + + if(is_stabilizing) + adjust_bodytemperature(adjust) + else if(difference < 0) + // we are being cooled + thermal_insulation = get_cold_protection(environment_temperature) + if(thermal_insulation < 1) + // we aren't entirely shielded + adjust_bodytemperature(adjust * (1 - thermal_insulation)) else - loc_temp = environment.temperature - - if(adjusted_pressure < species.warning_high_pressure && adjusted_pressure > species.warning_low_pressure && abs(loc_temp - bodytemperature) < 20 && bodytemperature < species.heat_level_1 && bodytemperature > species.cold_level_1) - pressure_alert = 0 - return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp - - //Body temperature adjusts depending on surrounding atmosphere based on your thermal protection (convection) - var/temp_adj = 0 - if(loc_temp < bodytemperature) //Place is colder than we are - var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. - if(thermal_protection < 0.99) //For some reason, < 1 returns false if the value is 1. - temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR) //this will be negative - else if (loc_temp > bodytemperature) //Place is hotter than we are - var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. - if(thermal_protection < 0.99) //For some reason, < 1 returns false if the value is 1. - temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR) - - //Use heat transfer as proportional to the gas density. However, we only care about the relative density vs standard 101 kPa/20 C air. Therefore we can use mole ratios - var/density = environment.total_moles / MOLES_CELLSTANDARD - bodytemperature += between(BODYTEMP_COOLING_MAX, temp_adj*density, BODYTEMP_HEATING_MAX) + // we are getting heated + thermal_insulation = get_heat_protection(environment_temperature) + if(thermal_insulation < 1) + // we aren't entirely shielded + adjust_bodytemperature(adjust * (1 - thermal_insulation)) + + // legacy: godmode check + if(status_flags & STATUS_GODMODE) + fire_alert = 0 + pressure_alert = 0 + return + + // todo: completely rework eveyrthing about this to be surface vs deep burns // +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt. if(bodytemperature >= species.heat_level_1) //Body temperature is too hot. fire_alert = max(fire_alert, 1) - if(status_flags & STATUS_GODMODE) - return 1 //godmode var/burn_dam = 0 @@ -787,17 +814,13 @@ else burn_dam = HEAT_DAMAGE_LEVEL_1 - take_overall_damage(burn=burn_dam, used_weapon = "High Body Temperature") + take_overall_damage(burn = burn_dam, damage_mode = DAMAGE_MODE_GRADUAL, weapon_descriptor = "internal burns") fire_alert = max(fire_alert, 2) else if(bodytemperature <= species.cold_level_1 && !IS_DEAD(src)) // dead check is temporary bandaid for health rework //Body temperature is too cold. fire_alert = max(fire_alert, 1) - if(status_flags & STATUS_GODMODE) - return 1 //godmode - - if(!istype(loc, /obj/machinery/atmospherics/component/unary/cryo_cell)) var/cold_dam = 0 if(bodytemperature <= species.cold_level_1) @@ -809,33 +832,28 @@ else cold_dam = COLD_DAMAGE_LEVEL_1 - take_overall_damage(burn=cold_dam, used_weapon = "Low Body Temperature") + take_overall_damage(burn = cold_dam, damage_mode = DAMAGE_MODE_GRADUAL, weapon_descriptor = "frostbite") fire_alert = max(fire_alert, 1) - // Account for massive pressure differences. Done by Polymorph - // Made it possible to actually have something that can protect against high pressure... Done by Errorage. Polymorph now has an axe sticking from his head for his previous hardcoded nonsense! - if(status_flags & STATUS_GODMODE) - return 1 //godmode - - if(adjusted_pressure >= species.hazard_high_pressure) - var/pressure_damage = min( ( (adjusted_pressure / species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) - take_overall_damage(brute=pressure_damage, used_weapon = "High Pressure") + if(affecting_pressure >= species.hazard_high_pressure) + var/pressure_damage = min( ( (affecting_pressure / species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) + take_overall_damage(brute = pressure_damage, damage_mode = DAMAGE_MODE_GRADUAL | DAMAGE_MODE_NO_OVERFLOW, weapon_descriptor = "barotrauma") pressure_alert = 2 - else if(adjusted_pressure >= species.warning_high_pressure) + else if(affecting_pressure >= species.warning_high_pressure) pressure_alert = 1 - else if(adjusted_pressure >= species.warning_low_pressure) + else if(affecting_pressure >= species.warning_low_pressure) pressure_alert = 0 - else if(adjusted_pressure >= species.hazard_low_pressure) + else if(affecting_pressure >= species.hazard_low_pressure) pressure_alert = -1 else if( !(MUTATION_COLD_RESIST in mutations)) if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) // NIF pressure seals - take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") + take_overall_damage(brute = LOW_PRESSURE_DAMAGE, damage_mode = DAMAGE_MODE_GRADUAL | DAMAGE_MODE_NO_OVERFLOW, weapon_descriptor = "barotrauma") if(getOxyLoss() < 55) // 12 OxyLoss per 4 ticks when wearing internals; unconsciousness in 16 ticks, roughly half a minute var/pressure_dam = 3 // 16 OxyLoss per 4 ticks when no internals present; unconsciousness in 13 ticks, roughly twenty seconds // (Extra 1 oxyloss from failed breath) // Being in higher pressure decreases the damage taken, down to a minimum of (species.hazard_low_pressure / ONE_ATMOSPHERE) at species.hazard_low_pressure - pressure_dam *= (ONE_ATMOSPHERE - adjusted_pressure) / ONE_ATMOSPHERE + pressure_dam *= (ONE_ATMOSPHERE - affecting_pressure) / ONE_ATMOSPHERE if(wear_suit && wear_suit.min_pressure_protection && head && head.min_pressure_protection) var/protection = max(wear_suit.min_pressure_protection, head.min_pressure_protection) // Take the weakest protection @@ -848,8 +866,6 @@ else pressure_alert = -1 - return - /* /mob/living/carbon/human/proc/adjust_body_temperature(current, loc_temp, boost) var/temperature = current @@ -869,47 +885,50 @@ return temp_change */ -/mob/living/carbon/human/proc/stabilize_body_temperature() - // We produce heat naturally. - if (species.passive_temp_gain) - bodytemperature += species.passive_temp_gain - if (species.body_temperature == null) - return //this species doesn't have metabolic thermoregulation - - // FBPs will overheat when alive, prosthetic limbs are fine. - if(stat != DEAD && robobody_count) - if(!nif || !nif.flag_check(NIF_O_HEATSINKS,NIF_FLAGS_OTHER)) // NIF heatsinks prevent the base heat increase per tick if installed. - bodytemperature += round(robobody_count*1.15) +/** + * metabolism for body temperature + * + * should only be called while alive + * + * @params + * * dt - seconds for this cycle + */ +/mob/living/carbon/human/proc/stabilize_body_temperature(dt) + if(isnull(loc)) + // okay we should probably like + // not. + return + + var/buffer = bodytemperature + + // legacy: species passive gain + // todo: shouldn't exist probably + buffer += species.passive_temp_gain * dt + // legacy: robot limbs gain heat + // todo: rewrite + if(robobody_count) + if(!nif?.flag_check(NIF_O_HEATSINKS, NIF_FLAGS_OTHER)) + buffer += round(robobody_count* 1.15) * dt var/obj/item/organ/internal/robotic/heatsink/HS = internal_organs_by_name[O_HEATSINK] if(!HS || HS.is_broken()) // However, NIF Heatsinks will not compensate for a core FBP component (your heatsink) being lost. - bodytemperature += round(robobody_count*0.5) - - var/body_temperature_difference = species.body_temperature - bodytemperature - - if (abs(body_temperature_difference) < 0.5) - return //fuck this precision - - if (on_fire) - return //too busy for pesky metabolic regulation - - if(bodytemperature < species.cold_level_1) //260.15 is 310.15 - 50, the temperature where you start to feel effects. - if(nutrition >= 2) //If we are very, very cold we'll use up quite a bit of nutriment to heat us up. - nutrition -= 2 - var/recovery_amt = max((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) - //to_chat(world, "Cold. Difference = [body_temperature_difference]. Recovering [recovery_amt]") -// log_debug(SPAN_DEBUG("Cold. Difference = [body_temperature_difference]. Recovering [recovery_amt]")) - bodytemperature += recovery_amt - else if(species.cold_level_1 <= bodytemperature && bodytemperature <= species.heat_level_1) - var/recovery_amt = body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR - //to_chat(world, "Norm. Difference = [body_temperature_difference]. Recovering [recovery_amt]") -// log_debug(SPAN_DEBUG("Norm. Difference = [body_temperature_difference]. Recovering [recovery_amt]")) - bodytemperature += recovery_amt - else if(bodytemperature > species.heat_level_1) //360.15 is 310.15 + 50, the temperature where you start to feel effects. - adjust_hydration(-(10 * DEFAULT_THIRST_FACTOR)) //Sweating - var/recovery_amt = min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers - //to_chat(world, "Hot. Difference = [body_temperature_difference]. Recovering [recovery_amt]") -// log_debug(SPAN_DEBUG("Hot. Difference = [body_temperature_difference]. Recovering [recovery_amt]")) - bodytemperature += recovery_amt + buffer += round(robobody_count * 0.5) * dt + + // legacy: thermal regulation + // todo: rework + if(species.body_temperature != null) + // species has metabolic thermoregulation + var/difference = species.body_temperature - bodytemperature + + if(buffer < species.cold_level_1) + adjust_nutrition(-2) + buffer += max((difference / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) + else if(buffer > species.heat_level_1) + adjust_hydration(-(10 * DEFAULT_THIRST_FACTOR)) + buffer += min((difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) + else + buffer += difference / BODYTEMP_AUTORECOVERY_DIVISOR + + set_bodytemperature(buffer) //This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, UPPER_TORSO, LOWER_TORSO, etc. See setup.dm for the full list) /mob/living/carbon/human/proc/get_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to. @@ -918,7 +937,7 @@ for(var/obj/item/clothing/C in list(head,wear_suit,w_uniform,shoes,gloves,wear_mask)) if(C) if(C.max_heat_protection_temperature && C.max_heat_protection_temperature >= temperature) - . |= C.heat_protection + . |= C.heat_protection_cover //See proc/get_heat_protection_flags(temperature) for the description of this proc. /mob/living/carbon/human/proc/get_cold_protection_flags(temperature) @@ -927,7 +946,7 @@ for(var/obj/item/clothing/C in list(head,wear_suit,w_uniform,shoes,gloves,wear_mask)) if(C) if(C.min_cold_protection_temperature && C.min_cold_protection_temperature <= temperature) - . |= C.cold_protection + . |= C.cold_protection_cover /mob/living/carbon/human/get_heat_protection(temperature) //Temperature is the temperature you're being exposed to. var/thermal_protection_flags = get_heat_protection_flags(temperature) @@ -1019,7 +1038,7 @@ // This is hacky, I'm so sorry. if(I != l_hand && I != r_hand) //If the item isn't in your hands, you're probably wearing it. Full damage for you. total_phoronloss += loss_per_part - else if((I == l_hand | I == r_hand) && !((src.wear_suit.body_cover_flags & HANDS) | src.gloves | (src.w_uniform.body_cover_flags & HANDS))) //If the item is in your hands, but you're wearing protection, you might be alright. + else if((I == l_hand | I == r_hand) && !((src.wear_suit?.body_cover_flags & HANDS) | src.gloves | (src.w_uniform?.body_cover_flags & HANDS))) //If the item is in your hands, but you're wearing protection, you might be alright. //If you hold it in hand, and your hands arent covered by anything total_phoronloss += loss_per_part if(total_phoronloss) @@ -1631,23 +1650,6 @@ playsound_local(src,pick(scarySounds),50, 1, -1) */ -/mob/living/carbon/human/handle_stomach() - spawn(0) - for(var/mob/living/M in stomach_contents) - if(M.loc != src) - stomach_contents.Remove(M) - continue - if(istype(M, /mob/living/carbon) && stat != 2) - if(M.stat == 2) - M.death(1) - stomach_contents.Remove(M) - qdel(M) - continue - if(SSair.current_cycle%3==1) - if(!(M.status_flags & STATUS_GODMODE)) - M.adjustBruteLoss(5) - nutrition += 10 - /mob/living/carbon/human/proc/handle_changeling() if(mind && mind.changeling) mind.changeling.regenerate() @@ -1695,8 +1697,10 @@ /mob/living/carbon/human/handle_shock() ..() - if(status_flags & STATUS_GODMODE) return 0 //godmode - if(!can_feel_pain()) return + if(status_flags & STATUS_GODMODE) + return 0 //godmode + if(!can_feel_pain()) + return if(health < config_legacy.health_threshold_softcrit)// health 0 makes you immediately collapse shock_stage = max(shock_stage, 61) @@ -1707,7 +1711,7 @@ shock_stage = max(shock_stage, 61) else shock_stage = min(shock_stage, 160) - shock_stage = max(shock_stage-1, 0) + shock_stage = max(shock_stage - (traumatic_shock? 1 : 2), 0) return if(stat) @@ -1880,10 +1884,8 @@ //Our call for the NIF to do whatever /mob/living/carbon/human/proc/handle_nif() - if(!nif) return - //Process regular life stuff - nif.on_life() + nif?.on_life() #undef HUMAN_MAX_OXYLOSS #undef HUMAN_CRIT_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/human/traits/_trait.dm b/code/modules/mob/living/carbon/human/traits/_trait.dm index 8ea7fb8641..553c79953e 100644 --- a/code/modules/mob/living/carbon/human/traits/_trait.dm +++ b/code/modules/mob/living/carbon/human/traits/_trait.dm @@ -20,6 +20,9 @@ /datum/trait/proc/apply(datum/species/S, mob/living/carbon/human/H) SHOULD_CALL_PARENT(TRUE) + if(istype(H, /mob/observer)) + return + for(var/trait in traits) ADD_TRAIT(H, trait, QUIRK_TRAIT) diff --git a/code/modules/mob/living/carbon/human/traits/negative.dm b/code/modules/mob/living/carbon/human/traits/negative.dm index 393a371808..1a7fc280cf 100644 --- a/code/modules/mob/living/carbon/human/traits/negative.dm +++ b/code/modules/mob/living/carbon/human/traits/negative.dm @@ -140,6 +140,7 @@ name = "Colorblindness (Monochromancy)" desc = "You simply can't see colors at all, period. You are 100% colorblind." cost = -1 + custom_only = FALSE /datum/trait/negative/colorblind/mono/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) @@ -181,6 +182,7 @@ name = "Blind" desc = "You're blind. Permanently." cost = -3 + custom_only = FALSE traits = list( TRAIT_BLIND ) @@ -193,6 +195,7 @@ name = "Deaf" desc = "You're deaf. Permanently." cost = -2 + custom_only = FALSE traits = list( TRAIT_DEAF ) @@ -209,6 +212,7 @@ name = "Mute" desc = "You're mute. Permanently." cost = 0 // TTS bypasses this instantly, no powergaming mute ass explo characters + custom_only = FALSE traits = list( TRAIT_MUTE ) diff --git a/code/modules/mob/living/carbon/human/traits/positive.dm b/code/modules/mob/living/carbon/human/traits/positive.dm index 5a1e05670c..d1f4223407 100644 --- a/code/modules/mob/living/carbon/human/traits/positive.dm +++ b/code/modules/mob/living/carbon/human/traits/positive.dm @@ -34,15 +34,23 @@ /datum/trait/positive/melee_attack name = "Sharp Melee" - desc = "Provides sharp melee attacks that do slightly more damage." + desc = "Provides sharp melee attacks that do more damage." cost = 1 - var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)) + var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/good, /datum/unarmed_attack/bite/sharp/good)) + +/datum/trait/positive/melee_attack/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + S.update_attack_types() /datum/trait/positive/melee_attack_fangs - name = "Sharp Melee & Numbing Fangs" - desc = "Provides sharp melee attacks that do slightly more damage, along with fangs that makes the person bit unable to feel their body or pain." + name = "Sharp Melee & Venomous Fangs" + desc = "Provides sharp melee attacks that do more damage, along with venomous fangs." cost = 2 - var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) + var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/good/venom, /datum/unarmed_attack/bite/sharp/good/venom)) + +/datum/trait/positive/melee_attack_fangs/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + S.update_attack_types() /datum/trait/positive/minor_brute_resist name = "Minor Brute Resist" diff --git a/code/modules/mob/living/carbon/organs.dm b/code/modules/mob/living/carbon/organs.dm new file mode 100644 index 0000000000..b22c1e0c3a --- /dev/null +++ b/code/modules/mob/living/carbon/organs.dm @@ -0,0 +1,26 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +/** + * get organ for body zone + */ +/mob/living/carbon/proc/get_bodypart_for_zone(body_zone) + return organs_by_name[body_zone] + +/** + * get external organs + */ +/mob/living/carbon/proc/get_external_organs() + . = list() + for(var/obj/item/organ/external/E in organs) + . += E + +/** + * get external organs that are targetable + */ +/mob/living/carbon/proc/get_damageable_external_organs(check_damage_cap) + . = list() + for(var/obj/item/organ/external/E in organs) + if(!E.is_damageable(check_damage_cap)) + continue + . += E diff --git a/code/modules/mob/living/carbon/physiology.dm b/code/modules/mob/living/carbon/physiology.dm new file mode 100644 index 0000000000..3609d1b202 --- /dev/null +++ b/code/modules/mob/living/carbon/physiology.dm @@ -0,0 +1,32 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +/mob/living/carbon/add_physiology_modifier(datum/physiology_modifier/modifier) + . = ..() + if(!.) + return + for(var/obj/item/organ/external/bodypart in organs) + // todo: check biology + bodypart.physiology.apply(modifier) + +/mob/living/carbon/remove_physiology_modifier(datum/physiology_modifier/modifier) + . = ..() + if(!.) + return + for(var/obj/item/organ/external/bodypart in organs) + // todo: check biology + if(!bodypart.physiology.revert(modifier)) + // todo: optimize? + bodypart.rebuild_physiology() + for(var/datum/physiology_modifier/rebuilding as anything in physiology_modifiers) + // todo: check biology + bodypart.physiology.apply(rebuilding) + +/mob/living/carbon/rebuild_physiology() + . = ..() + // at this point, physiology_modifier is a list of datums. + for(var/obj/item/organ/external/bodypart in organs) + bodypart.rebuild_physiology() + for(var/datum/physiology_modifier/modifier as anything in physiology_modifiers) + // todo: check biology + bodypart.physiology.apply(modifier) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 1e0775294e..058777a602 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -106,10 +106,53 @@ return 1 // todo: refactor above -//? Raw "damage" -// todo: better name -// /mob/living/proc/damage_brute() +//* Raw Damage *// + +/** + * @params + * * brute - brute damage to take + * * burn - burn damage to take + * * damage_mode - DAMAGE_MODE_* flags for the form of this damage + * * weapon_descriptor - a string describing how it happened ("flash burns", "multiple precision cuts", etc) + * + * @return amount taken + */ +/mob/living/proc/take_random_targeted_damage(brute, burn, damage_mode, weapon_descriptor) + return take_targeted_damage(brute, burn, damage_mode, pick(GLOB.body_zones), weapon_descriptor) + +/** + * @params + * * brute - brute damage to take + * * burn - burn damage to take + * * damage_mode - DAMAGE_MODE_* flags for the form of this damage + * * body_zone - body zone define (BP_*) + * * weapon_descriptor - a string describing how it happened ("flash burns", "multiple precision cuts", etc) + * * defer_updates - update health / perform damage checks? + * + * @return amount taken + */ +/mob/living/proc/take_targeted_damage(brute, burn, damage_mode, body_zone, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + // todo: don't update health immediately + . = adjustBruteLoss(brute) + adjustFireLoss(burn) + +/** + * @params + * * brute - brute damage to take + * * burn - burn damage to take + * * damage_mode - DAMAG_EMODE_* flags for the form of this damage + * * weapon descriptor - a string describing how it happened ("flash burns", "multiple precision cuts", etc) + * * defer_updates - update health / perform damage checks? + * + * @return amount taken + */ +/mob/living/proc/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + // todo: don't update health immediately + . = adjustBruteLoss(brute) + adjustFireLoss(burn) //? Afflictions /** diff --git a/code/modules/mob/living/defense.dm b/code/modules/mob/living/defense.dm index bf3bcbff25..ea14518ae1 100644 --- a/code/modules/mob/living/defense.dm +++ b/code/modules/mob/living/defense.dm @@ -337,7 +337,7 @@ //This is called when the mob is thrown into a dense turf /mob/living/proc/turf_collision(var/turf/T, var/speed) - src.take_organ_damage(speed*5) + src.take_random_targeted_damage(brute = speed*5) /mob/living/proc/near_wall(var/direction,var/distance=1) var/turf/T = get_step(get_turf(src),direction) @@ -535,6 +535,8 @@ var/button_number = 0 for(var/datum/action/A in actions) + if(!A.button_visibility) + continue button_number++ var/atom/movable/screen/movable/action_button/B = A.button diff --git a/code/modules/mob/living/health.dm b/code/modules/mob/living/health.dm index 1e31970521..d5f9d9ea5d 100644 --- a/code/modules/mob/living/health.dm +++ b/code/modules/mob/living/health.dm @@ -5,7 +5,10 @@ health = 100 set_stat(CONSCIOUS) else + var/old_health = health health = getMaxHealth() - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss() - halloss + if(old_health != health) + update_hud_med_health() /mob/living/update_stat(forced, update_mobility) if(stat == DEAD) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 56c8852dd2..fccee1a68b 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -73,10 +73,10 @@ /mob/living/proc/handle_random_events() return -/mob/living/proc/handle_environment(var/datum/gas_mixture/environment) - return - -/mob/living/proc/handle_stomach() +/** + * Handle exposure to the environment, whether atmospherics or otherwise. + */ +/mob/living/proc/handle_environment(datum/gas_mixture/environment) return /mob/living/proc/update_pulling() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 926b646f73..f90f46f691 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -112,9 +112,9 @@ default behaviour is: var/divided_damage = (burn_amount)/(H.organs.len) var/extradam = 0 //added to when organ is at max dam for(var/obj/item/organ/external/affecting in H.organs) - if(!affecting) continue - if(affecting.take_damage(0, divided_damage+extradam)) //TODO: fix the extradam stuff. Or, ebtter yet...rewrite this entire proc ~Carn - H.UpdateDamageIcon() + affecting.inflict_bodypart_damage( + burn = divided_damage + extradam, + ) H.update_health() return 1 else if(istype(src, /mob/living/silicon/ai)) @@ -449,26 +449,12 @@ default behaviour is: adjustFireLoss(-burn) src.update_health() -// damage ONE external organ, organ gets randomly selected from damaged ones. -/mob/living/proc/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0) - if(status_flags & STATUS_GODMODE) return 0 //godmode - adjustBruteLoss(brute) - adjustFireLoss(burn) - src.update_health() - // heal MANY external organs, in random order /mob/living/proc/heal_overall_damage(var/brute, var/burn) adjustBruteLoss(-brute) adjustFireLoss(-burn) src.update_health() -// damage MANY external organs, in random order -/mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null) - if(status_flags & STATUS_GODMODE) return 0 //godmode - adjustBruteLoss(brute) - adjustFireLoss(burn) - src.update_health() - /mob/living/proc/restore_all_organs() return @@ -762,21 +748,6 @@ default behaviour is: /mob/living/proc/needs_to_breathe() return !isSynthetic() -/mob/living/vv_get_header() - . = ..() - . += {" - [src] -
[ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"] -
- BRUTE:[getBruteLoss()] - FIRE:[getFireLoss()] - TOXIN:[getToxLoss()] - OXY:[getOxyLoss()] - CLONE:[getCloneLoss()] - BRAIN:[getBrainLoss()] - - "} - /** *! Enable this one if you're enabling the butchering component. Otherwise it's useless. /mob/living/proc/harvest(mob/living/user) //used for extra objects etc. in butchering diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 1a6aedd103..3a0496bfc6 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -249,6 +249,13 @@ var/list/channel_to_radio_key = new verb = speaking.speech_verb w_not_heard = "[speaking.speech_verb] something [w_adverb]" + var/list/message_args = list("message" = message, "whispering" = whispering, "cancelled" = FALSE) + + SEND_SIGNAL(src, COMSIG_MOB_SAY, message_args) + + if(message_args["cancelled"]) + return + //For speech disorders (hulk, slurring, stuttering) if(!(speaking && (speaking.language_flags & LANGUAGE_NO_STUTTER || speaking.language_flags & LANGUAGE_SIGNLANG))) var/list/message_data = list(message, verb, whispering) diff --git a/code/modules/mob/living/silicon/pai/actions.dm b/code/modules/mob/living/silicon/pai/actions.dm new file mode 100644 index 0000000000..dee8c3e1fd --- /dev/null +++ b/code/modules/mob/living/silicon/pai/actions.dm @@ -0,0 +1,89 @@ +/datum/action/pai + button_icon = 'icons/screen/actions/pai.dmi' + var/update_on_grant = FALSE + var/update_on_chassis_change = FALSE + +/// Toggle unfolding/collapsing chassis +/datum/action/pai/toggle_fold + name = "Unfold Chassis" + desc = "Unfold Chassis" + button_icon_state = "pai" + update_on_grant = TRUE + update_on_chassis_change = TRUE + +/datum/action/pai/toggle_fold/on_trigger(mob/living/silicon/pai/user) + if(user.loc == user.shell) + user.open_up_safe() + else + user.close_up_safe() + +/datum/action/pai/toggle_fold/update_button() + var/mob/living/silicon/pai/user = owner + if(!istype(user)) + return + + if(user.loc == user.shell) + name = "Unfold Chassis" + desc = "Unfold Chassis" + button_icon = user.icon + button_icon_state = user.icon_state + else + name = "Collapse Chassis" + desc = "Collapse Chassis" + button_icon = user.shell.icon + button_icon_state = user.shell.icon_state + + ..() + +/// Change chassis +/datum/action/pai/change_chassis + name = "Change Chassis" + desc = "Select a different chassis" + button_icon_state = "pai_chassis_change" + +/datum/action/pai/change_chassis/on_trigger(mob/living/silicon/pai/user) + user.update_chassis() + +/// Revert to card +/// This only shows if your shell is not currently the card, otherwise this action is hidden +/datum/action/pai/revert_to_card + name = "Revert To Card" + desc = "Revert your shell back to card-form" + button_icon_state = "pai_shell_revert" + update_on_chassis_change = TRUE + +/datum/action/pai/revert_to_card/on_trigger(mob/living/silicon/pai/user) + user.revert_to_card() + +/datum/action/pai/revert_to_card/update_button() + ..() + + var/mob/living/silicon/pai/user = owner + button_visibility = (user.shell != user.card) + +/// Clothing Transform +/datum/action/pai/clothing_transform + name = "Clothing Transform" + desc = "Change shell to clothing form" + button_icon_state = "pai_clothing" + update_on_chassis_change = TRUE + +/datum/action/pai/clothing_transform/on_trigger(mob/living/silicon/pai/user) + user.change_to_clothing() + +/// Hologram Display (show scanned object from card form) +/// This only shows if you are in card form, otherwise this action is hidden +/datum/action/pai/hologram_display + name = "Hologram Display" + desc = "Display a scanned object as a hologram" + button_icon_state = "pai_hologram_display" + update_on_chassis_change = TRUE + +/datum/action/pai/hologram_display/on_trigger(mob/living/silicon/pai/user) + user.card_hologram_display() + +/datum/action/pai/hologram_display/update_button() + ..() + + var/mob/living/silicon/pai/user = owner + button_visibility = (user.loc == user.card) diff --git a/code/modules/mob/living/silicon/pai/mobility.dm b/code/modules/mob/living/silicon/pai/mobility.dm index cfc5398187..dd233dcf50 100644 --- a/code/modules/mob/living/silicon/pai/mobility.dm +++ b/code/modules/mob/living/silicon/pai/mobility.dm @@ -3,12 +3,11 @@ return FALSE ..() -/mob/living/silicon/pai/proc/close_up() - // we can't close up if already inside our shell +/mob/living/silicon/pai/proc/close_up_safe() + /// We can't close up if already inside our shell if(src.loc == shell) return - // we check mobility here to stop people folding up if they currently cannot move if(!CHECK_MOBILITY(src, MOBILITY_CAN_MOVE)) return @@ -19,19 +18,22 @@ if(!can_action()) return - last_special = world.time + 20 + close_up() + + last_special = world.time + 2 SECONDS +/mob/living/silicon/pai/proc/close_up() release_vore_contents() stop_pulling() - // If we are being held, handle removing our holder from their inv. + /// If we are being held, handle removing our holder from their inv. var/obj/item/holder/H = loc if(istype(H)) H.forceMove(get_turf(src)) forceMove(get_turf(src)) - // Move us into the shell and move the shell to the ground. + /// Move us into the shell and move the shell to the ground. transform_component.put_in_object() update_perspective() @@ -40,11 +42,22 @@ update_mobility() update_icon() remove_verb(src, /mob/living/silicon/pai/proc/pai_nom) + update_chassis_actions() -/mob/living/silicon/pai/proc/open_up() - last_special = world.time + 20 +/mob/living/silicon/pai/proc/open_up_safe() + /// Don't check mobility here because while folded up, you can't move + if(!can_action()) + return + /// To fold out the pAI needs to be in the shell + if(src.loc != shell) + return + + open_up() - // stops unfolding in hardsuits and vore bellies, if implanted you explode out + last_special = world.time + 2 SECONDS + +/mob/living/silicon/pai/proc/open_up() + /// Stops unfolding in hardsuits and vore bellies, if implanted you explode out if(istype(shell.loc,/obj/item/hardsuit_module)) to_chat(src, "There is no room to unfold inside this hardsuit module. You're good and stuck.") return FALSE @@ -58,7 +71,9 @@ var/mob/living/carbon/human/H = holder for(var/obj/item/organ/external/affecting in H.organs) if(shell in affecting.implants) - affecting.take_damage(rand(30,50)) + affecting.inflict_bodypart_damage( + brute = rand(30, 50), + ) affecting.implants -= shell H.visible_message("\The [src] explodes out of \the [H]'s [affecting.name] in shower of gore!") break @@ -67,7 +82,7 @@ var/obj/item/pda/holder = shell.loc holder.pai = null - // handle the actual object stuffing via the component, essentially swapping their loc's around + /// Handle the actual object stuffing via the component, essentially swapping their loc's around transform_component.put_in_mob() update_perspective() @@ -76,7 +91,7 @@ if(istype(card)) card.screen_loc = null - // we might not actually be on a turf after the object stuffing, so make sure we are + /// Possible to not be on a turf after the object stuffing, so make sure var/turf/T = get_turf(src) if(istype(T)) src.forceMove(T) @@ -85,8 +100,9 @@ add_verb(src, /mob/living/silicon/pai/proc/pai_nom) card.stop_displaying_hologram() update_icon() + update_chassis_actions() -// Handle being picked up. +/// Handle being picked up. /mob/living/silicon/pai/get_scooped(var/mob/living/carbon/grabber, var/self_drop) var/obj/item/holder/H = ..(grabber, self_drop) if(!istype(H)) @@ -97,12 +113,12 @@ grabber.update_inv_r_hand() return H -// handle movement speed +/// Handle movement speed /mob/living/silicon/pai/movement_delay() return ..() + speed -// this is a general check for if we can do things such as fold in/out or perform other special actions -// (basically if some condition should be checked upon the use of all mob abilities like closing/opening the shell it goes here instead) +/// This is a general check for if the pAI can do things such as fold in/out or perform other special actions +/// (basically if some condition should be checked upon the use of all mob abilities like closing/opening the shell it goes here instead) /mob/living/silicon/pai/proc/can_action() if(world.time <= last_special) return FALSE @@ -112,11 +128,11 @@ return TRUE -// space movement (we get one ion burst every 3 seconds) +/// Space movement (pAI gets one ion burst every 3 seconds) /mob/living/silicon/pai/Process_Spacemove(movement_dir = NONE) . = ..() if(!. && src.loc != shell) - if(world.time >= last_space_movement + 30) + if(world.time >= last_space_movement + 3 SECONDS) last_space_movement = world.time // place an effect for the movement new /obj/effect/temp_visual/pai_ion_burst(get_turf(src)) @@ -141,13 +157,13 @@ var/desired_scale_y = size_multiplier * icon_scale_y M.Scale(desired_scale_x, desired_scale_y) M.Translate(0, 16*(desired_scale_y-1)) - // no chassis means we're using a hologram + /// No chassis means pAI is using a hologram var/turning_value_to_use = 0 if(!chassis) turning_value_to_use = lying - // handle turning + /// Handle turning M.Turn(turning_value_to_use) - // extremely lazy heuristic to see if we should shift down to appear to be, well, down. + /// Extremely lazy heuristic to see if we should shift down to appear to be, well, down. if(turning_value_to_use < -45 || turning_value_to_use > 45) M.Translate(1,-6) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 6713a78c7d..d2fb19a1db 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -119,6 +119,12 @@ var/list/scanned_objects = list() var/last_scanned_time = 0 + var/list/actions_to_grant = list(/datum/action/pai/toggle_fold, + /datum/action/pai/change_chassis, + /datum/action/pai/clothing_transform, + /datum/action/pai/revert_to_card, + /datum/action/pai/hologram_display) + /mob/living/silicon/pai/Initialize(mapload) . = ..() shell = loc @@ -132,6 +138,8 @@ card.radio = new /obj/item/radio(src.card) radio = card.radio + /// Verbs & Actions + generate_actions() add_verb(src, /mob/living/silicon/pai/proc/choose_chassis) add_verb(src, /mob/living/silicon/pai/proc/choose_verbs) add_verb(src, /mob/living/proc/set_size) @@ -264,6 +272,8 @@ if(!istype(new_shell, /obj/item/paicard)) RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, PROC_REF(pass_attack_self_to_card)) + update_chassis_actions() + // changing the shell into clothing /mob/living/silicon/pai/proc/change_shell_by_path(obj/item/clothing/object_path) if(!can_change_shell()) @@ -344,3 +354,113 @@ /mob/living/silicon/pai/get_centering_pixel_x_offset(dir) return base_pixel_x + (WORLD_ICON_SIZE - icon_x_dimension) / 2 + +/mob/living/silicon/pai/proc/update_chassis() + var/original_chassis = chassis + var/choice + var/finalized = "No" + while(finalized == "No" && src.client) + + choice = tgui_input_list(usr, "What would you like to use for your mobile chassis icon?", "Options", list("-- LOAD CHARACTER SLOT --") + possible_chassis) + if(!choice) + chassis = original_chassis + return + + if(choice == "-- LOAD CHARACTER SLOT --") + last_rendered_hologram_icon = get_holo_image() + card.cached_holo_image = null + card.get_holo_image() + icon = last_rendered_hologram_icon + chassis = possible_chassis[choice] + update_icon(FALSE) + else + icon = 'icons/mob/pai_vr.dmi' + chassis = possible_chassis[choice] + update_icon(FALSE) + + finalized = alert("Look at your sprite. Is this what you wish to use?",,"No","Yes") + + add_verb(src, /mob/living/proc/hide) + update_icon(FALSE) + update_chassis_actions() + +/mob/living/silicon/pai/proc/revert_to_card() + if(!can_change_shell()) + return + if(!card || card.loc != src || card == shell) + return + switch_shell(card) + +/mob/living/silicon/pai/proc/change_to_clothing() + if(!can_change_shell()) + return + + var/clothing_entry = tgui_input_list(usr, "What clothing would you like to change your shell to?", "Options", list("Chameleon Clothing List","Last Uploaded Clothing")) + if(clothing_entry) + if(clothing_entry == "Chameleon Clothing List") + var/clothing_type_entry = tgui_input_list(usr, "What type of clothing would you like to change your shell to?", "Clothing Type", list("Undershirt", "Suit", "Hat", "Shoes", "Gloves", "Mask", "Glasses", "Accessory")) + var/list/clothing_for_type + if(clothing_type_entry) + switch(clothing_type_entry) + if("Undershirt") + clothing_for_type = GLOB.clothing_under + if("Suit") + clothing_for_type = GLOB.clothing_suit + if("Hat") + clothing_for_type = GLOB.clothing_head + if("Shoes") + clothing_for_type = GLOB.clothing_shoes + if("Gloves") + clothing_for_type = GLOB.clothing_gloves + if("Mask") + clothing_for_type = GLOB.clothing_mask + if("Glasses") + clothing_for_type = GLOB.clothing_glasses + if("Accessory") + clothing_for_type = GLOB.clothing_accessory + var/clothing_item_entry = tgui_input_list(usr, "Choose clothing item", "Clothing", clothing_for_type) + if(clothing_item_entry) + change_shell_by_path(clothing_for_type[clothing_item_entry]) + else if(clothing_entry == "Last Uploaded Clothing") + if(last_uploaded_path && can_change_shell()) + last_special = world.time + 20 + var/state = initial(last_uploaded_path.icon_state) + var/icon = initial(last_uploaded_path.icon) + var/obj/item/clothing/new_clothing = new base_uploaded_path + new_clothing.forceMove(src.loc) + new_clothing.name = "[src.name] (pAI)" + new_clothing.desc = src.desc + new_clothing.icon = icon + new_clothing.icon_state = state + new_clothing.add_atom_colour(uploaded_color, FIXED_COLOUR_PRIORITY) + + var/obj/item/clothing/under/U = new_clothing + if(istype(U)) + U.snowflake_worn_state = uploaded_snowflake_worn_state + + switch_shell(new_clothing) + +/mob/living/silicon/pai/proc/card_hologram_display() + if(src.loc == card) + var/scanned_item_to_show = tgui_input_list(usr, "Select Scanned Object", "Scanned Objects", list("Cancel") + scanned_objects) + if(scanned_item_to_show) + if(scanned_item_to_show == "Cancel") + card.stop_displaying_hologram() + else + var/image/I = scanned_objects[scanned_item_to_show] + card.display_hologram_from_image(I) + else + to_chat(src, "You must be in card form to do this!") + +/mob/living/silicon/pai/proc/generate_actions() + for(var/path in actions_to_grant) + var/datum/action/pai/A = new path() + A.grant(src) + if(A.update_on_grant) + A.update_button() + +/mob/living/silicon/pai/proc/update_chassis_actions() + for(var/datum/action/pai/A in actions) + if(A.update_on_chassis_change) + A.update_button() + update_action_buttons() diff --git a/code/modules/mob/living/silicon/pai/verbs.dm b/code/modules/mob/living/silicon/pai/verbs.dm index f11d0484b0..f8b0400157 100644 --- a/code/modules/mob/living/silicon/pai/verbs.dm +++ b/code/modules/mob/living/silicon/pai/verbs.dm @@ -2,61 +2,19 @@ set category = "pAI Commands" set name = "Unfold Chassis" - // see pai/mobility.dm - // we don't check mobility here because while folded up, you can't move - if(!can_action()) - return - // to fold out we need to be in the shell - if(src.loc != shell) - return - - open_up() + open_up_safe() /mob/living/silicon/pai/verb/fold_up() set category = "pAI Commands" set name = "Collapse Chassis" - // we check mobility here to stop people folding up if they currently cannot move - if(!CHECK_MOBILITY(src, MOBILITY_CAN_MOVE)) - return - if(!can_action()) - return - // to fold up we need to not be in the card already - if(src.loc == shell) - return - - close_up() + close_up_safe() /mob/living/silicon/pai/proc/choose_chassis() set category = "pAI Commands" set name = "Choose Chassis" - var/original_chassis = chassis - var/choice - var/finalized = "No" - while(finalized == "No" && src.client) - - choice = input(usr,"What would you like to use for your mobile chassis icon?") as null|anything in (list("-- LOAD CHARACTER SLOT --") + possible_chassis) - if(!choice) - chassis = original_chassis - return - - if(choice == "-- LOAD CHARACTER SLOT --") - last_rendered_hologram_icon = get_holo_image() - card.cached_holo_image = null - card.get_holo_image() - icon = last_rendered_hologram_icon - chassis = possible_chassis[choice] - update_icon(FALSE) - else - icon = 'icons/mob/pai_vr.dmi' - chassis = possible_chassis[choice] - update_icon(FALSE) - - finalized = alert("Look at your sprite. Is this what you wish to use?",,"No","Yes") - - add_verb(src, /mob/living/proc/hide) - update_icon(FALSE) + update_chassis() /mob/living/silicon/pai/proc/choose_verbs() set category = "pAI Commands" @@ -132,77 +90,18 @@ set category = "pAI Commands" set desc = "Allows you to transform your shell into clothing." - if(!can_change_shell()) - return - - var/clothing_entry = tgui_input_list(usr, "What clothing would you like to change your shell to?", "Options", list("Chameleon Clothing List","Last Uploaded Clothing")) - if(clothing_entry) - if(clothing_entry == "Chameleon Clothing List") - var/clothing_type_entry = tgui_input_list(usr, "What type of clothing would you like to change your shell to?", "Clothing Type", list("Undershirt", "Suit", "Hat", "Shoes", "Gloves", "Mask", "Glasses", "Accessory")) - var/list/clothing_for_type - if(clothing_type_entry) - switch(clothing_type_entry) - if("Undershirt") - clothing_for_type = GLOB.clothing_under - if("Suit") - clothing_for_type = GLOB.clothing_suit - if("Hat") - clothing_for_type = GLOB.clothing_head - if("Shoes") - clothing_for_type = GLOB.clothing_shoes - if("Gloves") - clothing_for_type = GLOB.clothing_gloves - if("Mask") - clothing_for_type = GLOB.clothing_mask - if("Glasses") - clothing_for_type = GLOB.clothing_glasses - if("Accessory") - clothing_for_type = GLOB.clothing_accessory - var/clothing_item_entry = tgui_input_list(usr, "Choose clothing item", "Clothing", clothing_for_type) - if(clothing_item_entry) - change_shell_by_path(clothing_for_type[clothing_item_entry]) - else if(clothing_entry == "Last Uploaded Clothing") - if(last_uploaded_path && can_change_shell()) - last_special = world.time + 20 - var/state = initial(last_uploaded_path.icon_state) - var/icon = initial(last_uploaded_path.icon) - var/obj/item/clothing/new_clothing = new base_uploaded_path - new_clothing.forceMove(src.loc) - new_clothing.name = "[src.name] (pAI)" - new_clothing.desc = src.desc - new_clothing.icon = icon - new_clothing.icon_state = state - new_clothing.add_atom_colour(uploaded_color, FIXED_COLOUR_PRIORITY) - - var/obj/item/clothing/under/U = new_clothing - if(istype(U)) - U.snowflake_worn_state = uploaded_snowflake_worn_state - - switch_shell(new_clothing) + change_to_clothing() /mob/living/silicon/pai/verb/revert_shell_to_card() set name = "Reset Shell" set category = "pAI Commands" set desc = "Reverts your shell back to card form." - if(!can_change_shell()) - return - if(!card || card.loc != src || card == shell) - return - switch_shell(card) + revert_to_card() /mob/living/silicon/pai/verb/hologram_display() set name = "Hologram Display" set category = "pAI Commands" set desc = "Allows you to pick a scanned object to display from your holoprojector." - if(src.loc == card) - var/scanned_item_to_show = tgui_input_list(usr, "Select Scanned Object", "Scanned Objects", list("Cancel") + scanned_objects) - if(scanned_item_to_show) - if(scanned_item_to_show == "Cancel") - card.stop_displaying_hologram() - else - var/image/I = scanned_objects[scanned_item_to_show] - card.display_hologram_from_image(I) - else - to_chat(src, "You must be in card form to do this!") + card_hologram_display() diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index cedecbc750..e17ba0fe0a 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -39,7 +39,7 @@ installed = -1 uninstall() -/datum/robot_component/proc/take_damage_legacy(brute, electronics, sharp, edge) +/datum/robot_component/proc/take_damage_legacy(brute, electronics) if(installed != 1) return brute_damage += brute diff --git a/code/modules/mob/living/silicon/robot/damage_procs.dm b/code/modules/mob/living/silicon/robot/damage_procs.dm new file mode 100644 index 0000000000..29c13838be --- /dev/null +++ b/code/modules/mob/living/silicon/robot/damage_procs.dm @@ -0,0 +1,75 @@ +//* Raw Damage *// + +/mob/living/silicon/robot/take_targeted_damage(brute, burn, damage_mode, body_zone, weapon_descriptor, defer_updates) + var/list/components = get_damageable_components() + if(!components.len) + return + + //Combat shielding absorbs a percentage of damage directly into the cell. + if(has_active_type(/obj/item/borg/combat/shield)) + var/obj/item/borg/combat/shield/shield = locate() in src + if(shield && shield.active) + //Shields absorb a certain percentage of damage based on their power setting. + var/absorb_brute = brute*shield.shield_level + var/absorb_burn = burn*shield.shield_level + var/cost = (absorb_brute+absorb_burn) * 25 + + cell.charge -= cost + if(cell.charge <= 0) + cell.charge = 0 + to_chat(src, "Your shield has overloaded!") + else + brute -= absorb_brute + burn -= absorb_burn + to_chat(src, "Your shield absorbs some of the impact!") + + if(!(damage_mode & DAMAGE_MODE_INTERNAL)) + var/datum/robot_component/armour/A = get_armour() + if(A) + A.take_damage_legacy(brute,burn) + return + + var/datum/robot_component/C = pick(components) + C.take_damage_legacy(brute,burn) + +/mob/living/silicon/robot/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return //godmode + var/list/datum/robot_component/parts = get_damageable_components() + + //Combat shielding absorbs a percentage of damage directly into the cell. + if(has_active_type(/obj/item/borg/combat/shield)) + var/obj/item/borg/combat/shield/shield = locate() in src + if(shield) + //Shields absorb a certain percentage of damage based on their power setting. + var/absorb_brute = brute*shield.shield_level + var/absorb_burn = burn*shield.shield_level + var/cost = (absorb_brute+absorb_burn) * 25 + + cell.charge -= cost + if(cell.charge <= 0) + cell.charge = 0 + to_chat(src, "Your shield has overloaded!") + else + brute -= absorb_brute + burn -= absorb_burn + to_chat(src, "Your shield absorbs some of the impact!") + + var/datum/robot_component/armour/A = get_armour() + if(A) + A.take_damage_legacy(brute,burn) + return + + while(parts.len && (brute>0 || burn>0) ) + var/datum/robot_component/picked = pick(parts) + + var/brute_was = picked.brute_damage + var/burn_was = picked.electronics_damage + + picked.take_damage_legacy(brute,burn) + + brute -= (picked.brute_damage - brute_was) + burn -= (picked.electronics_damage - burn_was) + + parts -= picked + diff --git a/code/modules/mob/living/silicon/robot/drone/damage_procs.dm b/code/modules/mob/living/silicon/robot/drone/damage_procs.dm new file mode 100644 index 0000000000..4b97e71409 --- /dev/null +++ b/code/modules/mob/living/silicon/robot/drone/damage_procs.dm @@ -0,0 +1,15 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* Raw Damage *// + +/mob/living/silicon/robot/drone/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + // for now, we don't do anything other than give raw damage as drones don't simulate like robots do + bruteloss += brute + fireloss += burn + if(!defer_updates) + update_health() + return brute + burn + +/mob/living/silicon/robot/drone/take_targeted_damage(brute, burn, damage_mode, body_zone, weapon_descriptor, defer_updates) + return take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index edc82f8470..e11d2eab33 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -14,7 +14,7 @@ /obj/machinery/computer/drone_control/attack_ai(var/mob/user as mob) return src.attack_hand(user) -/obj/machinery/computer/drone_control/ui_status(mob/user) +/obj/machinery/computer/drone_control/ui_status(mob/user, datum/ui_state/state) if(!allowed(user)) return UI_CLOSE return ..() @@ -31,7 +31,7 @@ ui = new(user, src, "DroneConsole", name) ui.open() -/obj/machinery/computer/drone_control/ui_data(mob/user) +/obj/machinery/computer/drone_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/drones = list() @@ -59,7 +59,7 @@ return data -/obj/machinery/computer/drone_control/ui_act(action, params) +/obj/machinery/computer/drone_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm index 1c7e39ca74..b5fbb33c7e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm @@ -1,7 +1,4 @@ //Redefining some robot procs, since drones can't be repaired and really shouldn't take component damage. -/mob/living/silicon/robot/drone/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null) - bruteloss += brute - fireloss += burn /mob/living/silicon/robot/drone/heal_overall_damage(var/brute, var/burn) @@ -11,9 +8,6 @@ if(bruteloss<0) bruteloss = 0 if(fireloss<0) fireloss = 0 -/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/emp = 0) - take_overall_damage(brute,burn) - /mob/living/silicon/robot/drone/heal_organ_damage(var/brute, var/burn) heal_overall_damage(brute,burn) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 4e2d8dba1b..ae3ee58572 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -495,6 +495,13 @@ set name = "Emit Sparks" spark_system.start() +/mob/living/silicon/robot/verb/toggle_cover() + set category = "Robot Commands" + set name = "Toggle Cover" + locked = !locked + to_chat(src, "You [ locked ? "lock" : "unlock"] your interface.") + updateicon() + // this function returns the robots jetpack, if one is installed /mob/living/silicon/robot/proc/installed_jetpack() if(module) @@ -1129,7 +1136,7 @@ cleaned_human.clean_blood(1) to_chat(cleaned_human, "[src] cleans your face!") - if((module_state_1 && istype(module_state_1, /obj/item/storage/bag/ore)) || (module_state_2 && istype(module_state_2, /obj/item/storage/bag/ore)) || (module_state_3 && istype(module_state_3, /obj/item/storage/bag/ore))) //Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use. + if(istype(module_state_1, /obj/item/storage/bag/ore) || istype(module_state_2, /obj/item/storage/bag/ore) || istype(module_state_3, /obj/item/storage/bag/ore)) //Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use. var/obj/item/storage/bag/ore/B = null if(istype(module_state_1, /obj/item/storage/bag/ore)) //First orebag has priority, if they for some reason have multiple. B = module_state_1 diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 25b5c49bdc..fe12049464 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -62,38 +62,6 @@ var/datum/robot_component/picked = pick(parts) picked.heal_damage(brute,burn) -/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0) - var/list/components = get_damageable_components() - if(!components.len) - return - - //Combat shielding absorbs a percentage of damage directly into the cell. - if(has_active_type(/obj/item/borg/combat/shield)) - var/obj/item/borg/combat/shield/shield = locate() in src - if(shield && shield.active) - //Shields absorb a certain percentage of damage based on their power setting. - var/absorb_brute = brute*shield.shield_level - var/absorb_burn = burn*shield.shield_level - var/cost = (absorb_brute+absorb_burn) * 25 - - cell.charge -= cost - if(cell.charge <= 0) - cell.charge = 0 - to_chat(src, "Your shield has overloaded!") - else - brute -= absorb_brute - burn -= absorb_burn - to_chat(src, "Your shield absorbs some of the impact!") - - if(!emp) - var/datum/robot_component/armour/A = get_armour() - if(A) - A.take_damage_legacy(brute,burn,sharp,edge) - return - - var/datum/robot_component/C = pick(components) - C.take_damage_legacy(brute,burn,sharp,edge) - /mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn) var/list/datum/robot_component/parts = get_damaged_components(brute,burn) @@ -109,47 +77,3 @@ burn -= (burn_was-picked.electronics_damage) parts -= picked - -/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null) - if(status_flags & STATUS_GODMODE) return //godmode - var/list/datum/robot_component/parts = get_damageable_components() - - //Combat shielding absorbs a percentage of damage directly into the cell. - if(has_active_type(/obj/item/borg/combat/shield)) - var/obj/item/borg/combat/shield/shield = locate() in src - if(shield) - //Shields absorb a certain percentage of damage based on their power setting. - var/absorb_brute = brute*shield.shield_level - var/absorb_burn = burn*shield.shield_level - var/cost = (absorb_brute+absorb_burn) * 25 - - cell.charge -= cost - if(cell.charge <= 0) - cell.charge = 0 - to_chat(src, "Your shield has overloaded!") - else - brute -= absorb_brute - burn -= absorb_burn - to_chat(src, "Your shield absorbs some of the impact!") - - var/datum/robot_component/armour/A = get_armour() - if(A) - A.take_damage_legacy(brute,burn,sharp) - return - - while(parts.len && (brute>0 || burn>0) ) - var/datum/robot_component/picked = pick(parts) - - var/brute_was = picked.brute_damage - var/burn_was = picked.electronics_damage - - picked.take_damage_legacy(brute,burn) - - brute -= (picked.brute_damage - brute_was) - burn -= (picked.electronics_damage - burn_was) - - parts -= picked - -/mob/living/silicon/robot/emp_act(severity) - uneq_all() - ..() //Damage is handled at /silicon/ level. diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index ec554610ae..691cb0625e 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -115,16 +115,16 @@ /mob/living/silicon/emp_act(severity) switch(severity) if(1) - src.take_organ_damage(0,20,emp=1) + src.take_random_targeted_damage(brute = 0, burn = 20, damage_mode = DAMAGE_MODE_INTERNAL, weapon_descriptor = "electromagnetic surge") Confuse(5) if(2) - src.take_organ_damage(0,15,emp=1) + src.take_random_targeted_damage(brute = 0, burn = 15, damage_mode = DAMAGE_MODE_INTERNAL, weapon_descriptor = "electromagnetic surge") Confuse(4) if(3) - src.take_organ_damage(0,10,emp=1) + src.take_random_targeted_damage(brute = 0, burn = 10, damage_mode = DAMAGE_MODE_INTERNAL, weapon_descriptor = "electromagnetic surge") Confuse(3) if(4) - src.take_organ_damage(0,5,emp=1) + src.take_random_targeted_damage(brute = 0, burn = 5, damage_mode = DAMAGE_MODE_INTERNAL, weapon_descriptor = "electromagnetic surge") Confuse(2) flash_eyes(affect_silicon = 1) to_chat(src, "*BZZZT*") diff --git a/code/modules/mob/living/simple_mob/subtypes/lavaland/stormdrifter.dm b/code/modules/mob/living/simple_mob/subtypes/lavaland/stormdrifter.dm index 48e64c211f..80ff1f1fb6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/lavaland/stormdrifter.dm +++ b/code/modules/mob/living/simple_mob/subtypes/lavaland/stormdrifter.dm @@ -139,11 +139,14 @@ /mob/living/simple_mob/animal/stormdrifter/bull/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/tool/wirecutters) || is_sharp(O)) - to_chat(user, "You amputate the [src]'s stingers! It may now be domesticated!") - neutered = 1 - legacy_melee_damage_lower = 5 - legacy_melee_damage_upper = 10 - ai_holder_type = /datum/ai_holder/simple_mob/stormdrifter/bull_neutered + if(!neutered) + to_chat(user, "You amputate the [src]'s stingers! It may now be domesticated!") + neutered = 1 + legacy_melee_damage_lower = 5 + legacy_melee_damage_upper = 10 + ai_holder_type = /datum/ai_holder/simple_mob/stormdrifter/bull_neutered + else + return ..() if(istype(O, /obj/item/saddle/stormdrifter) && !rideable) if(!neutered) diff --git a/code/modules/mob/living/throwing.dm b/code/modules/mob/living/throwing.dm index 34d38ceda0..3f1db65b03 100644 --- a/code/modules/mob/living/throwing.dm +++ b/code/modules/mob/living/throwing.dm @@ -64,7 +64,7 @@ newtonian_move(get_dir(target, src)) - throwing.throw_at(target, the_range, null, (a_intent == INTENT_HELP? THROW_AT_IS_NEAT : NONE) | (overhand? THROW_AT_OVERHAND : NONE), src, force = impulse) + throwing.throw_at(target, the_range, null, (a_intent != INTENT_HARM? THROW_AT_IS_NEAT : NONE) | (overhand? THROW_AT_OVERHAND : NONE), src, force = impulse) trigger_aiming(TARGET_CAN_CLICK) return TRUE diff --git a/code/modules/mob/living/vv.dm b/code/modules/mob/living/vv.dm new file mode 100644 index 0000000000..d002ab76e7 --- /dev/null +++ b/code/modules/mob/living/vv.dm @@ -0,0 +1,15 @@ + +/mob/living/vv_get_header() + . = ..() + . += {" + [src] +
[ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"] +
+ BRUTE:[getBruteLoss()] + FIRE:[getFireLoss()] + TOXIN:[getToxLoss()] + OXY:[getOxyLoss()] + CLONE:[getCloneLoss()] + BRAIN:[getBrainLoss()] + + "} diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 1820d5514a..74191dc0a1 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -1,3 +1,11 @@ +/** + * Linter check, do not call. + */ +/proc/lint__check_mob_login_doesnt_sleep() + SHOULD_NOT_SLEEP(TRUE) + var/mob/M + M.Login() + /** * Run when a client is put in this mob or reconnets to byond and their client was on this mob * diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm index 8cebd172f6..4bd4d81517 100644 --- a/code/modules/mob/logout.dm +++ b/code/modules/mob/logout.dm @@ -1,3 +1,12 @@ + +/** + * Linter check, do not call. + */ +/proc/lint__check_mob_logout_doesnt_sleep() + SHOULD_NOT_SLEEP(TRUE) + var/mob/M + M.Logout() + /mob/Logout() SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGOUT, client) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 46fcfc281a..b0ab80166f 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -879,7 +879,11 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) affected.implants -= selection H.shock_stage+=20 - affected.take_damage((selection.w_class * 3), 0, 0, 1, "Embedded object extraction") + affected.inflict_bodypart_damage( + brute = selection.w_class * 3, + damage_mode = DAMAGE_MODE_EDGE, + weapon_descriptor = "object removal", + ) if(prob(selection.w_class * 5) && (affected.robotic < ORGAN_ROBOT)) //I'M SO ANEMIC I COULD JUST -DIE-. affected.create_specific_wound(/datum/wound/internal_bleeding, min(selection.w_class * 5, 15)) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 5c7ee29c7e..4a6f712e0b 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -236,6 +236,7 @@ var/timeofdeath = 0 //?Living + // todo: go to carbon, simple mobs don't need environmental stabilization var/bodytemperature = 310.055 //98.7 F var/drowsyness = 0 //?Carbon diff --git a/code/modules/mob/new_player/join_menu.dm b/code/modules/mob/new_player/join_menu.dm index 7504ad42ab..4342134147 100644 --- a/code/modules/mob/new_player/join_menu.dm +++ b/code/modules/mob/new_player/join_menu.dm @@ -14,10 +14,10 @@ GLOBAL_DATUM_INIT(join_menu, /datum/join_menu, new) /datum/join_menu/proc/queue_update() addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, update_static_data)), 0, TIMER_UNIQUE | TIMER_OVERRIDE) -/datum/join_menu/ui_state(mob/user, datum/tgui_module/module) +/datum/join_menu/ui_state() return GLOB.explicit_new_player_state -/datum/join_menu/ui_static_data(mob/user) +/datum/join_menu/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() // every entry will have: // - faction @@ -89,7 +89,7 @@ GLOBAL_DATUM_INIT(join_menu, /datum/join_menu, new) ghostroles += list(ghostrole_data) // wrap list return data -/datum/join_menu/ui_data(mob/user) +/datum/join_menu/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() // common info goes into ui data var/level = "green" diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 107b16dd47..122742c194 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -450,7 +450,7 @@ var/obj/structure/AIcore/deactivated/C = GLOB.empty_playable_ai_cores[1] GLOB.empty_playable_ai_cores -= C - character.loc = C.loc + character.forceMove(C.loc) AnnounceCyborg(character, rank, "has been transferred to the empty core in \the [character.loc.loc]") SSticker.mode.latespawn(character) @@ -466,7 +466,7 @@ // Moving wheelchair if they have one if(character.buckled && istype(character.buckled, /obj/structure/bed/chair/wheelchair)) - character.buckled.loc = character.loc + character.buckled.forceMove(character.loc) character.buckled.setDir(character.dir) SSticker.mode.latespawn(character) diff --git a/code/modules/mob/observer/dead/observer_movement.dm b/code/modules/mob/observer/dead/observer_movement.dm index 887cda1815..6d632a3481 100644 --- a/code/modules/mob/observer/dead/observer_movement.dm +++ b/code/modules/mob/observer/dead/observer_movement.dm @@ -25,3 +25,6 @@ /mob/observer/dead/canface() return TRUE + +/mob/observer/dead/CanAllowThrough(atom/movable/mover, turf/target) + return TRUE // ghosts don't block diff --git a/code/modules/mob/observer/dead/orbit.dm b/code/modules/mob/observer/dead/orbit.dm index 51c04a647a..e3099ce859 100644 --- a/code/modules/mob/observer/dead/orbit.dm +++ b/code/modules/mob/observer/dead/orbit.dm @@ -6,7 +6,7 @@ qdel(src) owner = new_owner -/datum/orbit_menu/ui_state(mob/user) +/datum/orbit_menu/ui_state() return GLOB.observer_state /datum/orbit_menu/ui_interact(mob/user, datum/tgui/ui) @@ -15,7 +15,7 @@ ui = new(user, src, "Orbit") ui.open() -/datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return @@ -35,7 +35,7 @@ update_static_data() . = TRUE -/datum/orbit_menu/ui_static_data(mob/user) +/datum/orbit_menu/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/players = list() @@ -52,11 +52,17 @@ serialized["ref"] = REF(name) var/mob/M = name + + if(M == user) + continue//Should only really happen with observers, but just to be sure + if(!istype(M)) misc += list(serialized) continue if(isobserver(M)) + if(M.invisibility >= INVISIBILITY_MAXIMUM) + continue ghosts += list(serialized) else if(issimple(M)) simplemobs += list(serialized) diff --git a/code/modules/mob/physiology.dm b/code/modules/mob/physiology.dm index 8c548254a7..9fa1b0dbf0 100644 --- a/code/modules/mob/physiology.dm +++ b/code/modules/mob/physiology.dm @@ -1,15 +1,12 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + /** * physiology holder * * todo: on biologies update, we might need to lazy-cache this, and have different physiologies for each biology. */ /datum/global_physiology - // back-reference to mob, for vv purposes. - var/mob/ownership - - // todo: /datum/global_physiology should hold global body physiology, limbs should hold modifiers/whatever themselves. - // this way biologies can be supported as efficiently as possible. - /// carry baseline modify var/carry_strength = CARRY_STRENGTH_BASELINE /// carry penalty modifier @@ -23,10 +20,6 @@ /// carry weight bias - multipled to carry_bias for carry weight only, not encumbrance var/carry_weight_bias = 1 -/datum/global_physiology/Destroy() - ownership = null - return ..() - /datum/global_physiology/proc/reset() carry_strength = initial(carry_strength) carry_factor = initial(carry_factor) @@ -34,6 +27,7 @@ carry_weight_factor = initial(carry_weight_factor) carry_bias = initial(carry_bias) carry_weight_bias = initial(carry_weight_bias) + return TRUE /datum/global_physiology/proc/apply(datum/physiology_modifier/modifier) if(!isnull(modifier.carry_strength_add)) @@ -67,39 +61,16 @@ if(!isnull(modifier.carry_weight_bias)) carry_weight_bias /= modifier.carry_weight_bias -/datum/global_physiology/vv_edit_var(var_name, var_value, mass_edit, raw_edit) - // we automatically hook varedits and change the admin varedit holder so rebuilds take it into account - // this is not necessarily the best of ideas, - // because things like multiplicative factors don't scale as admins usually would expect - // but having this is better than not having it, as otherwise things would silently be wiped. - if(raw_edit) - return ..() - if(isnull(ownership)) - return ..() - var/datum/physiology_modifier/varedit/varedit_modifier = ownership.get_varedit_physiology_modifier() - switch(var_name) - if(NAMEOF(src, carry_strength)) - if(!isnum(var_value)) - if(!mass_edit) - to_chat(usr, SPAN_WARNING("Invalid value [var_value] for [var_name] physiology edit rejected.")) - return FALSE - . = ..() - if(!.) - return - varedit_modifier.carry_strength_add = var_value - carry_strength - if(NAMEOF(src, carry_factor)) - if(!isnum(var_value)) - if(!mass_edit) - to_chat(usr, SPAN_WARNING("Invalid value [var_value] for [var_name] physiology edit rejected.")) - return FALSE - . = ..() - if(!.) - return - varedit_modifier.carry_strength_factor = var_value / carry_factor - else - return ..() - if(!mass_edit) - to_chat(usr, SPAN_NOTICE("Committing change to [var_name] on [ownership] ([REF(ownership)]) to physiology modifiers automatically.")) +/datum/local_physiology + +/datum/local_physiology/proc/reset() + return TRUE + +/datum/local_physiology/proc/apply(datum/physiology_modifier/modifier) + return TRUE + +/datum/local_physiology/proc/revert(datum/physiology_modifier/modifier) + return TRUE /** * physiology modifier @@ -111,10 +82,12 @@ var/name = "Some Modifier" /// is this a globally cached modifier? var/is_globally_cached = FALSE + /// biologies this applies to, for limb-specific modifiers + var/biology_types = BIOLOGY_TYPES_ALL - // todo: on biologies update, we need to specify what biologies this applies to + //* -- global modifiers -- *// - //? global modifiers + //* carry strength / weight *// var/carry_strength_add = 0 var/carry_strength_factor = 1 var/carry_strength_bias = 1 @@ -146,7 +119,7 @@ if(isnum(data["carry_weight_factor"])) carry_weight_factor = data["carry_weight_factor"] if(isnum(data["carry_weight_bias"])) - carry_weight_bias = data["carry_Weight_bias"] + carry_weight_bias = data["carry_weight_bias"] /** * subtype for hardcoded physiology modifiers @@ -194,6 +167,7 @@ GLOBAL_LIST_EMPTY(cached_physiology_modifiers) ASSERT(!(modifier in physiology_modifiers)) LAZYADD(physiology_modifiers, modifier) physiology.apply(modifier) + return TRUE /** * removes a modifier from physiology @@ -208,13 +182,13 @@ GLOBAL_LIST_EMPTY(cached_physiology_modifiers) if(!physiology.revert(modifier)) // todo: optimize with reset(). rebuild_physiology() + return TRUE /** * completely rebuilds physiology from our modifiers */ /mob/proc/rebuild_physiology() physiology = new - physiology.ownership = src for(var/datum/physiology_modifier/modifier as anything in physiology_modifiers) if(!istype(modifier)) physiology_modifiers -= modifier @@ -232,36 +206,13 @@ GLOBAL_LIST_EMPTY(cached_physiology_modifiers) if(href_list[VV_HK_ADD_PHYSIOLOGY_MODIFIER]) // todo: this should be able to be done globally via admin panel and then added to mobs - var/datum/tgui_dynamic_query/query = new - query.string("name", "Name", "Name your modifier.", 64, FALSE, "Custom Modifier") - query.number("carry_strength_add", "Carry Strength - Add", "Modify the person's base carry strength. Higher is better.", default = 0) - query.number("carry_strength_factor", "Carry Factor - Multiply", "Multiply the person's carry weight/encumbrance to slowdown effect when carrying over their limit. Lower is better.", default = 1) - query.number("carry_strength_bias", "Carry Bias - Multiply", "Multiply the person's carry weight/encumbrance to slowdown bias when carrying over their limit. Lower is better.", default = 1) - query.number("carry_weight_add", "Carry Weight - Add", "Modify the person's base carry weight. Higher is better. This only applies to weight, not encumbrance.", default = 0) - query.number("carry_weight_factor", "Carry Weight - Multiply", "Multiply the person's weight to slowdown effect when carrying over their limit. Lower is better. This only applies to weight, not encumbrance.", default = 1) - query.number("carry_weight_bias", "Carry Weight - Bias", "Multiply the person's weight to slowdown calculation bias; lower is better.", default = 1) - - var/list/choices = tgui_dynamic_input(usr, "Add a physiology modifier", "Add Physiology Modifier", query) + var/datum/physiology_modifier/modifier = ask_admin_for_a_physiology_modifier(usr) - if(isnull(choices)) + if(isnull(modifier)) return if(QDELETED(src)) return - var/datum/physiology_modifier/modifier = new - - // we manually deserialize because we might have custom datatypes - // in the future that won't be serialized by the ui necessarily in the same way - // we would serialize it via json. - - modifier.name = choices["name"] - modifier.carry_strength_add = choices["carry_strength_add"] - modifier.carry_strength_factor = choices["carry_strength_factor"] - modifier.carry_strength_bias = choices["carry_strength_bias"] - modifier.carry_weight_add = choices["carry_weight_add"] - modifier.carry_weight_factor = choices["carry_weight_factor"] - modifier.carry_weight_bias = choices["carry_weight_bias"] - log_admin("[key_name(usr)] --> [key_name(src)] - added physiology modifier [json_encode(modifier.serialize())]") add_physiology_modifier(modifier) return TRUE @@ -279,11 +230,44 @@ GLOBAL_LIST_EMPTY(cached_physiology_modifiers) remove_physiology_modifier(removing) return TRUE -/mob/proc/get_varedit_physiology_modifier() - RETURN_TYPE(/datum/physiology_modifier) - . = locate(/datum/physiology_modifier/varedit) in physiology_modifiers - if(!isnull(.)) +// i'm not going to fucking support vv without automated backreferences and macros, holy shit. +// /mob/proc/get_varedit_physiology_modifier() +// RETURN_TYPE(/datum/physiology_modifier) +// . = locate(/datum/physiology_modifier/varedit) in physiology_modifiers +// if(!isnull(.)) +// return +// var/datum/physiology_modifier/varedit/new_holder = new +// add_physiology_modifier(new_holder) +// return new_holder + +// todo: you can tell from the proc name that this needs to be kicked somewhere eles later. +/proc/ask_admin_for_a_physiology_modifier(mob/user) + var/datum/tgui_dynamic_query/query = new + query.string("name", "Name", "Name your modifier.", 64, FALSE, "Custom Modifier") + query.number("carry_strength_add", "Carry Strength - Add", "Modify the person's base carry strength. Higher is better.", default = 0) + query.number("carry_strength_factor", "Carry Factor - Multiply", "Multiply the person's carry weight/encumbrance to slowdown effect when carrying over their limit. Lower is better.", default = 1) + query.number("carry_strength_bias", "Carry Bias - Multiply", "Multiply the person's carry weight/encumbrance to slowdown bias when carrying over their limit. Lower is better.", default = 1) + query.number("carry_weight_add", "Carry Weight - Add", "Modify the person's base carry weight. Higher is better. This only applies to weight, not encumbrance.", default = 0) + query.number("carry_weight_factor", "Carry Weight - Multiply", "Multiply the person's weight to slowdown effect when carrying over their limit. Lower is better. This only applies to weight, not encumbrance.", default = 1) + query.number("carry_weight_bias", "Carry Weight - Bias", "Multiply the person's weight to slowdown calculation bias; lower is better.", default = 1) + + var/list/choices = tgui_dynamic_input(user, "Add a physiology modifier", "Add Physiology Modifier", query) + + if(isnull(choices)) return - var/datum/physiology_modifier/varedit/new_holder = new - add_physiology_modifier(new_holder) - return new_holder + + var/datum/physiology_modifier/modifier = new + + // we manually deserialize because we might have custom datatypes + // in the future that won't be serialized by the ui necessarily in the same way + // we would serialize it via json. + + modifier.name = choices["name"] + modifier.carry_strength_add = choices["carry_strength_add"] + modifier.carry_strength_factor = choices["carry_strength_factor"] + modifier.carry_strength_bias = choices["carry_strength_bias"] + modifier.carry_weight_add = choices["carry_weight_add"] + modifier.carry_weight_factor = choices["carry_weight_factor"] + modifier.carry_weight_bias = choices["carry_weight_bias"] + + return modifier diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm index 8affd68528..2ae564ead1 100644 --- a/code/modules/modular_computers/computers/modular_computer/ui.dm +++ b/code/modules/modular_computers/computers/modular_computer/ui.dm @@ -33,7 +33,7 @@ ui.set_autoupdate(TRUE) ui.open() -/obj/item/modular_computer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/modular_computer/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["login"] = list() @@ -76,7 +76,7 @@ return data // Handles user's GUI input -/obj/item/modular_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/modular_computer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 3e0b98ee80..ff1c41b2f6 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -167,9 +167,13 @@ ui = SStgui.try_update_ui(user, src, ui) if(!ui && tgui_id) ui = new(user, src, tgui_id, filedesc) + ui_pre_open(ui) ui.open() return 1 +/datum/computer_file/program/proc/ui_pre_open(datum/tgui/ui) + return + // CONVENTIONS, READ THIS WHEN CREATING NEW PROGRAM AND OVERRIDING THIS PROC: // Topic calls are automagically forwarded from NanoModule this program contains. // Calls beginning with "PRG_" are reserved for programs handling. @@ -186,7 +190,7 @@ // Calls beginning with "PRG_" are reserved for programs handling. // Calls beginning with "PC_" are reserved for computer handling (by whatever runs the program) // ALWAYS INCLUDE PARENT CALL ..() OR DIE IN FIRE. -/datum/computer_file/program/ui_act(action,list/params, datum/tgui/ui) +/datum/computer_file/program/ui_act(action, list/params, datum/tgui/ui) if(..()) return 1 if(computer) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm index 959ee3ee21..e4312cdb15 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm @@ -77,7 +77,7 @@ ntnet_global.intrusion_detection_alarm = TRUE return TRUE -/datum/computer_file/program/access_decrypter/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/access_decrypter/ui_data(mob/user, datum/tgui/ui) if(!ntnet_global) return var/list/data = get_header_data() diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm index a329f18346..3d61fe057e 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm @@ -40,7 +40,7 @@ ..(forced) -/datum/computer_file/program/ntnet_dos/ui_data(mob/user) +/datum/computer_file/program/ntnet_dos/ui_data(mob/user, datum/tgui/ui) if(!ntnet_global) return @@ -62,7 +62,7 @@ return data -/datum/computer_file/program/ntnet_dos/ui_act(action, params) +/datum/computer_file/program/ntnet_dos/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 595c79f6cf..b9d379f2cd 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -37,7 +37,7 @@ if(computer.tesla_link && prob(50)) qdel(computer.tesla_link) -/datum/computer_file/program/revelation/ui_act(action, params) +/datum/computer_file/program/revelation/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) @@ -59,7 +59,7 @@ temp.armed = armed return temp -/datum/computer_file/program/revelation/ui_data(mob/user) +/datum/computer_file/program/revelation/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["armed"] = armed diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 3036fab9d8..78f9e82325 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -18,21 +18,17 @@ . = ..() QDEL_NULL(tgui_cardmod) -/datum/computer_file/program/card_mod/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/card_mod/ui_static_data(mob/user, datum/tgui/ui) . = get_header_data() -/datum/computer_file/program/card_mod/ui_module_route(action, list/params, datum/tgui/ui, id) - . = ..() - if(.) - return - switch(id) - if("modify") - return tgui_cardmod.ui_act(action, params, ui) - -/datum/computer_file/program/card_mod/ui_module_data(mob/user, datum/tgui/ui, datum/ui_state/state) - . = ..() - .["modify"] = tgui_cardmod.data(user, computer.card_slot.stored_card, user.GetIdCard()) +/datum/computer_file/program/card_mod/ui_route(action, list/params, datum/tgui/ui, id) + . = ..() + if(.) + return + switch(id) + if("modify") + return tgui_cardmod.ui_act(action, params, ui) -/datum/computer_file/program/card_mod/ui_module_static(mob/user, datum/tgui/ui, datum/ui_state/state) - . = ..() - .["modify"] = tgui_cardmod.static_data(user, computer.card_slot.stored_card, user.GetIdCard()) +/datum/computer_file/program/card_mod/ui_pre_open(datum/tgui/ui) + ui.register_module(tgui_cardmod, "modify") + return ..() diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm index 034bf6a6f8..4d57821797 100644 --- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm @@ -140,7 +140,7 @@ HDD.store_file(C) return TRUE -/datum/computer_file/program/filemanager/ui_data(mob/user) +/datum/computer_file/program/filemanager/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index fa7bba9c1e..5fe42f33b9 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -90,7 +90,7 @@ /** * This provides all of the relevant data to the UI in a list(). */ -/datum/computer_file/program/game/ui_data(mob/user) +/datum/computer_file/program/game/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["Hitpoints"] = boss_hp data["PlayerHitpoints"] = player_hp @@ -105,7 +105,7 @@ /** * This is tgui's replacement for Topic(). It handles any user input from the UI. */ -/datum/computer_file/program/game/ui_act(action, list/params) +/datum/computer_file/program/game/ui_act(action, list/params, datum/tgui/ui) if(..()) // Always call parent in ui_act, it handles making sure the user is allowed to interact with the UI. return TRUE diff --git a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm index 4e8f4c3ad9..efdaa3569f 100644 --- a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm @@ -36,7 +36,7 @@ requires_ntnet = 0 // Turn off NTNet requirement as we already loaded the file into local memory. SStgui.update_uis(src) -/datum/computer_file/program/newsbrowser/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/newsbrowser/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() var/list/all_articles = list() diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm index 310a7a7bce..139b1896f0 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm @@ -105,7 +105,7 @@ download_netspeed = NTNETSPEED_ETHERNET download_completion += download_netspeed -/datum/computer_file/program/ntnetdownload/ui_act(action, params) +/datum/computer_file/program/ntnetdownload/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) @@ -127,7 +127,7 @@ return TRUE return FALSE -/datum/computer_file/program/ntnetdownload/ui_data(mob/user) +/datum/computer_file/program/ntnetdownload/ui_data(mob/user, datum/tgui/ui) my_computer = computer if(!istype(my_computer)) return diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index 23374990a5..30629e870a 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -24,7 +24,7 @@ username = "DefaultUser[rand(100, 999)]" ntnet = ntnet_global -/datum/computer_file/program/chatclient/ui_act(action, params) +/datum/computer_file/program/chatclient/ui_act(action, list/params, datum/tgui/ui) if(..()) return @@ -170,12 +170,12 @@ channel.remove_client(src) ..() -/datum/computer_file/program/chatclient/ui_static_data(mob/user) +/datum/computer_file/program/chatclient/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() data["can_admin"] = can_run(user, FALSE, ACCESS_NETWORK) return data -/datum/computer_file/program/chatclient/ui_data(mob/user) +/datum/computer_file/program/chatclient/ui_data(mob/user, datum/tgui/ui) if(!ntnet_global || !ntnet_global.chat_channels) return list() diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm index b5fff1167e..4d2cccd12c 100644 --- a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm +++ b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm @@ -75,7 +75,7 @@ var/global/nttransfer_uid = 0 remote = null download_completion = 0 -/datum/computer_file/program/nttransfer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/nttransfer/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["error"] = error diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index 0170a4dd30..a98dbac94e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -182,7 +182,7 @@ return TRUE return TRUE -/datum/computer_file/program/wordprocessor/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/wordprocessor/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive diff --git a/code/modules/modular_computers/file_system/programs/research/email_administration.dm b/code/modules/modular_computers/file_system/programs/research/email_administration.dm index 40d58b1ec7..16c8ef1187 100644 --- a/code/modules/modular_computers/file_system/programs/research/email_administration.dm +++ b/code/modules/modular_computers/file_system/programs/research/email_administration.dm @@ -15,7 +15,7 @@ var/datum/computer_file/data/email_message/current_message = null var/error = "" -/datum/computer_file/program/email_administration/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/email_administration/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["error"] = error diff --git a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm index cd734a9c4b..1979a8d625 100644 --- a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm +++ b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm @@ -11,7 +11,7 @@ available_on_ntnet = TRUE tgui_id = "NtosNetMonitor" -/datum/computer_file/program/ntnetmonitor/ui_data(mob/user) +/datum/computer_file/program/ntnetmonitor/ui_data(mob/user, datum/tgui/ui) if(!ntnet_global) return var/list/data = get_header_data() @@ -38,7 +38,7 @@ return data -/datum/computer_file/program/ntnetmonitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/ntnetmonitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) @@ -60,7 +60,7 @@ return TRUE var/response = alert(usr, "Really disable NTNet wireless? If your computer is connected wirelessly you won't be able to turn it back on! This will affect all connected wireless devices.", "NTNet shutdown", "Yes", "No") - if(response == "Yes" && ui_status(usr, state) == UI_INTERACTIVE) + if(response == "Yes" && ui?.still_interactive()) ntnet_global.setting_disabled = TRUE return TRUE if("purgelogs") @@ -81,13 +81,13 @@ if(!ntnet_global) return var/nid = input(usr,"Enter NID of device which you want to block from the network:", "Enter NID") as null|num - if(nid && ui_status(usr, state) == UI_INTERACTIVE) + if(nid && ui?.still_interactive()) ntnet_global.banned_nids |= nid return TRUE if("unban_nid") if(!ntnet_global) return var/nid = input(usr,"Enter NID of device which you want to unblock from the network:", "Enter NID") as null|num - if(nid && ui_status(usr, state) == UI_INTERACTIVE) + if(nid && ui?.still_interactive()) ntnet_global.banned_nids -= nid return TRUE diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm index 1b2c0edd1f..a9d70ef27d 100644 --- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm +++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm @@ -25,7 +25,7 @@ var/global/warrant_uid = 0 var/datum/data/record/warrant/activewarrant -/datum/computer_file/program/digitalwarrant/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/digitalwarrant/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["warrantname"] = null @@ -52,7 +52,7 @@ var/global/warrant_uid = 0 return data -/datum/computer_file/program/digitalwarrant/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/digitalwarrant/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -81,7 +81,7 @@ var/global/warrant_uid = 0 . = TRUE var/datum/data/record/warrant/W = new() var/temp = sanitize(input(usr, "Do you want to create a search-, or an arrest warrant?") as null|anything in list("search","arrest")) - if(ui_status(usr, state) == UI_INTERACTIVE) + if(ui?.still_interactive()) if(temp == "arrest") W.fields["namewarrant"] = "Unknown" W.fields["charges"] = "No charges present" @@ -110,7 +110,7 @@ var/global/warrant_uid = 0 for(var/datum/data/record/t in data_core.general) namelist += t.fields["name"] var/new_name = sanitize(input(usr, "Please input name") as null|anything in namelist) - if(ui_status(usr, state) == UI_INTERACTIVE) + if(ui?.still_interactive()) if (!new_name) return activewarrant.fields["namewarrant"] = new_name @@ -118,7 +118,7 @@ var/global/warrant_uid = 0 if("editwarrantnamecustom") . = TRUE var/new_name = sanitize(input("Please input name") as null|text) - if(ui_status(usr, state) == UI_INTERACTIVE) + if(ui?.still_interactive()) if (!new_name) return activewarrant.fields["namewarrant"] = new_name @@ -126,7 +126,7 @@ var/global/warrant_uid = 0 if("editwarrantcharges") . = TRUE var/new_charges = sanitize(input("Please input charges", "Charges", activewarrant.fields["charges"]) as null|text) - if(ui_status(usr, state) == UI_INTERACTIVE) + if(ui?.still_interactive()) if (!new_charges) return activewarrant.fields["charges"] = new_charges diff --git a/code/modules/nanites/chamber_control.dm b/code/modules/nanites/chamber_control.dm index e1615a48a5..8a76664cfa 100644 --- a/code/modules/nanites/chamber_control.dm +++ b/code/modules/nanites/chamber_control.dm @@ -73,7 +73,7 @@ linked.try_refresh_protean(usr) return TRUE -/obj/machinery/computer/nanite_chamber/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/nanite_chamber/ui_data(mob/user, datum/tgui/ui) . = ..() if(isnull(linked)) return @@ -81,7 +81,7 @@ .["locked"] = linked.locked .["operating"] = linked.operating -/obj/machinery/computer/nanite_chamber/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/nanite_chamber/ui_static_data(mob/user, datum/tgui/ui) . = ..() if(isnull(linked)) .["hasChamber"] = FALSE diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 43bed334a4..a505448584 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -35,7 +35,7 @@ /// The layout key for this ui (this is used on the frontend, leave it as "default" unless you know what you're doing) var/layout_key = "default" /// Optional layout key for additional ui header content to include - var/layout_header_key = "default_header" + // var/layout_header_key = "default_header" /// This sets whether to re-render the ui layout with each update (default 0, turning on will break the map ui if it's in use) var/auto_update_layout = FALSE /// This sets whether to re-render the ui content with each update (default 1) @@ -342,8 +342,8 @@ // before the UI opens, add the layout files based on the layout key add_stylesheet("layout_[layout_key].css") add_template("layout", "layout_[layout_key].tmpl") - if (layout_header_key) - add_template("layoutHeader", "layout_[layout_header_key].tmpl") + // if (layout_header_key) + // add_template("layoutHeader", "layout_[layout_header_key].tmpl") var/head_content = "" @@ -445,7 +445,7 @@ */ /datum/nanoui/proc/close() is_auto_updating = 0 - SSnanoui.ui_closed(src) + SSnanoui.on_ui_closed(src) user << browse(null, "window=[window_id]") for(var/datum/nanoui/child in children) child.close() diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm index 882c5a88e7..ad09f0c653 100644 --- a/code/modules/nifsoft/nif_tgui.dm +++ b/code/modules/nifsoft/nif_tgui.dm @@ -96,7 +96,7 @@ /** * The NIF State ensures that only our authorized implanted user can touch us. */ -/obj/item/nif/ui_state(mob/user, datum/tgui_module/module) +/obj/item/nif/ui_state() return GLOB.ui_nif_main_state /** @@ -112,7 +112,7 @@ * ui_data gives the UI any relevant data it needs. * In our case, that's basically everything from our statpanel. */ -/obj/item/nif/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/nif/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["theme"] = save_data["ui_theme"] diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index b3dc7a2d10..86c87cb8c3 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -175,7 +175,7 @@ if(!active) return null var/datum/gas_mixture/breath = new(BREATH_VOLUME) - breath.adjust_gas(/datum/gas/oxygen, BREATH_MOLES) + breath.adjust_gas(GAS_ID_OXYGEN, BREATH_MOLES) breath.temperature = T20C return breath /* diff --git a/code/modules/organs/external/external.dm b/code/modules/organs/external/external.dm index e09e6c6820..83d45f3801 100644 --- a/code/modules/organs/external/external.dm +++ b/code/modules/organs/external/external.dm @@ -6,11 +6,22 @@ organ_tag = "limb" decays = FALSE - //? Coverage + //* Coverage *// /// body_cover_flags that count as covering us var/body_part_flags = NONE - //? Wounds + //* Damage + /// https://www.desmos.com/calculator/eyn1lj5gq7 + /// intensifier value used for inverse-damage softcap + var/damage_softcap_intensifier = 0 + + //* Physiology *// + /// local physiology holder + var/datum/local_physiology/physiology + /// local-ized physiology modifiers - these are always on us, even when we are mob-less + var/list/datum/physiology_modifier/physiology_modifiers + + //* Wounds *// /// Wound datum list. var/list/wounds /// Number of wounds we have - some wounds like bruises will collate into one datum representing all of them. @@ -134,6 +145,7 @@ var/syringe_infection_queued /obj/item/organ/external/Initialize(mapload) + init_local_physiology() . = ..(mapload, FALSE) if(istype(owner)) replaced(owner) @@ -183,7 +195,10 @@ burn_damage += rand(2, 6) if(burn_damage) - take_damage(0, burn_damage * emp_mod) + inflict_bodypart_damage( + burn = burn_damage * emp_mod, + weapon_descriptor = "electromagnetic overload", + ) /obj/item/organ/external/attack_self(mob/user) . = ..() @@ -201,7 +216,7 @@ removable_objects |= I if(removable_objects.len) var/obj/item/I = pick(removable_objects) - I.loc = get_turf(user) //just in case something was embedded that is not an item + I.forceMove(get_turf(user)) //just in case something was embedded that is not an item if(istype(I)) user.put_in_hands(I) user.visible_message("\The [user] rips \the [I] out of \the [src]!") @@ -233,7 +248,7 @@ if(istype(W,/obj/item/surgical/hemostat)) if(contents.len) var/obj/item/removing = pick(contents) - removing.loc = get_turf(user.loc) + removing.forceMove(get_turf(user.loc)) user.put_in_hands(removing) user.visible_message("[user] extracts [removing] from [src] with [W]!") else @@ -285,6 +300,12 @@ /obj/item/organ/external/replaced(var/mob/living/carbon/human/target) owner = target forceMove(owner) + + // todo: removed() is not necessarily reliable. + for(var/datum/physiology_modifier/modifier as anything in owner.physiology_modifiers) + // todo: check biology + physiology.apply(modifier) + if(istype(owner)) owner.organs_by_name[organ_tag] = src owner.organs |= src @@ -304,18 +325,41 @@ DAMAGE PROCS ****************************************************/ -/obj/item/organ/external/proc/is_damageable(var/additional_damage = 0) - //Continued damage to vital organs can kill you, and robot organs don't count towards total damage so no need to cap them. - return (vital || (robotic >= ORGAN_ROBOT) || brute_dam + burn_dam + additional_damage < max_damage) +/obj/item/organ/external/proc/is_damageable(check_damage_cap) + // todo: rework + if(check_damage_cap) + //Continued damage to vital organs can kill you, and robot organs don't count towards total damage so no need to cap them. + // todo: this is absolutely fucking stupid, rework asap. + if(vital || (robotic >= ORGAN_ROBOT) || brute_dam + burn_dam < max_damage) + return TRUE + return FALSE + return TRUE -/obj/item/organ/external/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list(), permutation = 0) +/** + * process incoming damage + * + * @params + * * brute - brute damage to take + * * burn - burn damage to take + * * damage_mode - DAMAG_EMODE_* flags for the form of this damage + * * weapon descriptor - a string describing how it happened ("flash burns", "multiple precision cuts", etc) + * * defer_host_updates - update health / perform damage checks? this is only for owner updates, not self updates!! + */ +/obj/item/organ/external/proc/inflict_bodypart_damage(brute, burn, damage_mode, weapon_descriptor, defer_host_updates) + // todo: get rid of this shit, should be physiology + // legacy: brute/burnmod brute = round(brute * brute_mod, 0.1) burn = round(burn * burn_mod, 0.1) - if((brute <= 0) && (burn <= 0)) + if(!brute && !burn) return 0 - // High brute damage or sharp objects may damage internal organs + // todo: this is awful + var/sharp = damage_mode & DAMAGE_MODE_SHARP + var/edge = damage_mode & DAMAGE_MODE_EDGE + + // todo: lol this is shit + // legacy: organ damage on high damage if(internal_organs && (brute_dam >= max_damage || (((sharp && brute >= 5) || brute >= 10) && prob(5)))) // Damage an internal organ if(internal_organs && internal_organs.len) @@ -323,22 +367,28 @@ brute *= 0.5 I.take_damage(brute) - if(status & ORGAN_BROKEN && brute) + // todo: lol this is shit + // legacy: jostle if broken + if(is_broken() && brute && !(damage_mode & DAMAGE_MODE_GRADUAL)) jostle_bone(brute) - if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper)) + if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && prob(40)) owner.emote("scream") //getting hit on broken hand hurts - if(used_weapon) - add_autopsy_data("[used_weapon]", brute + burn) + + // todo: optimization + // legacy: autopsy data + if(weapon_descriptor) + add_autopsy_data(weapon_descriptor, brute + burn) + + //! LEGACY BELOW var/can_cut = (sharp) && (robotic < ORGAN_ROBOT) // If the limbs can break, make sure we don't exceed the maximum damage a limb can take before breaking // Non-vital organs are limited to max_damage. You can't kill someone by bludeonging their arm all the way to 200 -- you can // push them faster into paincrit though, as the additional damage is converted into shock. - var/brute_overflow = 0 - var/burn_overflow = 0 - if(is_damageable(brute + burn) || !config_legacy.limbs_can_break) - if(brute) + if(brute) + var/can_inflict_brute = max(0, max_damage - brute_dam) + if(can_inflict_brute >= brute) if(can_cut) if(sharp && !edge) create_wound( PIERCE, brute ) @@ -346,90 +396,91 @@ create_wound( CUT, brute ) else create_wound( BRUISE, brute ) - if(burn) - create_wound( BURN, burn ) - else - //If we can't inflict the full amount of damage, spread the damage in other ways - //How much damage can we actually cause? - var/can_inflict = max_damage * config_legacy.organ_health_multiplier - (brute_dam + burn_dam) - var/spillover = 0 - if(can_inflict >= 0) - if (brute > 0) - //Inflict all burte damage we can - if(can_cut) - if(sharp && !edge) - create_wound( PIERCE, min(brute,can_inflict) ) - else - create_wound( CUT, min(brute,can_inflict) ) + else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW)) + var/overflow_brute = brute - can_inflict_brute + // keep allowing it, but, diminishing returns + var/damage_anyways_brute = brute * min(1, 1 / ((brute_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) + if(can_cut) + if(sharp && !edge) + create_wound( PIERCE, damage_anyways_brute ) else - create_wound( BRUISE, min(brute,can_inflict) ) - //How much more damage can we inflict - brute_overflow = max(0, brute - can_inflict) - //How much brute damage is left to inflict - spillover += max(0, brute - can_inflict) - - can_inflict = max_damage * config_legacy.organ_health_multiplier - (brute_dam + burn_dam) //Refresh the can_inflict var, so burn doesn't overload the limb if it is set to take both. - - if (burn > 0 && can_inflict) - //Inflict all burn damage we can - create_wound(BURN, min(burn,can_inflict)) - //How much burn damage is left to inflict - burn_overflow = max(0, burn - can_inflict) - spillover += burn_overflow - - //If there is pain to dispense. - if(spillover) - owner.shock_stage += spillover * config_legacy.organ_damage_spillover_multiplier + create_wound( CUT, damage_anyways_brute ) + else + create_wound( BRUISE, damage_anyways_brute ) + // rest goes into shock + owner.shock_stage += overflow_brute * 0.33 + if(burn) + var/can_inflict_burn = max(0, max_damage - burn_dam) + if(can_inflict_burn >= burn) + create_wound( BURN, burn ) + else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW)) + var/overflow_burn = burn - can_inflict_burn + // keep allowing it, but, diminishing returns + var/damage_anyways_burn = burn * min(1, 1 / ((burn_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) + create_wound( BURN, damage_anyways_burn ) + // rest goes into shock + owner.shock_stage += overflow_burn * 0.33 // sync the organ's damage with its wounds - src.update_damages() - if(owner) - owner.update_health() //droplimb will call update_health() again if it does end up being called + update_damages() + + // break it if needed + // todo: shit code lmao + if(brute_dam > min_broken_damage && prob((brute * ((brute_dam - min_broken_damage) / min_broken_damage)) * 2)) + fracture() //If limb took enough damage, try to cut or tear it off - if(owner && loc == owner && !is_stump()) - if(!cannot_amputate && config_legacy.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * config_legacy.organ_health_multiplier)) - //organs can come off in three cases - //1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off. - //2. If the damage amount dealt exceeds the disintegrate threshold, the organ is completely obliterated. - //3. If the organ has already reached or would be put over it's max damage amount (currently redundant), - // and the brute damage dealt exceeds the tearoff threshold, the organ is torn off. - - //Check edge eligibility - var/edge_eligible = 0 - if(edge) - if(istype(used_weapon,/obj/item)) - var/obj/item/W = used_weapon - if(W.w_class >= w_class) - edge_eligible = 1 - else - edge_eligible = 1 - - if(nonsolid && damage >= max_damage) - droplimb(TRUE, DROPLIMB_EDGE) - else if (robotic >= ORGAN_NANOFORM && damage >= max_damage) - droplimb(TRUE, DROPLIMB_BURN) - else if(edge_eligible && brute >= max_damage / DROPLIMB_THRESHOLD_EDGE && prob(brute)) - droplimb(0, DROPLIMB_EDGE) - else if((burn >= max_damage / DROPLIMB_THRESHOLD_DESTROY) && prob(burn*0.33)) - droplimb(0, DROPLIMB_BURN) - else if((brute >= max_damage / DROPLIMB_THRESHOLD_DESTROY && prob(brute))) - droplimb(0, DROPLIMB_BLUNT) - else if(brute >= max_damage / DROPLIMB_THRESHOLD_TEAROFF && prob(brute*0.33)) - droplimb(0, DROPLIMB_EDGE) - else if(spread_dam && owner && parent && (brute_overflow || burn_overflow) && (brute_overflow >= 5 || burn_overflow >= 5) && !permutation) //No infinite damage loops. - var/brute_third = brute_overflow * 0.33 - var/burn_third = burn_overflow * 0.33 - if(children && children.len) - var/brute_on_children = brute_third / children.len - var/burn_on_children = burn_third / children.len - spawn() - for(var/obj/item/organ/external/C in children) - if(!C.is_stump()) - C.take_damage(brute_on_children, burn_on_children, 0, 0, null, forbidden_limbs, 1) //Splits the damage to each individual 'child', incase multiple exist. - parent.take_damage(brute_third, burn_third, 0, 0, null, forbidden_limbs, 1) - - return update_icon() + if(!(damage_mode & DAMAGE_MODE_GRADUAL) && !is_stump() && !cannot_amputate && ((brute_dam > max_damage) || (burn_dam > max_damage))) + //organs can come off in three cases + //1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off. + //2. If the damage amount dealt exceeds the disintegrate threshold, the organ is completely obliterated. + //3. If the organ has already reached or would be put over it's max damage amount (currently redundant), + // and the brute damage dealt exceeds the tearoff threshold, the organ is torn off. + + //Check edge eligibility + //! edge eligibility disabled; organs should optimally not reqiure the item reference and should instead + //! get descriptors (damage, damage mode, etc) of the inbound attack. + var/edge_eligible = edge + // var/edge_eligible = 0 + // if(edge) + // if(istype(used_weapon,/obj/item)) + // var/obj/item/W = used_weapon + // if(W.w_class >= w_class) + // edge_eligible = 1 + // else + // edge_eligible = 1 + + if(nonsolid && damage >= max_damage) + droplimb(TRUE, DROPLIMB_EDGE) + else if (robotic >= ORGAN_NANOFORM && damage >= max_damage) + droplimb(TRUE, DROPLIMB_BURN) + else if(edge_eligible && brute >= max_damage / DROPLIMB_THRESHOLD_EDGE && prob(brute)) + droplimb(0, DROPLIMB_EDGE) + else if((burn >= max_damage / DROPLIMB_THRESHOLD_DESTROY) && prob(burn*0.33)) + droplimb(0, DROPLIMB_BURN) + else if((brute >= max_damage / DROPLIMB_THRESHOLD_DESTROY && prob(brute))) + droplimb(0, DROPLIMB_BLUNT) + else if(brute >= max_damage / DROPLIMB_THRESHOLD_TEAROFF && prob(brute*0.33)) + droplimb(0, DROPLIMB_EDGE) + //! damage spreading disabled; the attacking weapon should handle this if necessary. + // else if(spread_dam && owner && parent && (brute_overflow || burn_overflow) && (brute_overflow >= 5 || burn_overflow >= 5) && !permutation) //No infinite damage loops. + // var/brute_third = brute_overflow * 0.33 + // var/burn_third = burn_overflow * 0.33 + // if(children && children.len) + // var/brute_on_children = brute_third / children.len + // var/burn_on_children = burn_third / children.len + // spawn() + // for(var/obj/item/organ/external/C in children) + // if(!C.is_stump()) + // C.take_damage(brute_on_children, burn_on_children, 0, 0, null, forbidden_limbs, 1) //Splits the damage to each individual 'child', incase multiple exist. + // parent.take_damage(brute_third, burn_third, 0, 0, null, forbidden_limbs, 1) + + //! LEGACY ABOVE + + if(!defer_host_updates) + owner?.update_health() + + update_icon() /obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0) if(robotic >= ORGAN_ROBOT && !robo_repair) @@ -537,7 +588,7 @@ // remove embedded objects and drop them on the floor for(var/obj/implanted_object in implants) if(!istype(implanted_object,/obj/item/implant) && !istype(implanted_object,/obj/item/nif)) // We don't want to remove REAL implants. Just shrapnel etc. - implanted_object.loc = get_turf(src) + implanted_object.forceMove(get_turf(src)) implants -= implanted_object if(owner && !ignore_prosthetic_prefs) @@ -754,8 +805,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (W.can_autoheal() && W.wound_damage() < 50) heal_amt += 0.5 - //configurable regen speed woo, no-regen hardcore or instaheal hugbox, choose your destiny - heal_amt = heal_amt * config_legacy.organ_regeneration_multiplier + // todo: config entry after more med refactors // amount of healing is spread over all the wounds heal_amt = heal_amt / (length(wounds) + 1) // making it look prettier on scanners @@ -804,10 +854,6 @@ Note that amputating the affected organ does in fact remove the infection from t if (open && !clamped && (H && H.should_have_organ(O_HEART))) status |= ORGAN_BLEEDING - //Bone fractures - if(config_legacy.bones_can_break && brute_dam > min_broken_damage * config_legacy.organ_health_multiplier && !(robotic >= ORGAN_ROBOT)) - src.fracture() - update_health() // new damage icon system @@ -1087,7 +1133,7 @@ Note that amputating the affected organ does in fact remove the infection from t /obj/item/organ/external/proc/mend_fracture() if(robotic >= ORGAN_ROBOT) return 0 //ORGAN_BROKEN doesn't have the same meaning for robot limbs - if(brute_dam > min_broken_damage * config_legacy.organ_health_multiplier) + if(brute_dam > min_broken_damage) return 0 //will just immediately fracture again status &= ~ORGAN_BROKEN @@ -1235,6 +1281,16 @@ Note that amputating the affected organ does in fact remove the infection from t var/is_robotic = robotic >= ORGAN_ROBOT var/mob/living/carbon/human/victim = owner + // todo: removed() is not necessarily reliable. + for(var/datum/physiology_modifier/modifier as anything in owner.physiology_modifiers) + // todo: check biology + if(!physiology.revert(modifier)) + // todo: optimize? + rebuild_physiology() + for(var/datum/physiology_modifier/rebuilding as anything in owner.physiology_modifiers) + // todo: check biology + physiology.apply(rebuilding) + ..() victim.bad_external_organs -= src @@ -1439,3 +1495,86 @@ Note that amputating the affected organ does in fact remove the infection from t for(var/obj/item/I in L.implants) if(!istype(I,/obj/item/implant) && !istype(I,/obj/item/nif)) return TRUE + +//* Environmentals *// + +// todo: limb specific + +//* Physiology *// + +/obj/item/organ/external/proc/rebuild_physiology() + physiology = new + for(var/datum/physiology_modifier/modifier as anything in physiology_modifiers) + if(!istype(modifier)) + physiology_modifiers -= modifier + continue + physiology.apply(modifier) + +/obj/item/organ/external/proc/init_local_physiology() + for(var/i in 1 to length(physiology_modifiers)) + if(ispath(physiology_modifiers[i])) + physiology_modifiers[i] = cached_physiology_modifier(physiology_modifiers[i]) + rebuild_physiology() + +/obj/item/organ/external/proc/add_local_physiology_modifier(datum/physiology_modifier/modifier) + if(ispath(modifier)) + modifier = cached_physiology_modifier(modifier) + ASSERT(!(modifier in physiology_modifiers)) + LAZYADD(physiology_modifiers, modifier) + physiology.apply(modifier) + return TRUE + +/obj/item/organ/external/proc/remove_local_physiology_modifier(datum/physiology_modifier/modifier) + if(ispath(modifier)) + modifier = cached_physiology_modifier(modifier) + ASSERT(modifier in physiology_modifiers) + LAZYREMOVE(physiology_modifiers, modifier) + if(!physiology.revert(modifier)) + // todo: optimize with reset(). + rebuild_physiology() + return TRUE + +/obj/item/organ/external/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION(null, "-----") + VV_DROPDOWN_OPTION(VV_HK_ADD_PHYSIOLOGY_MODIFIER, "Add Physiology Modifier") + VV_DROPDOWN_OPTION(VV_HK_REMOVE_PHYSIOLOGY_MODIFIER, "Remove Physiology Modifier") + +/obj/item/organ/external/vv_do_topic(list/href_list) + . = ..() + if(href_list[VV_HK_ADD_PHYSIOLOGY_MODIFIER]) + // todo: this should be able to be done globally via admin panel and then added to mobs + + var/datum/physiology_modifier/modifier = ask_admin_for_a_physiology_modifier(usr) + + if(isnull(modifier)) + return + if(QDELETED(src)) + return + + log_admin("[key_name(usr)] --> organ [ref(src)] - added physiology modifier [json_encode(modifier.serialize())]") + add_local_physiology_modifier(modifier) + return TRUE + + if(href_list[VV_HK_REMOVE_PHYSIOLOGY_MODIFIER]) + var/list/assembled = list() + var/i = 0 + for(var/datum/physiology_modifier/modifier as anything in physiology_modifiers) + assembled["[modifier.name] (#[++i])"] = modifier + var/picked = input(usr, "Which modifier to remove? Please do not do this unless you know what you are doing.", "Remove Physiology Modifier") as null|anything in assembled + var/datum/physiology_modifier/removing = assembled[picked] + if(!(removing in physiology_modifiers)) + return TRUE + log_admin("[key_name(usr)] --> organ [ref(src)] - removed physiology modifier [json_encode(removing.serialize())]") + remove_local_physiology_modifier(removing) + return TRUE + +// i'm not going to fucking support vv without automated backreferences and macros, holy shit. +// /obj/item/organ/external/proc/get_varedit_physiology_modifier() +// RETURN_TYPE(/datum/physiology_modifier) +// . = locate(/datum/physiology_modifier/varedit) in physiology_modifiers +// if(!isnull(.)) +// return +// var/datum/physiology_modifier/varedit/new_holder = new +// add_local_physiology_modifier(new_holder) +// return new_holder diff --git a/code/modules/organs/external/robolimbs.dm b/code/modules/organs/external/robolimbs.dm index 977c69ca3c..ed554bc60a 100644 --- a/code/modules/organs/external/robolimbs.dm +++ b/code/modules/organs/external/robolimbs.dm @@ -44,7 +44,16 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ uwu=cyber_uwu;\ question=cyber_question;\ lowpower=cyber_lowpower;\ - idle=cyber_idle" + idle=cyber_idle;\ + catface=cyber_catface;\ + eyes_normal=cyber_eyes_normal;\ + eyes_happy=cyber_eyes_happy;\ + eyes_sad=cyber_eyes_sad;\ + eyes_big=cyber_eyes_big;\ + confounded=cyber_confounded;\ + eyes_confounded=cyber_eyes_confounded;\ + halffrown=cyber_halffrown;\ + angry=cyber_angry" /proc/populate_robolimb_list() GLOB.basic_robolimb = new() @@ -492,6 +501,10 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ parts = list(BP_HEAD) monitor_styles = cyberbeast_monitor_styles +/datum/robolimb/cyber_beast/flat + company = "Cyber Tech (Flat)" + icon = 'icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi' + /datum/robolimb/wooden company = "Morgan Trading Co" desc = "A simplistic, metal-banded, wood-panelled prosthetic." diff --git a/code/modules/organs/internal/internal.dm b/code/modules/organs/internal/internal.dm index b06a25a3e1..1b520655d8 100644 --- a/code/modules/organs/internal/internal.dm +++ b/code/modules/organs/internal/internal.dm @@ -67,3 +67,16 @@ if(. >= 3 && antibiotics < ANTIBIO_OD) //INFECTION_LEVEL_THREE if (prob(50)) take_damage(1,silent=prob(15)) + +/obj/item/organ/internal/emp_act(severity) + if(!(robotic >= ORGAN_ASSISTED)) + return + switch (severity) + if (1) + take_damage(rand(3, 7)) + if (2) + take_damage(rand(2, 6)) + if (3) + take_damage(rand(1, 4)) + if (4) + take_damage(rand(0, 2)) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index d22c18a686..e9c8f2dc25 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -51,6 +51,7 @@ /// Damage before becoming broken var/min_broken_damage = 30 /// Damage cap + /// For external organs / bodyparts, this is actually both brute and burn separate, so, you can have for 50 max damage 50 brute and 50 burn. var/max_damage /// Can this organ reject? var/can_reject = TRUE @@ -333,19 +334,6 @@ /obj/item/organ/proc/digitize() robotize() -/obj/item/organ/emp_act(severity) - if(!(robotic >= ORGAN_ASSISTED)) - return - switch (severity) - if (1) - take_damage(rand(3, 7)) - if (2) - take_damage(rand(2, 6)) - if (3) - take_damage(rand(1, 4)) - if (4) - take_damage(rand(0, 2)) - /obj/item/organ/proc/removed(var/mob/living/user) if(owner) owner.internal_organs_by_name[organ_tag] = null diff --git a/code/modules/overmap/legacy/disperser/disperser_console.dm b/code/modules/overmap/legacy/disperser/disperser_console.dm index 838c34a776..2261dadb54 100644 --- a/code/modules/overmap/legacy/disperser/disperser_console.dm +++ b/code/modules/overmap/legacy/disperser/disperser_console.dm @@ -127,7 +127,7 @@ ui = new(user, src, "OvermapDisperser", "[linked.name] ORB control") // 400, 550 ui.open() -/obj/machinery/computer/ship/disperser/ui_data(mob/user) +/obj/machinery/computer/ship/disperser/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["faillink"] = FALSE data["calibration"] = null diff --git a/code/modules/overmap/legacy/ships/computers/engine_control.dm b/code/modules/overmap/legacy/ships/computers/engine_control.dm index 4c6b58fee7..98e3fbb4dc 100644 --- a/code/modules/overmap/legacy/ships/computers/engine_control.dm +++ b/code/modules/overmap/legacy/ships/computers/engine_control.dm @@ -23,7 +23,7 @@ ui = new(user, src, "OvermapEngines", "[linked.name] Engines Control") // 390, 530 ui.open() -/obj/machinery/computer/ship/engines/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/ship/engines/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["global_state"] = linked.engines_state data["global_limit"] = round(linked.thrust_limit*100) diff --git a/code/modules/overmap/legacy/ships/computers/helm.dm b/code/modules/overmap/legacy/ships/computers/helm.dm index c1a1c01930..cbd8d4cfaa 100644 --- a/code/modules/overmap/legacy/ships/computers/helm.dm +++ b/code/modules/overmap/legacy/ships/computers/helm.dm @@ -95,7 +95,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) ui = new(user, src, "OvermapHelm", "[linked.name] Helm Control") // 565, 545 ui.open() -/obj/machinery/computer/ship/helm/ui_data(mob/user) +/obj/machinery/computer/ship/helm/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/turf/T = get_turf(linked) diff --git a/code/modules/overmap/legacy/ships/computers/sensors.dm b/code/modules/overmap/legacy/ships/computers/sensors.dm index 05284c9f09..4daa1aeb0c 100644 --- a/code/modules/overmap/legacy/ships/computers/sensors.dm +++ b/code/modules/overmap/legacy/ships/computers/sensors.dm @@ -37,7 +37,7 @@ ui = new(user, src, "OvermapShipSensors", "[linked.name] Sensors Control") // 420, 530 ui.open() -/obj/machinery/computer/ship/sensors/ui_data(mob/user) +/obj/machinery/computer/ship/sensors/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["viewing"] = viewing_overmap(user) diff --git a/code/modules/overmap/legacy/ships/computers/ship.dm b/code/modules/overmap/legacy/ships/computers/ship.dm index 22a1601538..cb34713e24 100644 --- a/code/modules/overmap/legacy/ships/computers/ship.dm +++ b/code/modules/overmap/legacy/ships/computers/ship.dm @@ -101,7 +101,7 @@ /obj/machinery/computer/ship/proc/viewing_overmap(mob/user) return (WEAKREF(user) in viewers) -/obj/machinery/computer/ship/ui_status(mob/user) +/obj/machinery/computer/ship/ui_status(mob/user, datum/ui_state/state) . = ..() if(. > UI_DISABLED) if(viewing_overmap(user)) @@ -109,7 +109,7 @@ return unlook(user) -/obj/machinery/computer/ship/ui_close(mob/user, datum/tgui_module/module) +/obj/machinery/computer/ship/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() user.unset_machine() unlook(user) diff --git a/code/modules/overmap/legacy/ships/computers/shuttle.dm b/code/modules/overmap/legacy/ships/computers/shuttle.dm index 8141287349..e367340352 100644 --- a/code/modules/overmap/legacy/ships/computers/shuttle.dm +++ b/code/modules/overmap/legacy/ships/computers/shuttle.dm @@ -25,7 +25,7 @@ "fuel_span" = fuel_span ) -/obj/machinery/computer/shuttle_control/explore/ui_act(action, list/params) +/obj/machinery/computer/shuttle_control/explore/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index b934c3fc88..b9ecb5dd67 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -83,7 +83,7 @@ return to_chat(user, SPAN_NOTICE("You find nothing in [src].")) -/obj/structure/filingcabinet/ui_state(mob/user, datum/tgui_module/module) +/obj/structure/filingcabinet/ui_state() return GLOB.physical_state /obj/structure/filingcabinet/ui_interact(mob/user, datum/tgui/ui) @@ -93,7 +93,7 @@ ui.set_autoupdate(FALSE) ui.open() -/obj/structure/filingcabinet/ui_data(mob/user) +/obj/structure/filingcabinet/ui_data(mob/user, datum/tgui/ui) var/list/files = list() for(var/obj/item/P in src) files.Add(list(list( @@ -103,7 +103,7 @@ return list("contents" = files) -/obj/structure/filingcabinet/ui_act(action, params) +/obj/structure/filingcabinet/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index a6e76ca15c..fb51bba4f9 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -50,190 +50,42 @@ GLOBAL_LIST_EMPTY(apcs) #define NIGHTSHIFT_ALWAYS 3 //NOTE: STUFF STOLEN FROM AIRLOCK.DM thx - -/obj/machinery/power/apc/direction_bump //For the love of god there's so many fucking var edits of the APC, use these instead pleaaaaase -Bloop - -/obj/machinery/power/apc/direction_bump/east - name = "east bump" - dir = 4 - pixel_x = 28 - -/obj/machinery/power/apc/direction_bump/west - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/direction_bump/north - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/direction_bump/south - name = "south bump" - pixel_y = -28 - //Critical// +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/critical, 22) /obj/machinery/power/apc/critical is_critical = 1 -/obj/machinery/power/apc/critical/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 - -/obj/machinery/power/apc/critical/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/critical/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/critical/south_bump - name = "south bump" - pixel_y = -28 - /// High capacity cell APCs +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/high, 22) /obj/machinery/power/apc/high cell_type = /obj/item/cell/high -/obj/machinery/power/apc/high/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 -/obj/machinery/power/apc/high/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/high/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/high/south_bump - name = "south bump" - pixel_y = -28 - /// Super capacity cell APCS +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/super, 22) /obj/machinery/power/apc/super cell_type = /obj/item/cell/super -/obj/machinery/power/apc/super/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 -/obj/machinery/power/apc/super/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/super/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/super/south_bump - name = "south bump" - pixel_y = -28 - - /// Critical APCs with super cells +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/super/critical, 22) /obj/machinery/power/apc/super/critical is_critical = 1 -/obj/machinery/power/apc/super/critical/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 -/obj/machinery/power/apc/super/critical/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/super/critical/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/super/critical/south_bump - name = "south bump" - pixel_y = -28 - /// APCS with hyper cells. How lewd +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/hyper, 22) /obj/machinery/power/apc/hyper cell_type = /obj/item/cell/hyper -/obj/machinery/power/apc/hyper/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 -/obj/machinery/power/apc/hyper/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/hyper/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/hyper/south_bump - name = "south bump" - pixel_y = -28 - - /// APCs with alarms hidden. Use these for POI's and offmap stuff so engineers dont get notified that shitty_ruins4 is running out of power -Bloop +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/alarms_hidden, 22) /obj/machinery/power/apc/alarms_hidden alarms_hidden = TRUE -/obj/machinery/power/apc/alarms_hidden/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 - -/obj/machinery/power/apc/alarms_hidden/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/alarms_hidden/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/alarms_hidden/south_bump - name = "south bump" - pixel_y = -28 - /// APCS with hidden alarms and no power cells +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/alarms_hidden/no_cell, 22) /obj/machinery/power/apc/alarms_hidden/no_cell cell_type = null chargelevel = 0 -/obj/machinery/power/apc/alarms_hidden/no_cell/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 - -/obj/machinery/power/apc/alarms_hidden/no_cell/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/alarms_hidden/no_cell/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/alarms_hidden/no_cell/south_bump - name = "south bump" - pixel_y = -28 - - - /** * APCs * @@ -255,6 +107,7 @@ GLOBAL_LIST_EMPTY(apcs) * * ~silicons */ +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22) /obj/machinery/power/apc name = "area power controller" desc = "A control terminal for the area electrical systems." @@ -365,8 +218,6 @@ GLOBAL_LIST_EMPTY(apcs) if (building) setDir(ndir) - pixel_x = (src.dir & 3)? 0 : (src.dir == 4 ? 24 : -24) - pixel_y = (src.dir & 3)? (src.dir ==1 ? 24 : -24) : 0 if(!building) autobuild() else @@ -406,14 +257,27 @@ GLOBAL_LIST_EMPTY(apcs) // APCs are pixel-shifted, so they need to be updated. /obj/machinery/power/apc/setDir(new_dir) - ..() - pixel_x = (src.dir & 3)? 0 : (src.dir == 4 ? 24 : -24) - pixel_y = (src.dir & 3)? (src.dir ==1 ? 24 : -24) : 0 + . = ..() + + base_pixel_x = 0 + base_pixel_y = 0 + var/turf/T = get_step(src, turn(dir, 180)) + if(T.get_wallmount_anchor()) + switch(dir) + if(SOUTH) + base_pixel_y = 22 + if(NORTH) + base_pixel_y = -22 + if(EAST) + base_pixel_x = -22 + if(WEST) + base_pixel_x = 22 + reset_pixel_offsets() + if(terminal) terminal.disconnect_from_network() - terminal.setDir(src.dir) // Terminal has same dir as master + terminal.setDir(turn(src.dir, 180)) // Terminal has same dir as master terminal.connect_to_network() // Refresh the network the terminal is connected to. - return /obj/machinery/power/apc/proc/energy_fail(var/duration) failure_timer = max(failure_timer, round(duration)) @@ -422,7 +286,7 @@ GLOBAL_LIST_EMPTY(apcs) // create a terminal object at the same position as original turf loc // wires will attach to this terminal = new/obj/machinery/power/terminal(src.loc) - terminal.setDir(dir) + terminal.setDir(turn(dir, 180)) terminal.master = src /obj/machinery/power/apc/proc/autobuild() @@ -568,24 +432,6 @@ GLOBAL_LIST_EMPTY(apcs) else set_light(0) -/obj/machinery/power/apc/setDir(new_dir) - . = ..() - base_pixel_x = 0 - base_pixel_y = 0 - var/turf/T = get_step(get_turf(src), dir) - if(istype(T) && T.density) - switch(dir) - if(SOUTH) - base_pixel_y = -22 - if(NORTH) - base_pixel_y = 22 - if(EAST) - base_pixel_x = 22 - if(WEST) - base_pixel_x = -22 - reset_pixel_offsets() - - /obj/machinery/power/apc/proc/check_updates() var/last_update_state = update_state @@ -1002,7 +848,7 @@ GLOBAL_LIST_EMPTY(apcs) ui = new(user, src, "APC", name) // 510, 460 ui.open() -/obj/machinery/power/apc/ui_data(mob/user) +/obj/machinery/power/apc/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "locked" = locked, "normallyLocked" = locked, @@ -1058,7 +904,7 @@ GLOBAL_LIST_EMPTY(apcs) return data -/obj/machinery/power/apc/ui_act(action, params) +/obj/machinery/power/apc/ui_act(action, list/params, datum/tgui/ui) if(..() || !can_use(usr, TRUE)) return TRUE diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index c33bf31060..328ce54071 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -255,33 +255,20 @@ return /obj/item/cell/proc/get_electrocute_damage() - switch (charge) -/* if (9000 to INFINITY) - return min(rand(90,150),rand(90,150)) - if (2500 to 9000-1) - return min(rand(70,145),rand(70,145)) - if (1750 to 2500-1) - return min(rand(35,110),rand(35,110)) - if (1500 to 1750-1) - return min(rand(30,100),rand(30,100)) - if (750 to 1500-1) - return min(rand(25,90),rand(25,90)) - if (250 to 750-1) - return min(rand(20,80),rand(20,80)) - if (100 to 250-1) - return min(rand(20,65),rand(20,65))*/ - if (1000000 to INFINITY) - return min(rand(50,160),rand(50,160)) - if (200000 to 1000000-1) - return min(rand(25,80),rand(25,80)) - if (100000 to 200000-1)//Ave powernet - return min(rand(20,60),rand(20,60)) - if (50000 to 100000-1) - return min(rand(15,40),rand(15,40)) - if (1000 to 50000-1) - return min(rand(10,20),rand(10,20)) - else - return 0 + //1kW = 5 + //10kW = 24 + //100kW = 45 + //250kW = 53 + //1MW = 66 + //10MW = 88 + //100MW = 110 + //1GW = 132 + if(charge >= 1000) + var/damage = log(1.1,charge) + damage = damage - (log(1.1,damage)*1.5) + return round(damage) + else + return 0 /obj/item/cell/suicide_act(mob/user) var/datum/gender/TU = GLOB.gender_datums[user.get_visible_gender()] diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 372564cb0d..55f00fb7aa 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(all_turbines) ui = new(user, src, "TEGenerator", name) ui.open() -/obj/machinery/power/generator/ui_data(mob/user) +/obj/machinery/power/generator/ui_data(mob/user, datum/tgui/ui) // this is the data which will be sent to the ui var/vertical = 0 if (dir == NORTH || dir == SOUTH) diff --git a/code/modules/power/geothermal_power.dm b/code/modules/power/geothermal_power.dm index b406a5b5fa..e8ffede55e 100644 --- a/code/modules/power/geothermal_power.dm +++ b/code/modules/power/geothermal_power.dm @@ -23,6 +23,14 @@ var/active_for = -1 var/power_total = 0 +/obj/machinery/power/geothermal_controller/examine(mob/user, dist) + . = ..() + if(isrobot(user) && !scanner) + . += "You can connect the controller to your internal scanning array, and allow it to temporary connect to the collectors, [src] would generate power for approximately 30 Minutes." + if(scanner) + . += "With [scanner] installed, [src] is providing [power_total/power_factor] Kilowatts." + + /obj/machinery/power/geothermal_controller/can_drain_energy(datum/actor, flags) return FALSE diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 27ec2fa4f1..d4bcc7eebf 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -251,7 +251,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) ui = new(user, src, "GravityGenerator", name) ui.open() -/obj/machinery/gravity_generator/main/ui_data(mob/user) +/obj/machinery/gravity_generator/main/ui_data(mob/user, datum/tgui/ui) var/data[0] data["breaker"] = breaker @@ -262,7 +262,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) return data -/obj/machinery/gravity_generator/main/ui_act(action, params) +/obj/machinery/gravity_generator/main/ui_act(action, list/params, datum/tgui/ui) if((..())) return TRUE diff --git a/code/modules/power/lighting/lighting.dm b/code/modules/power/lighting/lighting.dm index aa97f40d75..01cbb7b10b 100644 --- a/code/modules/power/lighting/lighting.dm +++ b/code/modules/power/lighting/lighting.dm @@ -296,6 +296,10 @@ var/global/list/light_type_cache = list() var/brightness_power_ns var/brightness_color_ns + #ifdef IN_MAP_EDITOR // So its actually visible in the mapping editor + icon_state = "tube_map" + #endif + /obj/machinery/light/flicker auto_flicker = TRUE @@ -419,6 +423,8 @@ var/global/list/light_type_cache = list() light_type = /obj/item/light/tube/large shows_alerts = FALSE +/obj/machinery/light/spot/no_nightshift + nightshift_allowed = FALSE /obj/machinery/light/spot/flicker auto_flicker = TRUE @@ -560,9 +566,9 @@ var/global/list/light_type_cache = list() needsound = FALSE // Don't play sound again until we've been turned off if(on) - var/correct_range = nightshift_enabled ? brightness_range_ns : brightness_range - var/correct_power = nightshift_enabled ? brightness_power_ns : brightness_power - var/correct_color = nightshift_enabled ? brightness_color_ns : brightness_color + var/correct_range = nightshift_enabled ? (brightness_range_ns || brightness_range) : brightness_range + var/correct_power = nightshift_enabled ? (brightness_power_ns || brightness_power) : brightness_power + var/correct_color = nightshift_enabled ? (brightness_color_ns || brightness_color) : brightness_color if(light_range != correct_range || light_power != correct_power || light_color != correct_color) if(!auto_flicker) switchcount++ diff --git a/code/modules/power/lighting/lights.dm b/code/modules/power/lighting/lights.dm index 310aa16730..9b8c12f5bc 100644 --- a/code/modules/power/lighting/lights.dm +++ b/code/modules/power/lighting/lights.dm @@ -20,13 +20,18 @@ var/rigged = 0 var/broken_chance = 0 - ///how much light it gives off + /// range of light var/brightness_range = 8 + /// power of light var/brightness_power = 0.8 + /// color of light var/brightness_color = LIGHT_COLOR_HALOGEN - var/nightshift_range = 6 - var/nightshift_power = 0.5 + /// range of light under nightshift; null for no change + var/nightshift_range = LIGHT_RANGE_NIGHTSHIFT + /// power of light under nightshift; null for no change + var/nightshift_power = LIGHT_POWER_NIGHTSHIFT + /// color of light under nightshift; null for no change var/nightshift_color = LIGHT_COLOR_NIGHTSHIFT /obj/item/light/tube @@ -104,12 +109,17 @@ base_icon_state = "lbulb" item_state = "contvapour" materials_base = list(MAT_GLASS = 100) - brightness_color = LIGHT_COLOR_TUNGSTEN + brightness_color = LIGHT_COLOR_TUNGSTEN brightness_range = 4 + brightness_power = 0.8 - nightshift_range = 4 - nightshift_power = 0.5 + // todo: bulb nightshift stuff needs to be defines + // we basically disable it because bulbs are already pretty weak + + nightshift_color = null + nightshift_range = null + nightshift_power = null /obj/item/light/bulb/strong name = "light bulb" @@ -118,14 +128,9 @@ base_icon_state = "lbulb" item_state = "contvapour" materials_base = list(MAT_GLASS = 100) - brightness_color = LIGHT_COLOR_TUNGSTEN brightness_range = 8 - nightshift_range = 8 //Basically just a no-nightshift light. - nightshift_power = 0.8 - nightshift_color = LIGHT_COLOR_TUNGSTEN - /obj/item/light/throw_impact(atom/hit_atom) ..() shatter() diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 6d63e7f0bc..c747461807 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -317,7 +317,7 @@ ui = new(user, src, "PortableGenerator", name) ui.open() -/obj/machinery/power/port_gen/pacman/ui_data(mob/user) +/obj/machinery/power/port_gen/pacman/ui_data(mob/user, datum/tgui/ui) // todo: rewrite the whole fuckin' UI. var/list/data = list() @@ -349,7 +349,7 @@ return data -/obj/machinery/power/port_gen/pacman/ui_act(action, params) +/obj/machinery/power/port_gen/pacman/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index cf23334ca3..57a2d18c83 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -131,19 +131,20 @@ newavail = 0 /datum/powernet/proc/get_electrocute_damage() - switch(avail) - if (1000 to INFINITY) - return min(rand(50,160),rand(50,160)) - if (200 to 1000) - return min(rand(25,80),rand(25,80)) - if (100 to 200)//Ave powernet - return min(rand(20,60),rand(20,60)) - if (50 to 100) - return min(rand(15,40),rand(15,40)) - if (1 to 50) - return min(rand(10,20),rand(10,20)) - else - return 0 + //1kW = 5 + //10kW = 24 + //100kW = 45 + //250kW = 53 + //1MW = 66 + //10MW = 88 + //100MW = 110 + //1GW = 132 + if(avail >= 1000) + var/damage = log(1.1,avail) + damage = damage - (log(1.1,damage)*1.5) + return round(damage) + else + return 0 /datum/powernet/proc/drain_energy_handler(datum/actor, amount, flags) // amount is in kj so no conversion needed diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm index 3cdbd95245..5d78626e64 100644 --- a/code/modules/power/sensors/powernet_sensor.dm +++ b/code/modules/power/sensors/powernet_sensor.dm @@ -92,7 +92,7 @@ if(demand.len > record_size) demand.Cut(1, 2) -/obj/machinery/power/sensor/ui_data() +/obj/machinery/power/sensor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["name"] = name_tag diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 6a8e69517e..2d2291df60 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -8,6 +8,7 @@ anchored = 0 density = 1 req_access = list(ACCESS_ENGINEERING_ENGINE) + armor_type = /datum/armor/object/medium var/id = null use_power = USE_POWER_OFF //uses powernet power, not APC power @@ -27,9 +28,6 @@ var/burst_delay = 2 var/initial_fire_delay = 100 - integrity = 80 - - /obj/machinery/power/emitter/verb/rotate_clockwise() set name = "Rotate Emitter Clockwise" set category = "Object" @@ -220,7 +218,7 @@ if(do_after(user, 30)) if(P.use(amt)) to_chat(user, "You have repaired \the [src].") - integrity = initial(integrity) + set_integrity(integrity_max) return else to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") @@ -246,37 +244,6 @@ user.visible_message("[user.name] emags [src].","You short out the lock.") return 1 -/obj/machinery/power/emitter/bullet_act(var/obj/projectile/P) - if(!P || !P.damage || P.get_structure_damage() <= 0 ) - return - - adjust_integrity_emitter(-P.get_structure_damage()) - -/obj/machinery/power/emitter/blob_act() - adjust_integrity_emitter(-1000) // This kills the emitter. - -/obj/machinery/power/emitter/proc/adjust_integrity_emitter(amount) - integrity = clamp( integrity + amount, 0, initial(integrity)) - if(integrity == 0) - if(powernet && avail(active_power_usage * 0.001)) // If it's powered, it goes boom if killed. - visible_message(src, "\The [src] explodes violently!", "You hear an explosion!") - explosion(get_turf(src), 1, 2, 4) - else - src.visible_message("\The [src] crumples apart!", "You hear metal collapsing.") - if(src) - qdel(src) - -/obj/machinery/power/emitter/examine(mob/user, dist) - . = ..() - var/integrity_percentage = round((integrity / initial(integrity)) * 100) - switch(integrity_percentage) - if(0 to 30) - . += "\The [src] is close to falling apart!" - if(31 to 70) - . += "\The [src] is damaged." - if(77 to 99) - . += "\The [src] is slightly damaged." - //R-UST port /obj/machinery/power/emitter/proc/get_initial_fire_delay() return initial_fire_delay diff --git a/code/modules/power/smes/smes.dm b/code/modules/power/smes/smes.dm index 2a744c2905..9d2082dd45 100644 --- a/code/modules/power/smes/smes.dm +++ b/code/modules/power/smes/smes.dm @@ -312,7 +312,7 @@ GLOBAL_LIST_EMPTY(smeses) ui = new(user, src, "Smes", name) ui.open() -/obj/machinery/power/smes/ui_data() +/obj/machinery/power/smes/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "capacity" = capacity, "capacityPercent" = round(100.0*charge/capacity, 0.1), @@ -330,7 +330,7 @@ GLOBAL_LIST_EMPTY(smeses) ) return data -/obj/machinery/power/smes/ui_act(action, params) +/obj/machinery/power/smes/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) diff --git a/code/modules/power/smes/smes_construction.dm b/code/modules/power/smes/smes_construction.dm index 1f31d68d47..ff6d1f8bbe 100644 --- a/code/modules/power/smes/smes_construction.dm +++ b/code/modules/power/smes/smes_construction.dm @@ -165,7 +165,7 @@ log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100") message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP") - var/used_hand = h_user.hand?"l_hand":"r_hand" + var/used_hand = h_user.hand? BP_L_HAND : BP_R_HAND switch (intensity) if (0 to 15) @@ -176,7 +176,11 @@ to_chat(h_user, "A small electrical arc almost burns your hand. Luckily you had your gloves on!") else to_chat(h_user, "A small electrical arc sparks and burns your hand as you touch the [src]!") - h_user.adjustFireLossByPart(rand(5,10), used_hand) + h_user.take_targeted_damage( + burn = rand(5, 10), + damage_mode = DAMAGE_MODE_REDIRECT, + body_zone = used_hand, + ) h_user.afflict_paralyze(20 * 2) if (16 to 35) @@ -187,7 +191,11 @@ to_chat(h_user, "A medium electrical arc sparks and almost burns your hand. Luckily you had your gloves on!") else to_chat(h_user, "A medium electrical arc sparks as you touch the [src], severely burning your hand!") - h_user.adjustFireLossByPart(rand(10,25), used_hand) + h_user.take_targeted_damage( + burn = rand(10, 25), + damage_mode = DAMAGE_MODE_REDIRECT, + body_zone = used_hand, + ) h_user.afflict_paralyze(20 * 5) spawn() empulse(get_turf(src), 1, 2, 3, 4) @@ -198,7 +206,11 @@ s.set_up(7,1,src) if (user_protected) to_chat(h_user, "A strong electrical arc sparks between you and [src], ignoring your gloves and burning your hand!") - h_user.adjustFireLossByPart(rand(25,60), used_hand) + h_user.take_targeted_damage( + burn = rand(25, 60), + damage_mode = DAMAGE_MODE_REDIRECT, + body_zone = used_hand, + ) h_user.afflict_paralyze(20 * 8) else to_chat(h_user, "A strong electrical arc sparks between you and [src], knocking you out for a while!") @@ -241,8 +253,6 @@ s.start() charge = 0 - - // Proc: apcs_overload() // Parameters: 2 (failure_chance - chance to actually break the APC, overload_chance - Chance of breaking lights) // Description: Damages output powernet by power surge. Destroys few APCs and lights, depending on parameters. diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 6baeccbbb8..a952df51bc 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -416,7 +416,7 @@ ui.open() // This is purely informational UI that may be accessed by AIs or robots -/obj/machinery/power/supermatter/ui_data(mob/user) +/obj/machinery/power/supermatter/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["integrity_percentage"] = round(get_integrity()) diff --git a/code/modules/preferences/preference_setup/helpers/language_pick.dm b/code/modules/preferences/preference_setup/helpers/language_pick.dm index 7ebdef1abb..eb7a52085f 100644 --- a/code/modules/preferences/preference_setup/helpers/language_pick.dm +++ b/code/modules/preferences/preference_setup/helpers/language_pick.dm @@ -60,10 +60,10 @@ GLOBAL_LIST_EMPTY(language_picker_active) ui.autoupdate = FALSE // why the fuck are you updating language data?? ui.open() -/datum/tgui_language_picker/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_language_picker/ui_status(mob/user, datum/ui_state/state) return UI_INTERACTIVE -/datum/tgui_language_picker/ui_static_data(mob/user) +/datum/tgui_language_picker/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/built = list() var/list/categories = list("General") @@ -81,7 +81,7 @@ GLOBAL_LIST_EMPTY(language_picker_active) data["categories"] = categories return data -/datum/tgui_language_picker/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_language_picker/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() if(!QDELING(src)) qdel(src) diff --git a/code/modules/preferences/preference_setup/helpers/species_pick.dm b/code/modules/preferences/preference_setup/helpers/species_pick.dm index 46c240433a..06786ee347 100644 --- a/code/modules/preferences/preference_setup/helpers/species_pick.dm +++ b/code/modules/preferences/preference_setup/helpers/species_pick.dm @@ -113,10 +113,10 @@ GLOBAL_LIST_EMPTY(species_picker_active) ui.autoupdate = FALSE // why the fuck are you updating species data?? ui.open() -/datum/tgui_species_picker/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_species_picker/ui_status(mob/user, datum/ui_state/state) return UI_INTERACTIVE -/datum/tgui_species_picker/ui_static_data(mob/user) +/datum/tgui_species_picker/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() data["whitelisted"] = whitelisted data["species"] = SScharacters.character_species_cache @@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(species_picker_active) data["admin"] = !!admin_datums[user.ckey] return data -/datum/tgui_species_picker/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_species_picker/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() if(!QDELING(src)) qdel(src) diff --git a/code/modules/preferences/preference_setup/loadout/loadout.dm b/code/modules/preferences/preference_setup/loadout/loadout.dm index 3af7b92af1..30e516b560 100644 --- a/code/modules/preferences/preference_setup/loadout/loadout.dm +++ b/code/modules/preferences/preference_setup/loadout/loadout.dm @@ -98,7 +98,7 @@ . = FALSE current_cost += entry.cost -/datum/category_item/player_setup_item/loadout/gear/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/category_item/player_setup_item/loadout/gear/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["gearContext"] = tgui_loadout_context() var/list/allowed_ids = list() @@ -114,7 +114,7 @@ ui = new(user, src, "CharacterLoadoutStandalone") ui.open() -/datum/category_item/player_setup_item/loadout/gear/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/category_item/player_setup_item/loadout/gear/ui_status(mob/user, datum/ui_state/state) return UI_INTERACTIVE /datum/category_item/player_setup_item/loadout/gear/proc/tgui_loadout_selected(list/loadout_slot) diff --git a/code/modules/preferences/preference_setup/vore/08_traits.dm b/code/modules/preferences/preference_setup/vore/08_traits.dm index 20e790067e..3c79793893 100644 --- a/code/modules/preferences/preference_setup/vore/08_traits.dm +++ b/code/modules/preferences/preference_setup/vore/08_traits.dm @@ -1,6 +1,7 @@ #define POSITIVE_MODE 1 #define NEUTRAL_MODE 2 #define NEGATIVE_MODE 3 +#define ALL_MODE 4 /datum/preferences var/custom_species // Custom species name, can't be changed due to it having been used in savefiles already. @@ -72,7 +73,7 @@ if(pref.real_species_id() != SPECIES_ID_CUSTOM) pref.pos_traits.Cut() - pref.neg_traits.Cut() + // Clean up positive traits for(var/path in pref.pos_traits) if(!(path in positive_traits)) @@ -87,6 +88,8 @@ for(var/path in pref.neg_traits) if(!(path in negative_traits)) pref.neg_traits -= path + if((pref.real_species_id() != SPECIES_ID_CUSTOM) && !(path in everyone_traits)) + pref.neg_traits -= path var/datum/species/selected_species = pref.real_species_datum() if(selected_species.selects_bodytype) @@ -160,12 +163,22 @@ . += "
  • - [trait.name] ([trait.cost])
    • " . += "" - . += "Neutral Trait +
    " - . += "" + . += "Neutral Trait +
    " + . += "" + else + . += "Trait +
    " + . += "" . += "Blood Color: " //People that want to use a certain species to have that species traits (xenochimera/promethean/spider) should be able to set their own blood color. . += "Set Color" @@ -282,7 +295,9 @@ if(NEGATIVE_MODE) picklist = negative_traits.Copy() - pref.neg_traits mylist = pref.neg_traits - else + if(ALL_MODE) + picklist = everyone_traits.Copy() - pref.neu_traits - pref.neg_traits + mylist = pref.neg_traits.Copy() + pref.neu_traits.Copy() if(isnull(picklist)) return PREFERENCES_REFRESH @@ -291,8 +306,12 @@ return PREFERENCES_REFRESH var/list/nicelist = list() + var/species = pref.real_species_name() for(var/P in picklist) var/datum/trait/T = picklist[P] + if(LAZYLEN(T.allowed_species) && !(species in T.allowed_species)) + picklist -= P + continue nicelist[T.name] = P var/points_left = pref.starting_trait_points @@ -351,6 +370,12 @@ Please remove that trait, or pick another trait to add.","Error") return PREFERENCES_REFRESH + if(mode == ALL_MODE) + if(instance.cost < 0) + mylist = pref.neg_traits + else + mylist = pref.neu_traits + mylist += path return PREFERENCES_REFRESH @@ -359,3 +384,4 @@ #undef POSITIVE_MODE #undef NEUTRAL_MODE #undef NEGATIVE_MODE +#undef ALL_MODE diff --git a/code/modules/reagents/Drink-Recipes.dm b/code/modules/reagents/Drink-Recipes.dm index bcbf20e529..26e25d2d81 100644 --- a/code/modules/reagents/Drink-Recipes.dm +++ b/code/modules/reagents/Drink-Recipes.dm @@ -191,7 +191,7 @@ /datum/chemical_reaction/drinks/kahlua name = "Kahlua" id = "kahlua" - result = "kahlua" + result = /datum/reagent/ethanol/coffee/kahlua required_reagents = list("coffee" = 5, "sugar" = 5) catalysts = list("enzyme" = 5) result_amount = 5 @@ -1339,13 +1339,6 @@ required_reagents = list("gin" = 1, "limejuice" = 1, "sodawater" = 1) result_amount = 3 -/datum/chemical_reaction/drinks/firepunch - name = "Fire Punch" - id = "firepunch" - result = "firepunch" - required_reagents = list("sugar" = 2, "rum" = 1) - result_amount = 3 - /datum/chemical_reaction/drinks/newsheriff name = "New Sheriff" id = "newsheriff" @@ -1882,6 +1875,13 @@ required_reagents = list("vodka" = 1, "kyocola" = 1, "ice" = 1) result_amount = 3 +/datum/chemical_reaction/drinks/mimosa + name = "Mimosa" + id = "mimosa" + result = "mimosa" + required_reagents = list("orangejuice" = 1, "champagne" = 1) + result_amount = 3 + // Unathi drinks /datum/chemical_reaction/drinks/skrianhi diff --git a/code/modules/reagents/chemistry/colors.dm b/code/modules/reagents/chemistry/colors.dm index ace030e3bf..2380c5348c 100644 --- a/code/modules/reagents/chemistry/colors.dm +++ b/code/modules/reagents/chemistry/colors.dm @@ -21,6 +21,7 @@ return mixcolor /datum/reagents/proc/get_color() + // todo: cache this shit if(!reagent_list || !reagent_list.len) return "#ffffffff" if(reagent_list.len == 1) // It's pretty common and saves a lot of work diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 6290a7efed..4eaaec6b49 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -4,6 +4,7 @@ var/reagent_holder_flags = NONE ///? legacy / unsorted + // todo: 3 lists, for volume, data, flags; data should always be a list. var/list/datum/reagent/reagent_list = list() var/total_volume = 0 var/maximum_volume = 100 @@ -179,6 +180,9 @@ update_total() /datum/reagents/proc/remove_reagent(id, amount, safety = 0) + if(ispath(id)) + var/datum/reagent/path = id + id = initial(path.id) if(!isnum(amount)) return 0 for(var/datum/reagent/current in reagent_list) @@ -203,6 +207,9 @@ return 0 /datum/reagents/proc/has_reagent(id, amount = 0) + if(ispath(id)) + var/datum/reagent/path = id + id = initial(path.id) for(var/datum/reagent/current in reagent_list) if(current.id == id) if(current.volume >= amount) @@ -229,22 +236,6 @@ missing-- return !missing -/** - * returns lowest multiple of what we have compared to reagents list. - * - * both typepaths and ids are acceptable. - */ -/datum/reagents/proc/has_multiple(list/reagents, multiplier = 1) - . = INFINITY - // *sigh* - var/list/legacy_translating = list() - for(var/datum/reagent/R in reagent_list) - legacy_translating[R.id] = R.volume - for(var/datum/reagent/reagent as anything in reagents) - . = min(., legacy_translating[ispath(reagent)? initial(reagent.id) : reagent] / reagents[reagent]) - if(!.) - return - /datum/reagents/proc/clear_reagents() for(var/datum/reagent/current in reagent_list) del_reagent(current.id) @@ -256,6 +247,9 @@ return current /datum/reagents/proc/get_reagent_amount(id) + if(ispath(id)) + var/datum/reagent/path = id + id = initial(path.id) for(var/datum/reagent/current in reagent_list) if(current.id == id) return current.volume @@ -536,7 +530,7 @@ do_happen = TRUE return do_happen -//? Queries - Whole +//? Queries /** * returns volume remaining @@ -544,6 +538,80 @@ /datum/reagents/proc/available_volume() return maximum_volume - total_volume +/** + * returns lowest multiple of what we have compared to reagents list. + * + * both typepaths and ids are acceptable. + */ +/datum/reagents/proc/has_multiple(list/reagents, multiplier = 1) + . = INFINITY + // *sigh* + var/list/legacy_translating = list() + for(var/datum/reagent/R in reagent_list) + legacy_translating[R.id] = R.volume + for(var/datum/reagent/reagent as anything in reagents) + . = min(., legacy_translating[ispath(reagent)? initial(reagent.id) : reagent] / reagents[reagent]) + if(!.) + return + +//? Transfers + +/** + * @params + * * target - target holder + * * reagents - list of paths or ids to filter by + * * amount - limit of how much + * * copy - do not remove the reagent from source + * * multiplier - magically multiply the transferred reagent volumes by this much; does not affect return value. + * * defer_reactions - should we + the recipient handle reactions? + * + * @return reagents transferred + */ +/datum/reagents/proc/transfer_to_holder(datum/reagents/target, list/reagents, amount = INFINITY, copy, multiplier = 1, defer_reactions) + . = 0 + if(!total_volume) + return + if(!reagents) + var/ratio = min(1, (target.maximum_volume - target.total_volume) / total_volume) + . = total_volume * ratio + if(!copy) + for(var/datum/reagent/R as anything in reagent_list) + var/transferred = R.volume * ratio + target.add_reagent(R.id, transferred * multiplier, R.get_data(), safety = TRUE) + remove_reagent(R.id, transferred, safety = TRUE) + else + for(var/datum/reagent/R as anything in reagent_list) + var/transferred = R.volume * ratio + target.add_reagent(R.id, transferred * multiplier, R.get_data(), safety = TRUE) + else + var/total_transferable = 0 + var/list/reagents_transferring = list() + // preprocess + for(var/i in 1 to length(reagents)) + reagents[i] = SSchemistry.fetch_reagent(reagents[i]) + // filter & gather + for(var/datum/reagent/R as anything in reagent_list) + if(!(R.id in reagents)) + continue + total_transferable += R.volume + reagents_transferring += R + var/ratio = min(1, (target.maximum_volume - target.total_volume) / total_transferable) + . = total_transferable * ratio + if(!copy) + for(var/datum/reagent/R as anything in reagents_transferring) + var/transferred = R.volume * ratio + target.add_reagent(R.id, transferred * multiplier, R.get_data(), safety = TRUE) + remove_reagent(R.id, transferred, safety = TRUE) + else + for(var/datum/reagent/R as anything in reagents_transferring) + var/transferred = R.volume * ratio + target.add_reagent(R.id, transferred * multiplier, R.get_data(), safety = TRUE) + + if(!defer_reactions) + if(!copy) + handle_reactions() + target.handle_reactions() + //? UI /** diff --git a/code/modules/reagents/chemistry/reaction.dm b/code/modules/reagents/chemistry/reaction.dm index a0a05f3265..1c2d3a9daa 100644 --- a/code/modules/reagents/chemistry/reaction.dm +++ b/code/modules/reagents/chemistry/reaction.dm @@ -93,7 +93,7 @@ result = initial(result_initial.id) /datum/chemical_reaction/proc/generate() - var/datum/reagent/resolved = SSchemistry.get_reagent(result) + var/datum/reagent/resolved = SSchemistry.fetch_reagent(result) if(isnull(name)) name = resolved?.name || "???" if(isnull(display_name) && !isnull(resolved)) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm index 1ea7bfec45..2f7c603636 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm @@ -100,12 +100,13 @@ if(is_vampire) handle_vampire(M, alien, removed, is_vampire) - var/effective_dose = strength_mod * dose // this was being recalculated a bunch before--why? if(HAS_TRAIT(M, TRAIT_ALCOHOL_INTOLERANT)) - if(prob(effective_dose/10)) + var/intolerant_dose = 50*strength_mod*removed/strength + if(prob((intolerant_dose))) M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) - M.adjustToxLoss(effective_dose/10) + M.adjustToxLoss(intolerant_dose) // 10 strength = 5 tox per u, so 10u deathbell = 50, 10u vodka = 3.3333..., 10u beer = 10 return 0 + var/effective_dose = strength_mod * dose // this was being recalculated a bunch before--why? M.add_chemical_effect(CE_ALCOHOL, 1) if(effective_dose >= strength) // Early warning M.make_dizzy(6) // It is decreased at the speed of 3 per tick @@ -167,7 +168,7 @@ /datum/reagent/acid/affect_blood(mob/living/carbon/M, alien, removed) if(issmall(M)) removed *= 2 - M.take_organ_damage(0, removed * power * 2) + M.take_random_targeted_damage(brute = 0, brute = removed * power * 2) /datum/reagent/acid/affect_touch(mob/living/carbon/M, alien, removed) // This is the most interesting if(ishuman(M)) @@ -213,20 +214,21 @@ return if(volume < meltdose) // Not enough to melt anything - M.take_organ_damage(0, removed * power * 0.2) //burn damage, since it causes chemical burns. Acid doesn't make bones shatter, like brute trauma would. + M.take_random_targeted_damage(brute = 0, brute = removed * power * 0.2) //burn damage, since it causes chemical burns. Acid doesn't make bones shatter, like brute trauma would. return if(!M.unacidable && removed > 0) if(istype(M, /mob/living/carbon/human) && volume >= meltdose) var/mob/living/carbon/human/H = M var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD) if(affecting) - if(affecting.take_damage(0, removed * power * 0.1)) - H.UpdateDamageIcon() + affecting.inflict_bodypart_damage( + burn = removed * power * 0.1, + ) if(prob(100 * removed / meltdose)) // Applies disfigurement if (affecting.organ_can_feel_pain()) H.emote("scream") else - M.take_organ_damage(0, removed * power * 0.1) // Balance. The damage is instant, so it's weaker. 10 units -> 5 damage, double for pacid. 120 units beaker could deal 60, but a) it's burn, which is not as dangerous, b) it's a one-use weapon, c) missing with it will splash it over the ground and d) clothes give some protection, so not everything will hit + M.take_random_targeted_damage(brute = 0, brute = removed * power * 0.1) // Balance. The damage is instant, so it's weaker. 10 units -> 5 damage, double for pacid. 120 units beaker could deal 60, but a) it's burn, which is not as dangerous, b) it's a one-use weapon, c) missing with it will splash it over the ground and d) clothes give some protection, so not everything will hit /datum/reagent/acid/touch_obj(obj/O) if(O.integrity_flags & INTEGRITY_INDESTRUCTIBLE) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm index 974e3fcbf5..a081c35e37 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm @@ -138,7 +138,7 @@ /datum/reagent/nutriment/mayo name = "mayonnaise" id = "mayo" - description = "A thick, bitter sauce." + description = "A thick, savory sauce." taste_description = "unmistakably mayonnaise" nutriment_factor = 10 color = "#FFFFFF" @@ -191,8 +191,6 @@ nutriment_factor = 5 color = "#302000" -/datum/reagent/nutriment/coco/affect_ingest(mob/living/carbon/M, alien, removed) - M.nutrition += removed * 5 /datum/reagent/nutriment/instantjuice name = "Juice Powder" id = "instantjuice" @@ -775,6 +773,8 @@ id = "grapejuice" description = "It's grrrrrape!" taste_description = "grapes" + nutrition=1 // also applies to all of the other juices + color = "#863333" glass_name = "Grape Juice" @@ -873,6 +873,7 @@ description = "Juice of the potato. Bleh." taste_description = "potatoes" nutrition = 2 + color = "#302000" glass_name = "Potato Juice" @@ -924,6 +925,7 @@ taste_description = "milk" color = "#DFDFDF" var/contains_lactose = TRUE + nutrition=5 glass_name = "Milk" glass_desc = "White and nutritious goodness!" @@ -938,7 +940,6 @@ description = "A delicious mixture of perfectly healthy mix and terrible chocolate." taste_description = "chocolate milk" color = "#74533b" - cup_icon_state = "cup_brown" cup_name = "Cup of Chocolate Milk" cup_desc = "Deliciously fattening!" @@ -974,6 +975,7 @@ description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" taste_description = "thick milk" color = "#DFD7AF" + nutrition=10 glass_name = "Cream" glass_desc = "Ewwww..." @@ -1087,6 +1089,7 @@ description = "A tasty mixture of lemon and tea. It's apparently good for you!" color = "#FC6A00" taste_description = "black tea with tones of lemon" + nutrition=1 glass_name = "Lemon Tea" glass_desc = "A tasty mixture of lemon and tea. It's apparently good for you!" @@ -1100,6 +1103,7 @@ description = "A tasty mixture of lime and tea. It's apparently good for you!" color = "#DE4300" taste_description = "black tea with tones of lime" + nutrition=1 glass_name = "Lime Tea" glass_desc = "A tasty mixture of lime and tea. It's apparently good for you!" @@ -1113,6 +1117,7 @@ description = "A tasty mixture of orange and tea. It's apparently good for you!" color = "#FB4F06" taste_description = "black tea with tones of orange" + nutrition=1 glass_name = "Orange Tea" glass_desc = "A tasty mixture of orange and tea. It's apparently good for you!" @@ -1126,6 +1131,7 @@ description = "A tasty mixture of berries and tea. It's apparently good for you!" color = "#A60735" taste_description = "black tea with tones of berries" + nutrition=1 glass_name = "Berry Tea" glass_desc = "A tasty mixture of berries and tea. It's apparently good for you!" @@ -1139,6 +1145,7 @@ description = "Sweet iced tea cut with milk." taste_description = "sweet, silky smooth tea" color = "#ffffff" + nutrition=3 glass_name = "Milk Tea" glass_desc = "Sweet iced tea cut with milk." @@ -1162,6 +1169,7 @@ description = "Chilled milk tea with chewy tapioca pearls and a spoonful of honey." taste_description = "sweet, silky smooth tea and notes of honey" color = "#ffffff" + nutrition=5 glass_name = "Honey Bubble Tea" glass_desc = "Chilled milk tea with chewy tapioca pearls and a spoonful of honey." @@ -1176,6 +1184,7 @@ description = "Chilled milk and green tea with chewy tapioca pearls." taste_description = "sweet, silky smooth green tea" color = "#1db883" + nutrition=5 glass_name = "Matcha Bubble Tea" glass_desc = "Chilled milk and green tea with chewy tapioca pearls. It's GREEN!" @@ -1190,6 +1199,7 @@ description = "Chilled milk tea with chewy tapioca pearls and taro." taste_description = "incredibly sweet, silky smooth tea" color = "#b87098" + nutrition=5 glass_name = "Taro Bubble Tea" glass_desc = "Chilled milk tea with chewy tapioca pearls and taro. It's PURPLE!" @@ -1204,6 +1214,7 @@ description = "Chilled milk tea with chewy tapioca pearls and a spoonful of chocolate mixed in." taste_description = "sweet, silky smooth tea and notes of chocolate" color = "#754a2e" + nutrition=5 glass_name = "Chocolate Bubble Tea" glass_desc = "Chilled milk tea with chewy tapioca pearls and a spoonful of chocolate mixed in." @@ -1218,6 +1229,7 @@ description = "Super sweet mix of milk, tea, coffee, and chocolate, topped off with a generous helping of whipped cream." taste_description = "barista's ire and sugarmilk overload" color = "#5c2c0c" + nutrition=5 glass_name = "Mocha Bubble Tea" glass_desc = "Super sweet mix of milk, tea, coffee, and chocolate, topped off with a generous helping of whipped cream. That seems like a lot of sugar. You're going to put that in you?" @@ -1232,7 +1244,8 @@ description = "A fresh clear liquid found within coconuts." taste_description = "tropical, somewhat buttery water" color = "#fafafa70" - + nutrition=1 + glass_name = "Coconut Water" glass_desc = "A fresh clear liquid found within coconuts." @@ -1306,6 +1319,7 @@ taste_description = "creamy coffee" color = "#C65905" adj_temp = 5 + nutrition=1 glass_desc = "A nice and refreshing beverage while you are reading." glass_name = "Soy Latte" @@ -1326,6 +1340,7 @@ taste_description = "bitter cream" color = "#C65905" adj_temp = 5 + nutrition=1 glass_name = "Cafe Latte" glass_desc = "A nice, strong and refreshing beverage while you are reading." @@ -1381,6 +1396,7 @@ taste_description = "grape soda" color = "#421C52" adj_drowsy = -3 + nutrition=5 glass_name = "Grape Soda" glass_desc = "Looks like a delicious drink!" @@ -1392,6 +1408,7 @@ description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." taste_description = "tart and fresh" color = "#619494" + nutrition=1 adj_dizzy = -5 adj_drowsy = -3 @@ -1408,6 +1425,7 @@ taste_description = "lemonade" color = "#FFFF00" adj_temp = -5 + nutrition=3 glass_name = "Lemonade" glass_desc = "Oh the nostalgia..." @@ -1420,6 +1438,7 @@ taste_description = "watermelon" color = "#FFB3BB" adj_temp = -5 + nutrition=3 glass_name = "Melonade" glass_desc = "Oh the.. nostalgia?" @@ -1432,6 +1451,7 @@ taste_description = "sparkling apples" color = "#FFD1B3" adj_temp = -5 + nutrition=3 glass_name = "Appleade" glass_desc = "Applejuice, improved." @@ -1444,6 +1464,7 @@ taste_description = "sweet`n`sour pineapples" color = "#FFFF00" adj_temp = -5 + nutrition=3 glass_name = "Pineappleade" glass_desc = "Spineapple, juiced up." @@ -1456,6 +1477,7 @@ taste_description = "fruity sweetness" color = "#CCCC99" adj_temp = -5 + nutrition=2 glass_name = "Kira Special" glass_desc = "Long live the guy who everyone had mistaken for a girl. Baka!" @@ -1468,6 +1490,7 @@ taste_description = "orange and cola soda" color = "#9F3400" adj_temp = -2 + nutrition=3 glass_name = "Brown Star" glass_desc = "It's not what it sounds like..." @@ -1478,6 +1501,7 @@ description = "Delicious appleade with a touch of mint." taste_description = "minty apples" color = "#FDDA98" + nutrition=3 glass_name = "Mint Apple Sparkle" glass_desc = "Delicious appleade with a touch of mint." @@ -1490,6 +1514,7 @@ taste_description = "sparkling orange juice in overdrive" color = "#e88e06" adj_temp = -2 + nutrition=3 glass_name = "Orange Ale" glass_desc = "an overwhelmingly fizzy combination of orange juice and ginger ale." @@ -1503,6 +1528,7 @@ color = "#AEE5E4" adj_temp = -9 var/contains_lactose = TRUE //in place in case someone makes adds milkshakes with soymilk or coconut milk + nutrition=10 glass_name = "Milkshake" glass_desc = "Glorious brainfreezing mixture." @@ -1544,6 +1570,7 @@ taste_description = "cold refreshing chocolate and cream" color = "#8e6f44" // rgb(142, 111, 68) adj_temp = -9 + nutrition=10 glass_name = "Chocolate Milkshake" glass_desc = "A refreshing chocolate milkshake, just like mom used to make." @@ -1559,6 +1586,7 @@ taste_description = "cold refreshing berries and cream" color = "#ffb2b2" // rgb(255, 178, 178) adj_temp = -9 + nutrition=10 glass_name = "Berry Milkshake" glass_desc = "A refreshing berry milkshake, just like mom used to make." @@ -1573,7 +1601,7 @@ adj_dizzy = -5 adj_drowsy = -3 adj_sleepy = -2 - + nutrition=8 glass_name = "Coffee Milkshake" glass_desc = "An energizing coffee milkshake, perfect for hot days at work.." @@ -1587,6 +1615,7 @@ description = "Savory cream in an ice-cold stature." taste_description = "cold peanuts and cream" color = "#8e6f44" + nutrition=10 glass_name = "Peanut Milkshake" glass_desc = "Savory cream in an ice-cold stature." @@ -1598,6 +1627,7 @@ taste_description = "citrus and coffee" color = "#485000" adj_temp = -5 + nutrition=2 glass_name = "Rewriter" glass_desc = "The secret of the sanctuary of the Libarian..." @@ -1614,6 +1644,7 @@ color = "#100800" adj_temp = -5 adj_sleepy = -2 + nutrition=1 glass_name = "Nuka-Cola" glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland" @@ -1634,6 +1665,7 @@ taste_description = "100% pure pomegranate" color = "#FF004F" water_based = FALSE + nutrition=1 glass_name = "Grenadine Syrup" glass_desc = "Sweet and tangy, a bar syrup used to add color and flavor to drinks." @@ -1647,6 +1679,7 @@ color = "#100800" adj_drowsy = -3 adj_temp = -5 + nutrition=3 // Also applies to other sodas, unless otherwise specified glass_name = "Space Cola" glass_desc = "A glass of refreshing Space Cola." @@ -1833,6 +1866,7 @@ taste_description = "sweet tonic cherries" color = "#EF304F" adj_temp = -8 + nutrition=2 glass_name = "Shirley Temple" glass_desc = "A sweet concotion hated even by its namesake." @@ -1845,6 +1879,7 @@ taste_description = "cola and fruit" color = "#4F1811" adj_temp = -8 + nutrition=2 glass_name = "Roy Rogers" glass_desc = "I'm a cowboy, on a steel horse I ride" @@ -1854,9 +1889,10 @@ name = "Collins Mix" id = "collins_mix" description = "Best hope it isn't a hoax." - taste_description = "gin and lemonade" + taste_description = "Particularly fizzy lemon-lime soda" color = "#D7D0B3" adj_temp = -8 + nutrition=3 glass_name = "Collins Mix" glass_desc = "Best hope it isn't a hoax." @@ -1869,6 +1905,7 @@ taste_description = "lemon and sweet tea" color = "#AF5517" adj_temp = -8 + nutrition=1 glass_name = "Arnold Palmer" glass_desc = "Tastes just like the old man." @@ -1904,7 +1941,7 @@ description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." taste_description = "dry cheap noodles" reagent_state = REAGENT_SOLID - nutrition = 1 + nutrition = 5 color = "#302000" glass_name = "Dry Ramen" @@ -1917,7 +1954,7 @@ taste_description = "noodles and salt" reagent_state = REAGENT_LIQUID color = "#302000" - nutrition = 5 + nutrition = 10 adj_temp = 5 glass_name = "Hot Ramen" @@ -1931,7 +1968,7 @@ taste_mult = 1.7 reagent_state = REAGENT_LIQUID color = "#302000" - nutrition = 5 + nutrition = 10 glass_name = "Hell Ramen" glass_desc = "A glass of extremely spicy noodles. Wait, why did you put this into a glass?" @@ -1948,7 +1985,7 @@ description = "How many things can you add to a cup of ramen before it begins to question its existance?" taste_description = "unbearable sweetness" color = "#4444FF" - nutrition = 5 + nutrition = 15 glass_name = "Sweet Sundae Ramen" glass_desc = "How many things can you add to a cup of ramen before it begins to question its existance?" @@ -1997,6 +2034,7 @@ description = "A smoothy, silky mix of honey and dairy." taste_description = "sweet, soothing dairy" color = "#fcfcc9" // rgb(252, 252, 201) + nutrition=10 glass_name = "Dream Cream" glass_desc = "A smoothy, silky mix of honey and dairy." @@ -2007,6 +2045,7 @@ description = "A fizzy, sour lemonade mix." taste_description = "fizzy, sour lemon" color = "#c6c603" // rgb(198, 198, 3) + nutrition=2 glass_name = "Vile Lemon" glass_desc = "A sour, fizzy drink with lemonade and lemonlime." @@ -2018,6 +2057,7 @@ description = "A natural, earthy combination of all things peaceful." taste_description = "fresh rain and sweet memories" color = "#3a6617" // rgb(58, 102, 23) + nutrition=2 glass_name = "Ent's Draught" glass_desc = "You can almost smell the tranquility emanating from this." @@ -2028,6 +2068,7 @@ description = "Creamy strawberries and sugar, simple and sweet." taste_description = "strawberries and cream" color = "#fc8a8a" // rgb(252, 138, 138) + nutrition=5 glass_name = "Love Potion" glass_desc = "Love me tender, love me sweet." @@ -2039,6 +2080,7 @@ taste_description = "honey" color = "#FDF5E6" // rgb(253,245,230) water_based = FALSE + nutrition=10 glass_name = "Oil Slick" glass_desc = "A concoction that should probably be in an engine, rather than your stomach." @@ -2051,6 +2093,7 @@ taste_description = "peanuts`n`slime" color = "#93604D" water_based = FALSE + nutrition=10 glass_name = "Slick Slime Slammer" glass_desc = "A concoction that should probably be in an engine, rather than your stomach. Still." @@ -2062,6 +2105,7 @@ description = "A creamy, rich beverage made out of whisked eggs, milk and sugar, for when you feel like celebrating the winter holidays." taste_description = "thick cream and vanilla" color = "#fff3c1" // rgb(255, 243, 193) + nutrition=8 glass_name = "Eggnog" glass_desc = "You can't egg-nore the holiday cheer all around you" @@ -2073,6 +2117,7 @@ taste_description = "sour honey drops" color = "#7FFF00" // rgb(127,255,0) water_based = FALSE + nutrition=2 glass_name = "Nuclear Waste" glass_desc = "Sadly, no super powers." @@ -2098,6 +2143,7 @@ taste_description = "chewy water" color = "#F0FFF0" // rgb(245,255,250) water_based = FALSE + nutrition=3 glass_name = "Soda Oil" glass_desc = "A pitiful sludge that looks vaguely like a soda.. if you look at it a certain way." @@ -2128,6 +2174,7 @@ description = "Mint, bubbly water, and citrus, made for sailing." taste_description = "mint and lime" color = "#FFF7B3" + nutrition=2 glass_name = "Mojito" glass_desc = "Mint, bubbly water, and citrus, made for sailing." @@ -2139,6 +2186,7 @@ description = "A secret combination of orange juice and pomegranate." taste_description = "a sexy, sandy sunset" color = "#FF0033" + nutrition=2 glass_name = "Sex on the Beach" glass_desc = "A secret combination of orange juice and pomegranate." @@ -2149,6 +2197,7 @@ description = "A fruity punch!" taste_description = "sharp, sour apples" color = "#D2BA6E" + nutrition=2 glass_name = "Driver`s Punch" glass_desc = "A fruity punch!" @@ -2160,6 +2209,7 @@ description = "A favorite drink amongst poor bartenders living in Neo Detroit." taste_description = "sweet bubblegum fizz." color = "#d3785d" + nutrition=5 glass_name = "Sweet Rush" glass_desc = "This looks like it might rot your teeth out." @@ -2171,6 +2221,7 @@ description = "How berry cordial of you." taste_description = "sweet chivalry" color = "#D26EB8" + nutrition=4 glass_name = "Berry Cordial" glass_desc = "How berry cordial of you." @@ -2183,6 +2234,7 @@ taste_description = "an odd blend of metals and sugar" color = "#993c49" blood_content = 1 + nutrition=1 glass_name = "Blud" glass_desc = "A sweet mix of blood-like additives. Vampiric." @@ -2206,6 +2258,7 @@ description = "One sip and you're in the bahamas." taste_description = "tropical" color = "#69375C" + nutrition=3 glass_name = "Tropical Fizz" glass_desc = "One sip and you're in the bahamas." @@ -2218,6 +2271,7 @@ description = "One sip and you're in the bahamas... maybe." taste_description = "slightly tropical" color = "#69375C" + nutrition=3 glass_name = "Tropical Fizz" glass_desc = "One sip and you're in the bahamas... maybe." @@ -2256,6 +2310,7 @@ description = "A classic from Humanity's early days. Soothing, cool, and nostalgic." taste_description = "creamy ice cream with a bubbly and bitter kick" adj_temp = -5 + nutrition=10 glass_name = "Root Beer Float" glass_desc = "A classic from Humanity's early days. Soothing, cool, and nostalgic." @@ -2268,6 +2323,7 @@ color = "#c9ab84" //usually most pilk mixtures have the milk presence dominate. adj_drowsy = -3 //space cola effects adj_temp = -3 + nutrition=5 glass_name = "Pilk" glass_desc = "Milk and Space Cola mixed together. Burenyuu~. While the soda ingredient isn't exactly the one based on the original \ @@ -2358,24 +2414,13 @@ if(.) M.dizziness += 5 -/datum/reagent/ethanol/firepunch - name = "Fire Punch" - id = "firepunch" - description = "Yo ho ho and a jar of honey." - taste_description = "sharp butterscotch" - color = "#ECB633" - strength = 7 - - glass_name = "Fire Punch" - glass_desc = "Yo ho ho and a jar of honey." - /datum/reagent/ethanol/gin name = "Gin" id = "gin" description = "It's gin. In space. I say, good sir." taste_description = "an alcoholic christmas tree" color = "#0064C6" - strength = 50 + strength = 15 glass_name = "Gin" glass_desc = "A crystal clear glass of Griffeater gin." @@ -2386,7 +2431,7 @@ description = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." taste_description = "oily gin" color = "#0064C6" - strength = 30 + strength = 20 glass_name = "Victory Gin" glass_desc = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." @@ -2489,7 +2534,7 @@ description = "A concoction of vodka and a secret combination of orange juice and pomegranate." taste_description = "sand, you don't like sand, it's coarse and rough and irritating and it gets everywhere" color = "#FF0033" - strength = 15 + strength = 90 // it is one SIXTH vodka glass_name = "Sex on the Beach" glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." @@ -2548,7 +2593,7 @@ description = "A superb and well-aged single-malt whiskey. Damn." taste_description = "molasses" color = "#4C3100" - strength = 25 + strength = 15 glass_name = "Whiskey" glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." @@ -2559,7 +2604,7 @@ description = "A premium alchoholic beverage made from distilled grape juice. This one's red!" taste_description = "bitter sweetness" color = "#7E4043" // rgb: 126, 64, 67 - strength = 15 + strength = 30 glass_name = "Wine" glass_desc = "A very classy looking drink." @@ -2570,7 +2615,7 @@ description = "A premium alchoholic beverage made from distilled grape juice. This one's white!" taste_description = "bitter sweetness" color = "#FCF1D2" - strength = 13 + strength = 30 glass_name = "White Wine" glass_desc = "A very classy looking drink. Now in white!" @@ -2618,10 +2663,10 @@ /datum/reagent/ethanol/cider name = "Cider" id = "cider" - description = "Hard? Soft? No-one knows but it'll get you drunk." + description = "An alcoholic drink made from apple juice. Erratum on earlier recipe books: this is definitely hard." taste_description = "tartness" color = "#CE9C00" // rgb: 206, 156, 0 - strength = 10 + strength = 40 glass_name = "Cider" glass_desc = "The second most Irish drink." @@ -2648,7 +2693,7 @@ description = "A drink made from your allies, not as sweet as when made from your enemies." taste_description = "bitter sweetness" color = "#D8AC45" - strength = 25 + strength = 20 // bit of vodka makes it stronger glass_name = "Allies cocktail" glass_desc = "A drink made from your allies." @@ -2659,7 +2704,7 @@ description = "So very, very, very good." taste_description = "sweet and creamy" color = "#B7EA75" - strength = 15 + strength = 45 // it is 1/3 whiskey, come on glass_name = "Aloe" glass_desc = "Very, very, very good." @@ -2693,7 +2738,7 @@ description = "Ultimate refreshment." taste_description = "ice cold vodka" color = "#56DEEA" - strength = 12 + strength = 45 // i'm sorry, it's 1/3 vodka, it should not be stronger than it somehow adj_temp = 20 targ_temp = 330 @@ -2707,7 +2752,7 @@ taste_description = "coffee, almonds, and whiskey, with a kick" reagent_state = REAGENT_LIQUID color = "#666300" - strength = 10 + strength = 10 // it's sweet sciency magic, i'll allow it druggy = 50 glass_name = "Atomic Bomb" @@ -2731,7 +2776,7 @@ description = "Tropical cocktail." taste_description = "lime and orange" color = "#FF7F3B" - strength = 25 + strength = 90 // 1/6th rum glass_name = "Bahama Mama" glass_desc = "Tropical cocktail." @@ -2753,7 +2798,7 @@ description = "Barefoot and pregnant." taste_description = "creamy berries" color = "#FFCDEA" - strength = 30 + strength = 45 // 1/3 vermouth glass_name = "Barefoot" glass_desc = "Barefoot and pregnant." @@ -2778,10 +2823,10 @@ /datum/reagent/ethanol/bilk name = "Bilk" id = "bilk" - description = "This appears to be beer mixed with milk. Disgusting." + description = "This appears to be beer mixed with milk. Odd." taste_description = "sour milk" color = "#895C4C" - strength = 50 + strength = 100 // 50% beer nutriment_factor = 2 glass_name = "Bilk" @@ -2804,7 +2849,7 @@ description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." taste_description = "tomatoes with a hint of lime" color = "#B40000" - strength = 15 + strength = 90 // 1/6 vodka glass_name = "Bloody Mary" glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." @@ -2815,7 +2860,7 @@ description = "Ewww..." taste_description = "sweet 'n creamy" color = "#8CFF8C" - strength = 30 + strength = 75 // 1/5 rum glass_name = "Booger" glass_desc = "Ewww..." @@ -2838,7 +2883,7 @@ description = "You take a tiny sip and feel a burning sensation..." taste_description = "constantly changing flavors" color = "#2E6671" - strength = 10 + strength = 90 // 1/9 vodka (this used to be 10! 10!! why so strong!) glass_name = "Changeling Sting" glass_desc = "A stingy drink." @@ -2883,7 +2928,7 @@ description = "Refreshingly lemony, deliciously dry." taste_description = "dry, tart lemons" color = "#FFFFAE" - strength = 30 + strength = 45 // 1/3 gin glass_name = "Gin Fizz" glass_desc = "Refreshingly lemony, deliciously dry." @@ -2905,7 +2950,7 @@ taste_description = "a poor excuse for alcohol" reagent_state = REAGENT_LIQUID color = "#FFBB00" - strength = 100 + strength = 30 glass_name = "Grog" @@ -2917,7 +2962,7 @@ description = "The surprise is, it's green!" taste_description = "tartness and bananas" color = "#2E6671" - strength = 15 + strength = 50 // should be ~96, but probably not glass_name = "Erika Surprise" glass_desc = "The surprise is, it's green!" @@ -2930,7 +2975,7 @@ taste_mult = 5 reagent_state = REAGENT_LIQUID color = "#7F00FF" - strength = 10 + strength = 8 // 10 seems week for the joke druggy = 15 glass_name = "Pan-Galactic Gargle Blaster" @@ -2978,7 +3023,7 @@ description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" taste_description = "pure alcohol" color = "#4C3100" - strength = 25 + strength = 20 toxicity = 2 glass_name = "Hooch" @@ -3004,7 +3049,7 @@ description = "Mmm, tastes like chocolate cake..." taste_description = "delicious anger" color = "#2E6671" - strength = 15 + strength = 30 glass_name = "Irish Car Bomb" glass_desc = "An irish car bomb." @@ -3015,7 +3060,7 @@ description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." taste_description = "giving up on the day" color = "#4C3100" - strength = 15 + strength = 50 glass_name = "Irish coffee" glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." @@ -3037,7 +3082,7 @@ description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." taste_description = "sweet tea, with a kick" color = "#895B1F" - strength = 12 + strength = 20 glass_name = "Long Island iced tea" glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." @@ -3094,7 +3139,7 @@ taste_description = "sweet yet alcoholic" reagent_state = REAGENT_LIQUID color = "#FFBB00" - strength = 30 + strength = 50 nutriment_factor = 1 glass_name = "Mead" @@ -3175,9 +3220,9 @@ var/obj/item/organ/internal/heart/L = H.internal_organs_by_name[O_HEART] if (L && istype(L)) if(. < 120) - L.take_damage(10 * removed, 0) + L.take_damage(10 * removed) else - L.take_damage(100, 0) + L.take_damage(100) /datum/reagent/ethanol/red_mead name = "Red Mead" @@ -3185,7 +3230,7 @@ description = "The true Viking's drink! Even though it has a strange red color." taste_description = "sweet and salty alcohol" color = "#C73C00" - strength = 30 + strength = 50 blood_content = 0.5 glass_name = "Red Mead" @@ -3210,7 +3255,7 @@ description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." taste_description = "oranges" color = "#A68310" - strength = 15 + strength = 45 // 1/3 vodka glass_name = "Screwdriver" glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." @@ -3244,7 +3289,7 @@ description = "A cold refreshment" taste_description = "refreshing cold" color = "#FFFFFF" - strength = 30 + strength = 100 //50% beer glass_name = "Snow White" glass_desc = "A cold refreshment." @@ -3266,7 +3311,7 @@ description = "Tastes like terrorism!" taste_description = "strong alcohol" color = "#2E6671" - strength = 10 + strength = 30 glass_name = "Syndicate Bomb" glass_desc = "Tastes like terrorism!" @@ -3325,7 +3370,7 @@ description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." taste_description = "shaken, not stirred" color = "#0064C8" - strength = 12 + strength = 15 glass_name = "Vodka Martini" glass_desc ="A bastardization of the classic martini. Still great." @@ -3337,7 +3382,7 @@ description = "For when a gin and tonic isn't russian enough." taste_description = "tart bitterness" color = "#0064C8" // rgb: 0, 100, 200 - strength = 15 + strength = 30 glass_name = "Vodka and Tonic" glass_desc = "For when a gin and tonic isn't Russian enough." @@ -3349,7 +3394,7 @@ description = "That's just, like, your opinion, man..." taste_description = "coffee icecream" color = "#A68340" - strength = 15 + strength = 20 glass_name = "White Russian" glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." @@ -3361,7 +3406,7 @@ description = "Whiskey, mixed with cola. Surprisingly refreshing." taste_description = "cola with an alcoholic undertone" color = "#3E1B00" - strength = 25 + strength = 45 glass_name = "Whiskey Cola" glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." @@ -3373,7 +3418,7 @@ description = "Ultimate refreshment." taste_description = "carbonated whiskey" color = "#EAB300" - strength = 15 + strength = 45 glass_name = "Whiskey Soda" glass_desc = "Ultimate refreshment." @@ -3384,7 +3429,7 @@ description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. The smell of it singes your nostrils." taste_description = "unspeakable whiskey bliss" color = "#523600" - strength = 7 + strength = 10 glass_name = "special blend whiskey" glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." @@ -3480,7 +3525,7 @@ description = "For when you're too weeb for a real martini." taste_description = "dry alcohol" color = "#0064C8" - strength = 15 + strength = 30 glass_name = "Saketini" glass_desc = "What are you doing drinking this outside of New Kyoto?" @@ -3488,13 +3533,13 @@ /datum/reagent/ethanol/coffee/elysiumfacepunch name = "Elysium Facepunch" id = "elysiumfacepunch" - description = "A lothesome cocktail favored by Heaven's skeleton shift workers." + description = "A loathsome cocktail favored by Heaven's skeleton shift workers." taste_description = "sour coffee" color = "#8f7729" strength = 20 glass_name = "Elysium Facepunch" - glass_desc = "A lothesome cocktail favored by Heaven's skeleton shift workers." + glass_desc = "A loathsome cocktail favored by Heaven's skeleton shift workers." /datum/reagent/ethanol/erebusmoonrise name = "Erebus Moonrise" @@ -3536,7 +3581,7 @@ description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." taste_description = "impossibly rich alcohol" color = "#614126" - strength = 9 + strength = 15 glass_name = "Euphoria" glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." @@ -3547,7 +3592,7 @@ description = "Common in the entertainment districts of Titan." taste_description = "sweet alcohol" color = "#614126" - strength = 50 + strength = 100 glass_name = "Xanadu Cannon" glass_desc = "Common in the entertainment districts of Titan." @@ -3602,7 +3647,7 @@ description = "A blend of fermented fruits and herbs, commonly used in cocktails." taste_description = "sharp bitterness" color = "#9b6241" // rgb(155, 98, 65) - strength = 50 + strength = 100 glass_name = "Bitters" glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." @@ -3789,7 +3834,7 @@ description = "A classic mix of whiskey and sugar... simple and direct." taste_description = "smokey, divine whiskey" color = "#774410" // rgb(119, 68, 16) - strength = 15 + strength = 40 glass_name = "Old Fashioned" glass_desc = "A classic mix of whiskey and sugar... simple and direct." @@ -3800,7 +3845,7 @@ description = "Refeshing rum and citrus. Time for a tropical get away." taste_description = "refreshing citrus and rum" color = "#d1ff49" // rgb(209, 255, 73 - strength = 25 + strength = 40 glass_name = "Daiquiri" glass_desc = "Refeshing rum and citrus. Time for a tropical get away." @@ -3811,7 +3856,7 @@ description = "Minty rum and citrus, made for sailing." taste_description = "minty rum and lime" color = "#d1ff49" // rgb(209, 255, 73 - strength = 30 + strength = 75 // 1/5 rum glass_name = "Mojito" glass_desc = "Minty rum and citrus, made for sailing." @@ -3823,7 +3868,7 @@ description = "Tequila and citrus, iced just right..." taste_description = "grapefruit and cold fire" color = "#ffb070" // rgb(255, 176, 112) - strength = 20 + strength = 75 // 1/3 tequila glass_name = "Paloma" glass_desc = "Tequila and citrus, iced just right..." @@ -3835,7 +3880,7 @@ description = "Wine Brandy, Lemon, and a dream. A South American classic" taste_description = "light sweetness" color = "#f9f96b" // rgb(249, 249, 107) - strength = 30 + strength = 60 // 1/3 brandy glass_name = "Pisco Sour" glass_desc = "South American bliss, served ice cold." @@ -3846,7 +3891,7 @@ description = "Minty, rich, and painfully cold. It's a blizzard in a cup." taste_description = "biting cold" color = "#ffe8c4" // rgb(255, 232, 196) - strength = 30 + strength = 45 // 1/3 whiskey adj_temp = -20 targ_temp = 220 //Dangerous to certain races. Drink in moderation. @@ -3859,7 +3904,7 @@ description = "Minty and refreshing, perfect for a hot day." taste_description = "refreshing mint" color = "#bbfc8a" // rgb(187, 252, 138) - strength = 25 + strength = 45 adj_temp = -5 glass_name = "Mint Julep" @@ -3882,7 +3927,7 @@ description = "Number one drink AND fueling choice for Russians multiverse-wide." taste_description = "russian steel and a hint of grain" color = "#0064C8" - strength = 50 + strength = 10 glass_name = "Godka" glass_desc = "The glass is barely able to contain the wodka. Xynta." @@ -3972,16 +4017,6 @@ glass_name = "Gibbfloat" glass_desc = "A tasty, frothy drink" -/datum/reagent/ethanol/mintjulep - name = "Mint Julep" - id = "mintjulep" - description = "Really not just watery whiskey.. I think." - taste_description = "mint infused whiskey" - strength = 80 - - glass_name = "Mint Julep" - glass_desc = "Really not just watery whiskey.. I think." - /datum/reagent/ethanol/planterspunch name = "Planters Punch" id = "planterspunch" @@ -3998,7 +4033,7 @@ id = "olympusmons" description = "For those that need the extra kick." taste_description = "stronge coffee infused booze" - strength = 35 + strength = 25 glass_name = "Olympus Mons" glass_desc = "For those that need the extra kick." @@ -4018,7 +4053,7 @@ id = "junglejuice" description = "An overload of sweetness and sugary goodness." taste_description = "fruits and bad decisions" - strength = 55 + strength = 40 glass_name = "Jungle Juice" glass_desc = "An overload of sweetness and sugary goodness." @@ -4028,7 +4063,7 @@ id = "gimlet" description = "For those who want to look fancy with their gin." taste_description = "lime infused tree" - strength = 20 + strength = 45 // 1/3 gin glass_name = "Gimlet" glass_desc = "For those who want to look fancy with their gin." @@ -4038,7 +4073,7 @@ id = "firepunch" description = "A spicy take on a summer classic." taste_description = "rum and sugar" - strength = 70 + strength = 45 targ_temp = 300 glass_name = "Fire Punch" @@ -4169,7 +4204,7 @@ id = "bigiron" description = "Have this one, partner. Then have nineteen more." taste_description = "a mysterious visit and the red Texas sky" - strength = 45 + strength = 30 // 2/3 rum, rounded up to 30 (was 45) glass_name = "Big Iron" glass_desc = "Have this one, partner. Then have nineteen more." @@ -4201,7 +4236,7 @@ id = "phobos" description = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." taste_description = "grain alcohol" - strength = 70 + strength = 15 glass_name = "Phobos" glass_desc = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." @@ -4211,7 +4246,7 @@ id = "greenstuff" description = "Tyrmalin grog aggressively blended with unfiltered absinthe." taste_description = "black licorice and thick malt" - strength = 70 + strength = 5 glass_name = "Green Stuff" glass_desc = "Tyrmalin grog aggressively blended with unfiltered absinthe." @@ -4246,7 +4281,7 @@ description = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." taste_description = "honey and royalty" color = "#f0d76b" - strength = 20 + strength = 50 glass_name = "Royal Jelly" glass_desc = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." @@ -4257,7 +4292,7 @@ description = "A holiday beverage akin to eggnog, made with coconut milk." taste_description = "creamy spiced coconut" color = "#ffffff" - strength = 20 + strength = 50 glass_name = "Coquito" glass_desc = "It's a little coconut!" @@ -4268,11 +4303,22 @@ description = "Rum, pineapple, and coconut plended up with ice." taste_description = "coconuts and pineapple soaked in rum" color = "#fdf49e" - strength = 20 + strength = 45 // 1/3 rum glass_name = "Piña Colada" glass_desc = "For those not into yoga." +/datum/reagent/ethanol/mimosa + name = "Mimosa" + id = "mimosa" + description = "An airy blend of champagne and orange juice, often drunk as a morning refreshment." + taste_description = "orange juice and a dry, bubbly wine" + color = "#daa411" + strength = 60 // 1/2 champagne + + glass_name = "Mimosa" + glass_desc = "A bubbly and tangy refreshment." + //Never Fade Away /datum/reagent/ethanol/silverhand name = "Johnny Silverhand" @@ -4580,7 +4626,7 @@ /datum/reagent/nutriment/triglyceride/oil/affect_touch(mob/living/carbon/M, alien, removed) var/dfactor = heatdamage(M) if (dfactor) - M.take_organ_damage(0, removed * 1.5 * dfactor) + M.take_random_targeted_damage(brute = 0, brute = removed * 1.5 * dfactor) data["temperature"] -= (6 * removed) / (1 + volume*0.1)//Cools off as it burns you if (lastburnmessage+100 < world.time ) to_chat(M, SPAN_DANGER("Searing hot oil burns you, wash it off quick!")) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm index 3ae6b830e5..168a979eef 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm @@ -1097,7 +1097,7 @@ M.cure_radiation(RAD_MOB_CURE_STRENGTH_ARITHRAZINE(removed)) M.adjustToxLoss(-10 * removed) if(prob(60)) - M.take_organ_damage(4 * removed, 0) + M.take_random_targeted_damage(brute = 4 * removed, brute = 0) /datum/reagent/spaceacillin name = "Spaceacillin" diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm index 78f9374e8a..1ead6ce13e 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm @@ -495,7 +495,7 @@ scannable = 1 /datum/reagent/defective_nanites/affect_blood(mob/living/carbon/M, alien, removed) - M.take_organ_damage(2 * removed, 2 * removed) + M.take_random_targeted_damage(brute = 2 * removed, brute = 2 * removed) M.adjustOxyLoss(4 * removed) M.adjustToxLoss(2 * removed) M.adjustCloneLoss(2 * removed) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm index 2250a18fc8..af7c59e6b2 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm @@ -88,7 +88,7 @@ L.adjust_fire_stacks(amount / fire_mult) /datum/reagent/toxin/hydrophoron/affect_touch(mob/living/carbon/M, alien, removed) - M.take_organ_damage(0, removed * 0.1) //being splashed directly with hydrophoron causes minor chemical burns + M.take_random_targeted_damage(brute = 0, brute = removed * 0.1) //being splashed directly with hydrophoron causes minor chemical burns if(prob(10 * fire_mult)) M.pl_effects() @@ -137,7 +137,7 @@ M.adjust_fire_stacks(removed / 5) if(alien == IS_VOX || alien == IS_XENOHYBRID) return - M.take_organ_damage(0, removed * 0.1) //being splashed directly with phoron causes minor chemical burns + M.take_random_targeted_damage(brute = 0, brute = removed * 0.1) //being splashed directly with phoron causes minor chemical burns if(prob(50)) M.pl_effects() @@ -233,7 +233,7 @@ M.emote(pick("twitch", "blink_r", "shiver")) if(prob(15)) M.visible_message("[M] shudders violently.", "You shudder uncontrollably, it hurts.") - M.take_organ_damage(6 * removed, 0) + M.take_random_targeted_damage(brute = 6 * removed, brute = 0) M.add_chemical_effect(CE_SPEEDBOOST, 1) /datum/reagent/toxin/potassium_chloride @@ -548,11 +548,11 @@ M.afflict_stun(20 * 6) return if(alien == IS_SKRELL) - M.take_organ_damage(2.4 * removed, 0) + M.take_random_targeted_damage(brute = 2.4 * removed, brute = 0) if(M.losebreath < 10) M.AdjustLosebreath(1) else - M.take_organ_damage(3 * removed, 0) + M.take_random_targeted_damage(brute = 3 * removed, brute = 0) if(M.losebreath < 15) M.AdjustLosebreath(1) @@ -1154,4 +1154,4 @@ affects_robots = TRUE /datum/reagent/grubshock/affect_blood(mob/living/carbon/M, alien, removed) - M.take_organ_damage(0, removed * power * 0.2) + M.take_random_targeted_damage(brute = 0, brute = removed * power * 0.2) diff --git a/code/modules/reagents/chemistry/reagents/core/elements.dm b/code/modules/reagents/chemistry/reagents/core/elements.dm index 0a453e4e84..afcd425c11 100644 --- a/code/modules/reagents/chemistry/reagents/core/elements.dm +++ b/code/modules/reagents/chemistry/reagents/core/elements.dm @@ -54,10 +54,10 @@ color = "#d1db77" /datum/reagent/chlorine/affect_blood(mob/living/carbon/M, alien, removed) - M.take_organ_damage(1*REM, 0) + M.take_random_targeted_damage(brute = 1*REM, brute = 0) /datum/reagent/chlorine/affect_touch(mob/living/carbon/M, alien, removed) - M.take_organ_damage(1*REM, 0) + M.take_random_targeted_damage(brute = 1*REM, brute = 0) /datum/reagent/copper name = "Copper" diff --git a/code/modules/reagents/items/hypospray.dm b/code/modules/reagents/items/hypospray.dm index 2a79cd0d55..af5633b3c8 100644 --- a/code/modules/reagents/items/hypospray.dm +++ b/code/modules/reagents/items/hypospray.dm @@ -76,6 +76,9 @@ /obj/item/hypospray/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier) if(istype(I, /obj/item/reagent_containers/glass/hypovial)) var/obj/item/reagent_containers/glass/hypovial/vial = I + if(istype(vial, /obj/item/reagent_containers/glass/hypovial/large) && !allow_large) + user.action_feedback(SPAN_WARNING("[vial] requires an advanced hypospray to use!"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE if(!user.transfer_item_to_loc(vial, src)) user.action_feedback(SPAN_WARNING("[vial] is stuck to your hand!"), src) return CLICKCHAIN_DO_NOT_PROPAGATE diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index bf6379db1b..7e3150abd0 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -217,7 +217,7 @@ ui = new(user, src, "ChemMaster", name) ui.open() -/obj/machinery/chem_master/ui_data(mob/user) +/obj/machinery/chem_master/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["mode"] = mode @@ -265,7 +265,7 @@ return data -/obj/machinery/chem_master/ui_static_data(mob/user) +/obj/machinery/chem_master/ui_static_data(mob/user, datum/tgui/ui) var/list/static_data = list() //Calculated once since it'll never change if(!pill_styles || !bottle_styles || !chosen_patch_style || !patch_styles) @@ -277,7 +277,7 @@ return static_data -/obj/machinery/chem_master/ui_act(action, params) +/obj/machinery/chem_master/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/reagents/machinery/dispenser/dispenser.dm b/code/modules/reagents/machinery/dispenser/dispenser.dm index df36bf6607..cb9703c76e 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser.dm @@ -155,7 +155,7 @@ macros_built[++macros_built.len] = L | list("index" = ++index) return macros_built -/obj/machinery/chemical_dispenser/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/chemical_dispenser/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["cartridges"] = ui_cartridge_data() var/list/chems_built = list() @@ -164,7 +164,7 @@ for(var/id in synth.reagents_provided) if(chems_built[id]) continue - var/datum/reagent/R = SSchemistry.get_reagent(id) + var/datum/reagent/R = SSchemistry.fetch_reagent(id) if(!R) continue chems_built[id] = list( @@ -180,7 +180,7 @@ .["macros_full"] = length(macros) >= MAX_MACROS .["macros_max_steps"] = MAX_MACRO_STEPS -/obj/machinery/chemical_dispenser/ui_data(mob/user) +/obj/machinery/chemical_dispenser/ui_data(mob/user, datum/tgui/ui) . = ..() .["amount"] = dispense_amount .["amount_max"] = dispense_amount_max @@ -198,7 +198,7 @@ .["recharging"] = charging .["recharge_rate"] = recharge_rate -/obj/machinery/chemical_dispenser/ui_act(action, params) +/obj/machinery/chemical_dispenser/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index f7b9297eb7..d6ad78fc19 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -257,13 +257,14 @@ return user.visible_message("[user] stabs [target] in \the [hit_area] with [src.name]!") - - if(affecting.take_damage(3)) - H.UpdateDamageIcon() - + affecting.inflict_bodypart_damage( + brute = 3, + damage_mode = DAMAGE_MODE_SHARP, + weapon_descriptor = "a needle", + ) else user.visible_message("[user] stabs [target] with [src.name]!") - target.take_organ_damage(3)// 7 is the same as crowbar punch + target.take_random_targeted_damage(brute = 3)// 7 is the same as crowbar punch var/syringestab_amount_transferred = rand(0, (reagents.total_volume - 5)) //nerfed by popular demand var/contained = reagents.get_reagents() diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 8c50706afa..fb9373ecc1 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -29,6 +29,8 @@ /obj/machinery/conveyor/centcom_auto id = "round_end_belt" + + // create a conveyor /obj/machinery/conveyor/Initialize(mapload, newdir, on = 0) . = ..() @@ -218,6 +220,8 @@ var/list/conveyors // the list of converyors that are controlled by this switch anchored = 1 +/obj/machinery/conveyor_switch/two_way_on + position = 1 /obj/machinery/conveyor_switch/Initialize(mapload) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index d41c9d9fa2..75dc74bfb1 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -134,7 +134,7 @@ GM.forceMove(src) GM.update_perspective() for (var/mob/C in viewers(src)) - C.show_message("[GM.name] has been placed in the [src] by [user].", 3) + C.show_message("[GM.name] has been placed in \the [src] by [user].", 3) qdel(G) add_attack_logs(user,GM,"Disposals dunked") @@ -143,11 +143,11 @@ if(!user.attempt_insert_item_for_installation(I, src)) return - to_chat(user, "You place \the [I] into the [src].") + to_chat(user, "You place \the [I] into \the [src].") for(var/mob/M in viewers(src)) if(M == user) continue - M.show_message("[user.name] places \the [I] into the [src].", 3) + M.show_message("[user.name] places \the [I] into \the [src].", 3) update() @@ -178,11 +178,11 @@ return if(target == user && !user.stat && CHECK_ALL_MOBILITY(user, MOBILITY_CAN_MOVE | MOBILITY_CAN_USE)) // if drop self, then climbed in // must be awake, not stunned or whatever - msg = "[user.name] climbs into the [src]." - to_chat(user, "You climb into the [src].") + msg = "[user.name] climbs into \the [src]." + to_chat(user, "You climb into \the [src].") else if(target != user && !user.restrained() && !user.stat && CHECK_ALL_MOBILITY(user, MOBILITY_CAN_MOVE | MOBILITY_CAN_USE)) - msg = "[user.name] stuffs [target.name] into the [src]!" - to_chat(user, "You stuff [target.name] into the [src]!") + msg = "[user.name] stuffs [target.name] into \the [src]!" + to_chat(user, "You stuff [target.name] into \the [src]!") add_attack_logs(user,target,"Disposals dunked") else @@ -493,6 +493,38 @@ else return ..(mover, target) + + +/obj/machinery/disposal/wall + name = "inset disposal unit" + icon_state = "wall" + + density = FALSE + +/obj/machinery/disposal/wall/Initialize() + . = ..() + + spawn(1 SECOND) // Fixfix for weird interaction with buildmode or other late-spawning. + update() + +/obj/machinery/disposal/wall/update() + ..() + + switch(dir) + if(1) + pixel_x = 0 + pixel_y = -32 + if(2) + pixel_x = 0 + pixel_y = 32 + if(4) + pixel_x = -32 + pixel_y = 0 + if(8) + pixel_x = 32 + pixel_y = 0 + + // virtual disposal object // travels through pipes in lieu of actual items // contents will be items flushed by the disposal @@ -563,6 +595,7 @@ // movement process, persists while holder is moving through pipes /obj/structure/disposalholder/proc/move() var/obj/structure/disposalpipe/last + // todo: while this is fucking awful? while(active) sleep(1) // was 1 if(!loc) return // check if we got GC'd @@ -570,7 +603,7 @@ if(hasmob && prob(3)) for(var/mob/living/H in src) if(!istype(H,/mob/living/silicon/robot/drone)) //Drones use the mailing code to move through the disposal system, - H.take_overall_damage(20, 0, "Blunt Trauma")//horribly maim any living creature jumping down disposals. c'est la vie + H.take_overall_damage(20, 0, weapon_descriptor = "blunt trauma")//horribly maim any living creature jumping down disposals. c'est la vie var/obj/structure/disposalpipe/curr = loc last = curr diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index c624b7ddff..d2627e04d2 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -329,7 +329,7 @@ item_state = "electronic" slot_flags = SLOT_BELT -/obj/item/destTagger/ui_state(mob/user, datum/tgui_module/module) +/obj/item/destTagger/ui_state() return GLOB.inventory_state /obj/item/destTagger/ui_interact(mob/user, datum/tgui/ui) @@ -352,7 +352,7 @@ return ui_interact(user) -/obj/item/destTagger/ui_act(action, params) +/obj/item/destTagger/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE add_fingerprint(usr) diff --git a/code/modules/research/designs/mining_toys.dm b/code/modules/research/designs/mining_toys.dm index 867a2ecee8..95d35fa35f 100644 --- a/code/modules/research/designs/mining_toys.dm +++ b/code/modules/research/designs/mining_toys.dm @@ -82,3 +82,10 @@ req_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 4) materials_base = list(MAT_STEEL = 2000, MAT_GLASS = 1000) build_path = /obj/item/mining_scanner/advanced + +/datum/design/science/mining/bs_mining_satchel + design_name = "Mining Satchel of Holding" + id = "bs_mining_satchel" + req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6, TECH_PHORON = 4) + materials_base = list(MAT_GOLD = 1500, MAT_DIAMOND = 750, MAT_URANIUM = 150, MAT_PHORON = 100, MAT_VERDANTIUM = 100) + build_path = /obj/item/storage/bag/ore/bluespace diff --git a/code/modules/research/designs/prosfab_designs.dm b/code/modules/research/designs/prosfab_designs.dm index 7adc93ae44..262d4513dc 100644 --- a/code/modules/research/designs/prosfab_designs.dm +++ b/code/modules/research/designs/prosfab_designs.dm @@ -497,6 +497,14 @@ materials_base = list(MAT_STEEL = 60000, MAT_GLASS = 4500, MAT_GOLD = 1500, MAT_DIAMOND = 375) build_path = /obj/item/borg/upgrade/tasercooler +/datum/design/science/prosfab/robot_upgrade/bluespaceoresatchel + design_name = "Bluespace Ore Satchel Module" + desc = "Improves the ore satchels of mining units to hold a lot more ores." + id = "borg_bsorebag_module" + req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6, TECH_PHORON = 4) + materials_base = list(MAT_STEEL = 7500, MAT_GOLD = 1500, MAT_DIAMOND = 750, MAT_URANIUM = 150, MAT_PHORON = 1000) + build_path = /obj/item/borg/upgrade/bluespaceorebag + /datum/design/science/prosfab/robot_upgrade/jetpack design_name = "Jetpack Module" desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." diff --git a/code/modules/research/machinery/rdconsole_tgui.dm b/code/modules/research/machinery/rdconsole_tgui.dm index 95a256cf3d..78b658178a 100644 --- a/code/modules/research/machinery/rdconsole_tgui.dm +++ b/code/modules/research/machinery/rdconsole_tgui.dm @@ -19,12 +19,12 @@ ui = new(user, src, "ResearchConsole", name) ui.open() -/obj/machinery/computer/rdconsole/ui_status(mob/user) +/obj/machinery/computer/rdconsole/ui_status(mob/user, datum/ui_state/state) . = ..() if(locked && !allowed(user) && !emagged) . = min(., UI_UPDATE) -/obj/machinery/computer/rdconsole/ui_static_data(mob/user) +/obj/machinery/computer/rdconsole/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() data["tech"] = tgui_GetResearchLevelsInfo() @@ -35,7 +35,7 @@ return data -/obj/machinery/computer/rdconsole/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/rdconsole/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["locked"] = locked diff --git a/code/modules/research/machinery/server.dm b/code/modules/research/machinery/server.dm index b55ba68b2c..933962807f 100644 --- a/code/modules/research/machinery/server.dm +++ b/code/modules/research/machinery/server.dm @@ -156,7 +156,7 @@ var/list/consoles = list() var/badmin = 0 -/obj/machinery/computer/rdservercontrol/ui_status(mob/user) +/obj/machinery/computer/rdservercontrol/ui_status(mob/user, datum/ui_state/state) . = ..() if(!allowed(user) && !emagged) . = min(., UI_UPDATE) @@ -167,7 +167,7 @@ ui = new(user, src, "ResearchServerController", name) ui.open() -/obj/machinery/computer/rdservercontrol/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/rdservercontrol/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["badmin"] = badmin diff --git a/code/modules/resleeving/infomorph.dm b/code/modules/resleeving/infomorph.dm index 95f05fc7a3..8813bb8c11 100644 --- a/code/modules/resleeving/infomorph.dm +++ b/code/modules/resleeving/infomorph.dm @@ -235,7 +235,10 @@ var/list/infomorph_emotions = list( var/mob/living/carbon/human/H = holder for(var/obj/item/organ/external/affecting in H.organs) if(card in affecting.implants) - affecting.take_damage(rand(30,50)) + affecting.inflict_bodypart_damage( + brute = rand(30, 50), + weapon_descriptor = "bursting", + ) affecting.implants -= card H.visible_message("\The [src] explodes out of \the [H]'s [affecting.name] in shower of gore!") break diff --git a/code/modules/sculpting/sculpting_block.dm b/code/modules/sculpting/sculpting_block.dm index c759b5e100..7ebba835e7 100644 --- a/code/modules/sculpting/sculpting_block.dm +++ b/code/modules/sculpting/sculpting_block.dm @@ -165,7 +165,7 @@ otherwise_self = SPAN_NOTICE("You start slicing [src] apart."), ) log_construction(e_args, src, "started deconstructing") - if(!use_welder(I, e_args, flags, 7 SECONDS, 3)) + if(!use_welder(I, e_args, flags, 7 SECONDS)) return TRUE e_args.visible_feedback( target = src, diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index d8e29e4ce5..8f519ca3af 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -69,7 +69,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN) GLOB.security_level = SEC_LEVEL_DELTA var/newlevel = get_security_level() - for(var/obj/machinery/firealarm/FA in GLOB.machines) + for(var/obj/machinery/fire_alarm/FA in GLOB.machines) if(FA.z in (LEGACY_MAP_DATUM).contact_levels) FA.set_security_level(newlevel) for(var/obj/machinery/status_display/FA in GLOB.machines) diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm index 169fcecce1..65caacedfc 100644 --- a/code/modules/shieldgen/shield_generator.dm +++ b/code/modules/shieldgen/shield_generator.dm @@ -402,7 +402,7 @@ ui = new(user, src, "OvermapShieldGenerator", name) // 500, 800 ui.open() -/obj/machinery/power/shield_generator/ui_data(mob/user) +/obj/machinery/power/shield_generator/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["running"] = running @@ -439,7 +439,7 @@ return ui_interact(user) -/obj/machinery/power/shield_generator/ui_status(mob/user) +/obj/machinery/power/shield_generator/ui_status(mob/user, datum/ui_state/state) if(issilicon(user) && !Adjacent(user) && ai_control_disabled) return UI_UPDATE if(panel_open) diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index 1752386de6..d1452c4c70 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -47,7 +47,7 @@ program = /datum/computer/file/embedded_program/docking/simple var/datum/shuttle/autodock/ferry/escape_pod/pod -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/simple/docking_program = program // Cast to proper type . = list( @@ -59,7 +59,7 @@ "internalTemplateName" = "EscapePodConsole", ) -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_act(action, params) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -81,7 +81,7 @@ program = /datum/computer/file/embedded_program/docking/simple/escape_pod_berth valid_actions = list("toggle_override", "force_door") -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/simple/docking_program = program // Cast to proper type var/armed = null diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index a4314251b0..9459cc25fb 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -72,7 +72,7 @@ return FALSE return TRUE -/obj/machinery/computer/shuttle_control/ui_act(action, list/params) +/obj/machinery/computer/shuttle_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if(skip_act) @@ -113,7 +113,7 @@ ui.open() // We delegate populating data to another proc to make it easier for overriding types to add their data. -/obj/machinery/computer/shuttle_control/ui_data(mob/user) +/obj/machinery/computer/shuttle_control/ui_data(mob/user, datum/tgui/ui) var/datum/shuttle/autodock/shuttle = SSshuttle.shuttles[shuttle_tag] if(!istype(shuttle)) to_chat(user, "Unable to establish link with the shuttle.") diff --git a/code/modules/shuttles/shuttle_console_multi.dm b/code/modules/shuttles/shuttle_console_multi.dm index 5850d8ca65..7e15717798 100644 --- a/code/modules/shuttles/shuttle_console_multi.dm +++ b/code/modules/shuttles/shuttle_console_multi.dm @@ -14,7 +14,7 @@ // "engines_charging" = ((shuttle.last_move + (shuttle.cooldown SECONDS)) > world.time), // Replaced by longer warmup_time ) -/obj/machinery/computer/shuttle_control/multi/ui_act(action, list/params) +/obj/machinery/computer/shuttle_control/multi/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm index a72fc239b5..9e490e5247 100644 --- a/code/modules/shuttles/shuttles_web.dm +++ b/code/modules/shuttles/shuttles_web.dm @@ -205,7 +205,7 @@ return ..() -/obj/machinery/computer/shuttle_control/web/ui_data(mob/user) +/obj/machinery/computer/shuttle_control/web/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/routes[0] @@ -289,7 +289,7 @@ return data -/obj/machinery/computer/shuttle_control/web/ui_act(action, list/params) +/obj/machinery/computer/shuttle_control/web/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/species/promethean/promethean.dm b/code/modules/species/promethean/promethean.dm index cedc762cc3..fa199a27a6 100644 --- a/code/modules/species/promethean/promethean.dm +++ b/code/modules/species/promethean/promethean.dm @@ -74,7 +74,7 @@ var/datum/species/shapeshifter/promethean/prometheans cold_level_2 = 220 cold_level_3 = 130 - heat_level_1 = 320 + heat_level_1 = 340 heat_level_2 = 370 heat_level_3 = 600 diff --git a/code/modules/species/protean/protean.dm b/code/modules/species/protean/protean.dm index f20b7b9826..b01fdcd25f 100644 --- a/code/modules/species/protean/protean.dm +++ b/code/modules/species/protean/protean.dm @@ -210,7 +210,7 @@ var/obj/item/organ/external/E = H.get_organ(BP_TORSO) return E.brute_dam + E.burn_dam -/datum/species/protean/handle_environment_special(var/mob/living/carbon/human/H) +/datum/species/protean/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if((getActualDamage(H) > damage_to_blob) && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever). H.nano_intoblob() return ..() //Any instakill shot runtimes since there are no organs after this. No point to not skip these checks, going to nullspace anyway. diff --git a/code/modules/species/protean/protean_blob.dm b/code/modules/species/protean/protean_blob.dm index f93379a308..70bd8bae23 100644 --- a/code/modules/species/protean/protean_blob.dm +++ b/code/modules/species/protean/protean_blob.dm @@ -73,6 +73,9 @@ add_verb(src, /mob/living/simple_mob/protean_blob/proc/appearanceswitch) add_verb(src, /mob/living/simple_mob/protean_blob/proc/rig_transform) add_verb(src, /mob/living/simple_mob/protean_blob/proc/leap_attack) + add_verb(src, /mob/living/simple_mob/protean_blob/proc/chameleon_apperance) + add_verb(src, /mob/living/simple_mob/protean_blob/proc/chameleon_color) + add_verb(src, /mob/living/simple_mob/protean_blob/proc/chameleon_apperance_rig) add_verb(src, /mob/living/proc/usehardsuit) INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, update_health)) else @@ -145,16 +148,10 @@ return FALSE //ok so tasers hurt protean blobs what the fuck /mob/living/simple_mob/protean_blob/adjustBruteLoss(var/amount,var/include_robo) - if(humanform) - humanform.adjustBruteLossByPart(amount, BP_TORSO) - else - ..() + return humanform? humanform.take_targeted_damage(brute = amount, body_zone = BP_TORSO) : ..() /mob/living/simple_mob/protean_blob/adjustFireLoss(var/amount,var/include_robo) - if(humanform) - humanform.adjustFireLossByPart(amount, BP_TORSO) - else - ..() + return humanform? humanform.take_targeted_damage(burn = amount, body_zone = BP_TORSO) : ..() // citadel hack - FUCK YOU DIE CORRECTLY THIS ENTIRE FETISH RACE IS A SORRY MISTAKE /mob/living/simple_mob/protean_blob/death(gibbed, deathmessage = "dissolves away, leaving only a few spare parts!") @@ -530,6 +527,11 @@ icon_living = "puddle0" update_icon() + if(istype(loc, /obj/item/holder)) + var/obj/item/holder/H = loc + H.sync() + + /mob/living/simple_mob/protean_blob/proc/leap_attack() set name = "Pounce" set desc = "Allows a protean blob to launch itself at people." @@ -560,7 +562,7 @@ return visible_message("[src] coils itself up like a spring, preparing to leap at [target]!") - if(do_after(src, 7.5 SECONDS, target)) //7.5 seconds. + if(do_after(src, 1 SECOND, target)) //1 second if(buckled || pinned.len) return @@ -569,7 +571,10 @@ src.forceMove(H) switch(src.zone_sel.selecting) - if(BP_GROIN) + if(BP_L_LEG) + targeted_area = SLOT_ID_UNIFORM //fetish_code.rtf + target_displayname = "body" + if(BP_R_LEG) targeted_area = SLOT_ID_UNIFORM //fetish_code.rtf target_displayname = "body" if(BP_TORSO) @@ -581,6 +586,24 @@ if(O_MOUTH) targeted_area = SLOT_ID_MASK target_displayname = "face" + if(BP_R_HAND) + targeted_area = SLOT_ID_GLOVES + target_displayname = "body" + if(BP_L_HAND) + targeted_area = SLOT_ID_GLOVES + target_displayname = "body" + if(BP_GROIN) + targeted_area = SLOT_ID_BACK + target_displayname = "back" + if(BP_L_FOOT) + targeted_area = SLOT_ID_SHOES + target_displayname = "feet" + if(BP_R_FOOT) + targeted_area = SLOT_ID_SHOES + target_displayname = "feet" + if(O_EYES) + targeted_area = SLOT_ID_GLASSES + target_displayname = "eyes" if(target.equip_to_slot_if_possible(H, targeted_area, INV_OP_IGNORE_DELAY | INV_OP_SILENT)) visible_message("[src] leaps at [target]'s [target_displayname]!") @@ -589,6 +612,140 @@ H.sync(src) return +/mob/living/simple_mob/protean_blob/proc/chameleon_apperance() + set name = "Chameleon Change" + set desc = "Allows a protean blob to change or reset its apperance when worn." + set category = "Abilities" + + if(!istype(loc, /obj/item/holder)) + to_chat(src, "You can't do that while not being held or worn.") + return + + var/obj/item/holder/H = loc + var/chosen_list + var/icon_file + switch(input(src,"What type of clothing would you like to mimic or reset appearance?","Mimic Clothes") as null|anything in list("under", "suit", "hat", "gloves", "shoes", "back", "mask", "glasses", "belt", "ears", "headsets", "reset")) + if("reset") + H.color = initial(H.color) + H.icon_override = null + H.sync(src) + return + if("under") + chosen_list = GLOB.clothing_under + icon_file = 'icons/mob/clothing/uniform.dmi' + if("suit") + chosen_list = GLOB.clothing_suit + icon_file = 'icons/mob/clothing/suits.dmi' + if("hat") + chosen_list = GLOB.clothing_head + icon_file = 'icons/mob/clothing/head.dmi' + if("gloves") + chosen_list = GLOB.clothing_gloves + icon_file = 'icons/mob/clothing/hands.dmi' + if("shoes") + chosen_list = GLOB.clothing_shoes + icon_file = 'icons/mob/clothing/feet.dmi' + if("back") + chosen_list = GLOB.clothing_backpack + icon_file = 'icons/mob/clothing/back.dmi' + if("mask") + chosen_list = GLOB.clothing_mask + icon_file = 'icons/mob/clothing/mask.dmi' + if("glasses") + chosen_list = GLOB.clothing_glasses + icon_file = 'icons/mob/clothing/eyes.dmi' + if("belt") + chosen_list = GLOB.clothing_belt + icon_file = 'icons/mob/clothing/belt.dmi' + if("ears") + chosen_list = GLOB.clothing_ears + icon_file = 'icons/mob/clothing/ears.dmi' + if("headsets") + chosen_list = GLOB.clothing_headsets + icon_file = 'icons/mob/clothing/ears.dmi' + + var/picked = input(src,"What clothing would you like to mimic?","Mimic Clothes") as null|anything in chosen_list + + if(!ispath(chosen_list[picked])) + return + + H.disguise(chosen_list[picked]) + if(isnull(H.icon_override)) + H.icon_override = icon_file + H.update_worn_icon() //so our overlays update. + + if (ismob(H.loc)) + var/mob/M = H.loc + M.update_inv_belt() //so our overlays + M.update_inv_back() + + +/mob/living/simple_mob/protean_blob/proc/chameleon_apperance_rig() + set name = "Chameleon Hardsuit Change" + set desc = "Allows a protean blob to change or reset its apperance when worn." + set category = "Abilities" + + if(!istype(loc, /obj/item/hardsuit/protean)) + to_chat(src, "You can't do that while not being held or worn as a hardsuit.") + return + + var/obj/item/hardsuit/protean/H = loc + var/chosen_list + var/obj/item/clothing/chosenpart + + switch(input(src,"What type of clothing would you like to mimic or reset appearance?","Mimic Clothes") as null|anything in list("suit", "helmet", "gloves", "boots", "reset")) + if("reset") + H.boots.disguise(H.boots.type) //disguising it as itself just sets its vars back to initial which is what we want + H.chest.disguise(H.chest.type) + H.helmet.disguise(H.helmet.type) + H.gloves.disguise(H.gloves.type) + H.boots.update_worn_icon() + H.chest.update_worn_icon() + H.helmet.update_worn_icon() + H.gloves.update_worn_icon() + return + if("suit") + chosenpart = H.chest + chosen_list = GLOB.clothing_suit + if("helmet") + chosenpart = H.helmet + chosen_list = GLOB.clothing_head + if("gloves") + chosenpart = H.gloves + chosen_list = GLOB.clothing_gloves + if("boots") + chosenpart = H.boots + chosen_list = GLOB.clothing_shoes + + + var/picked = input(src,"What clothing would you like to mimic?","Mimic Clothes") as null|anything in chosen_list + + if(!ispath(chosen_list[picked])) + return + + chosenpart.disguise(chosen_list[picked]) + chosenpart.update_worn_icon() + + +/mob/living/simple_mob/protean_blob/proc/chameleon_color() + set name = "Chameleon Color" + set desc = "Allows a protean blob to change or reset its color when worn." + set category = "Abilities" + + if(!istype(loc, /obj/item/holder)) + to_chat(src, "You can't do that while not being held or worn.") + return + + var/obj/item/holder/H = loc + var/color_in = input("Pick a color. Cancelling sets it to default.","Color", H.color) as null|color + + if(color_in) + H.color = color_in + else + H.color = initial(H.color) + H.update_worn_icon() //so our overlays update. + + /mob/living/simple_mob/protean_blob/make_perspective() . = ..() self_perspective.set_plane_visible(/atom/movable/screen/plane_master/augmented, INNATE_TRAIT) diff --git a/code/modules/species/shadekin/shadekin.dm b/code/modules/species/shadekin/shadekin.dm index 582f2ef6e1..bcfc62668b 100644 --- a/code/modules/species/shadekin/shadekin.dm +++ b/code/modules/species/shadekin/shadekin.dm @@ -146,7 +146,7 @@ /datum/species/shadekin/get_random_name() return "shadekin" -/datum/species/shadekin/handle_environment_special(mob/living/carbon/human/H) +/datum/species/shadekin/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) handle_shade(H) /datum/species/shadekin/can_breathe_water() diff --git a/code/modules/species/shadekin/shadekin_blackeyed.dm b/code/modules/species/shadekin/shadekin_blackeyed.dm index 76f1425096..4509b9199a 100644 --- a/code/modules/species/shadekin/shadekin_blackeyed.dm +++ b/code/modules/species/shadekin/shadekin_blackeyed.dm @@ -139,7 +139,7 @@ /datum/species/crew_shadekin/can_breathe_water() return TRUE //they dont quite breathe -/datum/species/crew_shadekin/handle_environment_special(mob/living/carbon/human/H) +/datum/species/crew_shadekin/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) handle_shade(H) /datum/species/crew_shadekin/add_inherent_verbs(mob/living/carbon/human/H) diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index f9b9107e87..aae67534a7 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -355,8 +355,11 @@ var/exhale_type = GAS_ID_CARBON_DIOXIDE /// Species will try to stabilize at this temperature. (also affects temperature processing) + /// Null to disable natural stabilization. + // todo: shoo, needs to be organ/biology based var/body_temperature = 310.15 /// Species will gain this much temperature every second + // todo: shoo, needs to be organ/biology based var/passive_temp_gain = 0 //? Cold Air @@ -436,6 +439,7 @@ var/show_ssd = "fast asleep" /// This allows you to pick up crew var/holder_type = /obj/item/holder/micro + var/custom_ability_handler //? on death drops /// The color of the species flesh. @@ -776,7 +780,7 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( return // Only used for alien plasma weeds atm, but could be used for Dionaea later. -/datum/species/proc/handle_environment_special(var/mob/living/carbon/human/H) +/datum/species/proc/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) return // Used to update alien icons for aliens. diff --git a/code/modules/species/species_attack.dm b/code/modules/species/species_attack.dm index 04fefaadf0..55d4e4955d 100644 --- a/code/modules/species/species_attack.dm +++ b/code/modules/species/species_attack.dm @@ -157,3 +157,26 @@ /datum/unarmed_attack/bite/sharp/shadekin/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) ..() user.shadekin_adjust_energy(energy_gain) + +//Traits attack +/datum/unarmed_attack/bite/sharp/good + damage = 10 + damage_tier = MELEE_TIER_LIGHT + +/datum/unarmed_attack/claws/good + damage = 10 + damage_tier = MELEE_TIER_LIGHT + +/datum/unarmed_attack/bite/sharp/good/venom + +/datum/unarmed_attack/bite/sharp/good/venom/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) + ..() + if(target.can_inject(null,FALSE,zone,FALSE)) + target.bloodstr.add_reagent("toxin",2) //8 extra damage per hit over time + +/datum/unarmed_attack/claws/good/venom + +/datum/unarmed_attack/claws/good/venom/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) + ..() + if(target.can_inject(null,FALSE,zone,FALSE)) + target.bloodstr.add_reagent("toxin",2) diff --git a/code/modules/species/species_shapeshift.dm b/code/modules/species/species_shapeshift.dm index c33b36fc4a..418338c7b3 100644 --- a/code/modules/species/species_shapeshift.dm +++ b/code/modules/species/species_shapeshift.dm @@ -543,7 +543,7 @@ var/list/wrapped_species_by_ref = list() visible_message(SPAN_NOTICE("\The [src]'s \"hair\" composition seems to change.")) update_hair() -/datum/species/shapeshifter/handle_environment_special(mob/living/carbon/human/H) +/datum/species/shapeshifter/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) // Heal remaining damage. if(H.fire_stacks >= 0 && heal_rate > 0) if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss()) diff --git a/code/modules/species/station/adherent.dm b/code/modules/species/station/adherent.dm index ed199fde30..e7f226da24 100644 --- a/code/modules/species/station/adherent.dm +++ b/code/modules/species/station/adherent.dm @@ -163,7 +163,7 @@ /datum/species/adherent/get_slowdown(var/mob/living/carbon/human/H) return slowdown */ -/datum/species/adherent/handle_environment_special(mob/living/carbon/human/H) +/datum/species/adherent/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) for(var/i in H.overlays_standing) H.cut_overlay(i) //Todo: find a better way to adjust clothing, than to wipe all overlays diff --git a/code/modules/species/station/alraune.dm b/code/modules/species/station/alraune.dm index d58dda7b6a..827ecaba87 100644 --- a/code/modules/species/station/alraune.dm +++ b/code/modules/species/station/alraune.dm @@ -124,7 +124,7 @@ return TRUE //eh, why not? Aquatic plants are a thing. -/datum/species/alraune/handle_environment_special(mob/living/carbon/human/H) +/datum/species/alraune/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(H.inStasisNow()) // if they're in stasis, they won't need this stuff. return @@ -332,7 +332,7 @@ else temp_adj /= (BODYTEMP_HEAT_DIVISOR * 5) //don't raise temperature as much as if we were directly exposed - var/relative_density = 8 * breath.total_moles / (MOLES_CELLSTANDARD * BREATH_PERCENTAGE) + var/relative_density = 8 * breath.total_moles / (CELL_MOLES * BREATH_PERCENTAGE) temp_adj *= relative_density if (temp_adj > BODYTEMP_HEATING_MAX) temp_adj = BODYTEMP_HEATING_MAX diff --git a/code/modules/species/station/custom_species.dm b/code/modules/species/station/custom_species.dm index f0e8b53930..9f8b5d83a4 100644 --- a/code/modules/species/station/custom_species.dm +++ b/code/modules/species/station/custom_species.dm @@ -75,7 +75,7 @@ //Called during handle_environment in Life() ticks. // Return: Not used. -/datum/species/custom/handle_environment_special(mob/living/carbon/human/H) +/datum/species/custom/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) return ..() //Called when spawning to equip them with special things. diff --git a/code/modules/species/station/diona.dm b/code/modules/species/station/diona.dm index 182e16b8e1..8439b7435c 100644 --- a/code/modules/species/station/diona.dm +++ b/code/modules/species/station/diona.dm @@ -154,7 +154,7 @@ SPAN_HEAR("You hear a wet slithering noise!"), ) -/datum/species/diona/handle_environment_special(mob/living/carbon/human/H) +/datum/species/diona/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(H.inStasisNow()) return diff --git a/code/modules/species/station/phoronoids.dm b/code/modules/species/station/phoronoids.dm index 063610f61a..188db8ddeb 100644 --- a/code/modules/species/station/phoronoids.dm +++ b/code/modules/species/station/phoronoids.dm @@ -79,11 +79,7 @@ body_temperature = T20C -/datum/species/phoronoid/handle_environment_special(mob/living/carbon/human/H) - var/turf/T = H.loc - if(!T) - return - var/datum/gas_mixture/environment = T.copy_cell_volume() +/datum/species/phoronoid/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(!environment) return diff --git a/code/modules/species/station/standard/tajaran.dm b/code/modules/species/station/standard/tajaran.dm index f87fa59449..288b1ab0a0 100644 --- a/code/modules/species/station/standard/tajaran.dm +++ b/code/modules/species/station/standard/tajaran.dm @@ -68,7 +68,7 @@ breath_cold_level_2 = 100 breath_cold_level_3 = 60 - heat_level_1 = 330 + heat_level_1 = 340 heat_level_2 = 380 heat_level_3 = 800 diff --git a/code/modules/species/station/standard/teshari.dm b/code/modules/species/station/standard/teshari.dm index 27a319c4b0..2ba15cae12 100644 --- a/code/modules/species/station/standard/teshari.dm +++ b/code/modules/species/station/standard/teshari.dm @@ -91,7 +91,7 @@ breath_cold_level_2 = 100 breath_cold_level_3 = 60 - heat_level_1 = 320 + heat_level_1 = 330 heat_level_2 = 370 heat_level_3 = 600 diff --git a/code/modules/species/station/standard/zaddat.dm b/code/modules/species/station/standard/zaddat.dm index 71cebbea25..14cfb58db9 100644 --- a/code/modules/species/station/standard/zaddat.dm +++ b/code/modules/species/station/standard/zaddat.dm @@ -120,7 +120,7 @@ else H.equip_to_slot_or_del(L, /datum/inventory_slot_meta/abstract/put_in_backpack) -/datum/species/zaddat/handle_environment_special(mob/living/carbon/human/H) +/datum/species/zaddat/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(H.inStasisNow()) return diff --git a/code/modules/species/station/vasilissan.dm b/code/modules/species/station/vasilissan.dm index 8891368966..1d511efa73 100644 --- a/code/modules/species/station/vasilissan.dm +++ b/code/modules/species/station/vasilissan.dm @@ -82,7 +82,7 @@ /datum/unarmed_attack/bite/sharp/numbing, ) -/datum/species/vasilissan/handle_environment_special(mob/living/carbon/human/H) +/datum/species/vasilissan/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(H.stat == DEAD) // If they're dead they won't need anything. return diff --git a/code/modules/species/station/xenochimera.dm b/code/modules/species/station/xenochimera.dm index 70c42b5e68..16b54032d5 100644 --- a/code/modules/species/station/xenochimera.dm +++ b/code/modules/species/station/xenochimera.dm @@ -109,6 +109,7 @@ /mob/living/carbon/human/proc/hide_horns, /mob/living/carbon/human/proc/hide_wings, /mob/living/carbon/human/proc/hide_tail, + /mob/living/proc/set_size, /mob/living/proc/shred_limb, /mob/living/proc/eat_trash, /mob/living/proc/glow_toggle, @@ -131,7 +132,7 @@ var/has_feral_abilities = FALSE -/datum/species/shapeshifter/xenochimera/handle_environment_special(mob/living/carbon/human/H) +/datum/species/shapeshifter/xenochimera/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) //If they're KO'd/dead, they're probably not thinking a lot about much of anything. if(!H.stat) handle_feralness(H) @@ -142,13 +143,6 @@ //Cold/pressure effects when not regenerating else - var/pressure2 = H.loc.return_pressure() - var/adjusted_pressure2 = H.calculate_affecting_pressure(pressure2) - - //Very low pressure damage - if(adjusted_pressure2 <= 20) - H.take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") - //Cold hurts and gives them pain messages, eventually weakening and paralysing, but doesn't damage or trigger feral. //NB: 'body_temperature' used here is the 'setpoint' species var var/temp_diff = body_temperature - H.bodytemperature @@ -731,7 +725,7 @@ name = "Dissonant Shriek" desc = "We shift our vocal cords to release a high-frequency sound that overloads nearby electronics." action_state = "ling_resonant_shriek" - var/range = 8 + range = 8 //Slightly more potent than an EMP grenade var/emp_heavy = 3 var/emp_med = 6 @@ -887,9 +881,16 @@ var/target = null var/text = null - for(var/datum/mind/possible_target in SSticker.minds) //not us, on the station and not a synthetic - if (istype(possible_target.current, /mob/living) && possible_target != owner.mind && isStationLevel(get_z(possible_target.current)) && !possible_target.current.isSynthetic()) - LAZYADD(targets,possible_target.current) +//If the target is not a synth, not us, and a valid mob + for(var/datum/mind/possible_target in SSticker.minds) + if (istype(possible_target.current, /mob/living)) + if(possible_target != owner.mind) + if(!possible_target.current.isSynthetic()) + if(isStationLevel(get_z(owner))) //If we're on station, go through the station + if(isStationLevel(get_z(possible_target.current))) + LAZYADD(targets,possible_target.current) + else if (get_z(owner) == get_z(possible_target.current)) //Otherwise, go through the z level we're on + LAZYADD(targets,possible_target.current) target = input("Select a creature!", "Speak to creature", null, null) as null|anything in targets if(!target) diff --git a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm index 7f4a9fc8e6..e9b3287f24 100644 --- a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm +++ b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm @@ -133,7 +133,7 @@ return healing_factor // highest value is 6,336 -/datum/species/xenohybrid/handle_environment_special(mob/living/carbon/human/H) +/datum/species/xenohybrid/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) var/heal_amount = heal_rate * handle_healing_conditions(H) var/nutrition_debt = (H.getFireLoss() ? heal_rate : 0)//Heal rate and not heal_amount, since we want to reward taking the modifiers diff --git a/code/modules/species/virtual_reality/avatar.dm b/code/modules/species/virtual_reality/avatar.dm index d5c53b530c..2a3ed9c6af 100644 --- a/code/modules/species/virtual_reality/avatar.dm +++ b/code/modules/species/virtual_reality/avatar.dm @@ -44,7 +44,7 @@ /datum/species/shapeshifter/promethean/avatar/handle_death(var/mob/living/carbon/human/H) return -/datum/species/shapeshifter/promethean/avatar/handle_environment_special(var/mob/living/carbon/human/H) +/datum/species/shapeshifter/promethean/avatar/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) return /* NO. YOU CAN HAVE THIS BACK WHEN THIS DOESNT SWAP SPECIES TO CHANGE OPACITY diff --git a/code/modules/species/xenomorphs/alien_embryo.dm b/code/modules/species/xenomorphs/alien_embryo.dm index 7ea507ef6e..bb95dc59a7 100644 --- a/code/modules/species/xenomorphs/alien_embryo.dm +++ b/code/modules/species/xenomorphs/alien_embryo.dm @@ -58,7 +58,7 @@ if(prob(2)) to_chat(affected_mob, " Your muscles ache.") if(prob(20)) - affected_mob.take_organ_damage(1) + affected_mob.take_random_targeted_damage(brute = 1) if(prob(2)) to_chat(affected_mob, "Your stomach hurts.") if(prob(20)) diff --git a/code/modules/species/xenomorphs/alien_facehugger.dm b/code/modules/species/xenomorphs/alien_facehugger.dm index 48ad67058d..266abb2574 100644 --- a/code/modules/species/xenomorphs/alien_facehugger.dm +++ b/code/modules/species/xenomorphs/alien_facehugger.dm @@ -133,7 +133,7 @@ var/const/MAX_ACTIVE_TIME = 400 if(stat != CONSCIOUS) return if(!sterile) - L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage + L.take_random_targeted_damage(brute = strength, brute = 0) //done here so that even borgs and humans in helmets take damage L.visible_message(" [src] leaps at [L]'s face!") @@ -412,7 +412,7 @@ var/const/MAX_ACTIVE_TIME = 400 if(loc == L) return if(stat != CONSCIOUS) return - if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage + if(!sterile) L.take_random_targeted_damage(brute = strength, brute = 0) //done here so that even borgs and humans in helmets take damage L.visible_message(" [src] leaps at [L]'s face!") diff --git a/code/modules/species/xenomorphs/alien_species.dm b/code/modules/species/xenomorphs/alien_species.dm index b07b3c3796..dea33584e2 100644 --- a/code/modules/species/xenomorphs/alien_species.dm +++ b/code/modules/species/xenomorphs/alien_species.dm @@ -113,19 +113,15 @@ ..() -/datum/species/xenos/handle_environment_special(var/mob/living/carbon/human/H) +/datum/species/xenos/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) + if(!environment) + return - var/turf/T = H.loc - if(!T) return - var/datum/gas_mixture/environment = T.return_air() - if(!environment) return - - if(environment.gas[GAS_ID_PHORON] > 0 || locate(/obj/structure/alien/weeds) in T) + if(environment.gas[GAS_ID_PHORON] > 0 || locate(/obj/structure/alien/weeds) in get_turf(H)) if(!regenerate(H)) var/obj/item/organ/internal/xenos/plasmavessel/P = H.internal_organs_by_name[O_PLASMA] P.stored_plasma += weeds_plasma_rate P.stored_plasma = min(max(P.stored_plasma,0),P.max_plasma) - ..() /datum/species/xenos/proc/regenerate(var/mob/living/carbon/human/H) var/heal_rate = weeds_heal_rate diff --git a/code/modules/sprite_accessories/markings/tattoo.dm b/code/modules/sprite_accessories/markings/tattoo.dm index 13043a0614..0ba88a85da 100644 --- a/code/modules/sprite_accessories/markings/tattoo.dm +++ b/code/modules/sprite_accessories/markings/tattoo.dm @@ -65,6 +65,56 @@ icon_state = "tat_tiger" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN) +/datum/sprite_accessory/marking/tatoo/tat_tiger/l_foot + name = "Tattoo (Tiger Stripes, Left Foot)" + id = "tat_tiger-l_foot" + body_parts = list(BP_L_FOOT) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/r_foot + name = "Tattoo (Tiger Stripes, Right Foot)" + id = "tat_tiger-r_foot" + body_parts = list(BP_R_FOOT) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/l_leg + name = "Tattoo (Tiger Stripes, Left Leg)" + id = "tat_tiger-l_leg" + body_parts = list(BP_L_LEG) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/r_leg + name = "Tattoo (Tiger Stripes, Right Leg)" + id = "tat_tiger-r_leg" + body_parts = list(BP_R_LEG) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/groin + name = "Tattoo (Tiger Stripes, Groin)" + id = "tat_tiger-groin" + body_parts = list(BP_GROIN) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/torso + name = "Tattoo (Tiger Stripes, Torso)" + id = "tat_tiger-torso" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/l_arm + name = "Tattoo (Tiger Stripes, Left Arm)" + id = "tat_tiger-l_arm" + body_parts = list(BP_L_ARM) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/r_arm + name = "Tattoo (Tiger Stripes, Right Arm)" + id = "tat_tiger-r_arm" + body_parts = list(BP_R_ARM) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/r_hand + name = "Tattoo (Tiger Stripes, Right Hand)" + id = "tat_tiger-r_hand" + body_parts = list(BP_R_HAND) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/l_hand + name = "Tattoo (Tiger Stripes, Left Hand)" + id = "tat_tiger-l_hand" + body_parts = list(BP_L_HAND) + /datum/sprite_accessory/marking/tatoo/tat_inmon1 name = "Tattoo (Inmon, Variant 1)" id = "marking_tattoo_groin_inmon" @@ -82,3 +132,313 @@ id = "marking_tattoo_groin_inmon3" icon_state = "tat_inmon3" body_parts = list(BP_GROIN) + +/datum/sprite_accessory/marking/tatoo/spelunker + name = "Tattoo (Spelunker, Body)" + id = "marking_tattoo_body_spelunker" + icon_state = "tat_spelunker" + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/spelunker/l_leg + name = "Tattoo (Spelunker, Left Leg)" + id = "marking_tattoo_body_spelunker-l_leg" + body_parts = list(BP_L_LEG) + +/datum/sprite_accessory/marking/tatoo/spelunker/r_leg + name = "Tattoo (Spelunker, Right Leg)" + id = "marking_tattoo_body_spelunker-r_leg" + body_parts = list(BP_R_LEG) + +/datum/sprite_accessory/marking/tatoo/spelunker/head + name = "Tattoo (Spelunker, Head)" + id = "marking_tattoo_body_spelunker-head" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/spelunker/torso + name = "Tattoo (Spelunker, Torso)" + id = "marking_tattoo_body_spelunker-torso" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/spelunker/r_arm + name = "Tattoo (Spelunker, Right Arm)" + id = "marking_tattoo_body_spelunker-r_arm" + body_parts = list(BP_R_ARM) + +/datum/sprite_accessory/marking/tatoo/spelunker/l_arm + name = "Tattoo (Spelunker, Left Arm)" + id = "marking_tattoo_body_spelunker-l_arm" + body_parts = list(BP_L_ARM) + +/datum/sprite_accessory/marking/tatoo/spelunker/groin + name = "Tattoo (Spelunker, Groin)" + id = "marking_tattoo_body_spelunker-groin" + body_parts = list(BP_GROIN) + +/datum/sprite_accessory/marking/tatoo/delver + name = "Tattoo (Delver, Body)" + id = "marking_tattoo_body_delver" + icon_state = "tat_delver" + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/delver/l_leg + name = "Tattoo (Delver, Left Leg)" + id = "marking_tattoo_body_delver-l_leg" + body_parts = list(BP_L_LEG) + +/datum/sprite_accessory/marking/tatoo/delver/r_leg + name = "Tattoo (Delver, Right Leg)" + id = "marking_tattoo_body_delver-r_leg" + body_parts = list(BP_R_LEG) + +/datum/sprite_accessory/marking/tatoo/delver/r_arm + name = "Tattoo (Delver, Right Arm)" + id = "marking_tattoo_body_delver-r_arm" + body_parts = list(BP_R_ARM) + +/datum/sprite_accessory/marking/tatoo/delver/l_arm + name = "Tattoo (Delver, Left Arm)" + id = "marking_tattoo_body_delver-l_arm" + body_parts = list(BP_L_ARM) + +/datum/sprite_accessory/marking/tatoo/delver/groin + name = "Tattoo (Delver, Groin)" + id = "marking_tattoo_body_delver-groin" + body_parts = list(BP_GROIN) + +/datum/sprite_accessory/marking/tatoo/delver/torso + name = "Tattoo (Delver, Torso)" + id = "marking_tattoo_body_delver-torso" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/delver/head + name = "Tattoo (Delver, Head)" + id = "marking_tattoo_body_delver-head" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eye_mark + name = "Tattoo (Mark, Left Eye)" + id = "marking_tattoo_eye_mark_left" + icon_state = "tat_eye_tattoo_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eye_mark/right + name = "Tattoo (Mark, Right Eye)" + id = "marking_tattoo_eye_mark_right" + icon_state = "tat_eye_tattoo_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/jaeger + name = "Tattoo (Jaeger, Right Head)" + id = "marking_tattoo_jaeger_r" + icon_state = "tat_jaeger_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/jaeger/left + name = "Tattoo (Jaeger, Left Head)" + id = "marking_tattoo_jaeger_l" + icon_state = "tat_jaeger_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/lujan + name = "Tattoo (Lujan, Right Head)" + id = "marking_tattoo_lujan_r" + icon_state = "tat_lujan_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/lujan/left + name = "Tattoo (Lujan, Left Head)" + id = "marking_tattoo_lujan_l" + icon_state = "tat_lujan_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/natasha + name = "Tattoo (Natasha, Left Head)" + id = "marking_tattoo_natasha_l" + icon_state = "tat_natasha_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/natasha/right + name = "Tattoo (Natasha, Right Head)" + id = "marking_tattoo_natasha_r" + icon_state = "tat_natasha_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/forrest + name = "Tattoo (Forrest, Right Head)" + id = "marking_tattoo_forrest_r" + icon_state = "tat_forrest_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/forrest/left + name = "Tattoo (Forrest, Left Head)" + id = "marking_tattoo_forrest_l" + icon_state = "tat_forrest_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/toshi + name = "Tattoo (Toshi, Left Head)" + id = "marking_tattoo_toshi_l" + icon_state = "tat_toshi_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/toshi/right + name = "Tattoo (Toshi, Right Head)" + id = "marking_tattoo_toshi_r" + icon_state = "tat_toshi_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/cheshire + name = "Tattoo (Cheshire, Right Head)" + id = "marking_tattoo_cheshire_r" + icon_state = "tat_cheshire_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/cheshire/left + name = "Tattoo (Cheshire, Left Head)" + id = "marking_tattoo_cheshire_l" + icon_state = "tat_cheshire_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/bindi + name = "Tattoo (Bindi, Head)" + id = "marking_tattoo_bindi" + icon_state = "tat_bindi" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eyestripe + name = "Tattoo (Eyestripe, Head)" + id = "marking_tattoo_eyestripe" + icon_state = "tat_eyestripe" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/kater + name = "Tattoo (Kater, Right Head)" + id = "marking_tattoo_kater_r" + icon_state = "tat_kater_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/kater/left + name = "Tattoo (Kater, Left Head)" + id = "marking_tattoo_kater_l" + icon_state = "tat_kater_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/hunter + name = "Tattoo (Hunter, Right Head)" + id = "marking_tattoo_hunter_r" + icon_state = "tat_hunter_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/hunter/left + name = "Tattoo (Hunter, Left Head)" + id = "marking_tattoo_hunter_l" + icon_state = "tat_hunter_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/nosetripe + name = "Tattoo (Nosestripe, Head)" + id = "marking_tattoo_nosetripe" + icon_state = "tat_nosetripe" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/wingsback + name = "Tattoo (Wings Back, Torso)" + id = "marking_tattoo_wings_back" + icon_state = "tat_wingsback" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/heartback + name = "Tattoo (Heart Back, Torso)" + id = "marking_tattoo_heart_back" + icon_state = "tat_heartback" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/belly + name = "Tattoo (Belly, Torso)" + id = "marking_tattoo_belly" + icon_state = "tat_belly" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/neck + name = "Tattoo (Thick Neck, Head)" + id = "marking_tattoo_thickneck" + icon_state = "tat_neckthickk" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/ear + name = "Tattoo (Ear Right, Head)" + id = "marking_tattoo_ear_r" + icon_state = "tat_ear_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/ear/left + name = "Tattoo (Ear Left, Head)" + id = "marking_tattoo_ear_l" + icon_state = "tat_ear_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/cheekspot + name = "Tattoo (Cheekspot Left, Head)" + id = "marking_tattoo_cheekspot_l" + icon_state = "tat_cheekspot_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/cheekspot/right + name = "Tattoo (Cheekspot Right, Head)" + id = "marking_tattoo_cheekspot_r" + icon_state = "tat_cheekspot_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/crow + name = "Tattoo (Crow Right, Head)" + id = "marking_tattoo_crow_r" + icon_state = "tat_crow_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/crow/left + name = "Tattoo (Crow Left, Head)" + id = "marking_tattoo_crow_l" + icon_state = "tat_crow_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/nosetape + name = "Tattoo (Nose, Head)" + id = "marking_tattoo_nose" + icon_state = "tat_nosetape" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/mouth + name = "Tattoo (Mouth Left, Head)" + id = "marking_tattoo_mouth_l" + icon_state = "tat_lipcorner_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/mouth/right + name = "Tattoo (Mouth Right, Head)" + id = "marking_tattoo_mouth_r" + icon_state = "tat_lipcorner_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eye + name = "Tattoo (Eye Corner Right, Head)" + id = "marking_tattoo_eyecorner_r" + icon_state = "tat_eyecorner_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eye/left + name = "Tattoo (Eye Corner Left, Head)" + id = "marking_tattoo_eyecorner_l" + icon_state = "tat_eyecorner_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eyelash + name = "Tattoo (Eyelash Left, Head)" + id = "marking_tattoo_eyelash_l" + icon_state = "tat_eyelash_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eyelash/right + name = "Tattoo (Eyelash Right, Head)" + id = "marking_tattoo_eyelash_r" + icon_state = "tat_eyelash_r" + body_parts = list(BP_HEAD) diff --git a/code/modules/stockmarket/computer.dm b/code/modules/stockmarket/computer.dm index 6d16aa4ee9..666891005f 100644 --- a/code/modules/stockmarket/computer.dm +++ b/code/modules/stockmarket/computer.dm @@ -30,7 +30,7 @@ //! ## MAIN TGUI SCREEN ## !// -/obj/machinery/computer/stockexchange/ui_act(action, params, datum/tgui/ui) +/obj/machinery/computer/stockexchange/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -104,7 +104,7 @@ if(vmode > 1) vmode = 0 -/obj/machinery/computer/stockexchange/ui_data(mob/user) +/obj/machinery/computer/stockexchange/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["stationName"] = (LEGACY_MAP_DATUM).station_name @@ -207,12 +207,12 @@ ui = new(user, src, "StockExchangeHistory") ui.open() -/obj/machinery/computer/stockexchange/history/ui_data(mob/user) +/obj/machinery/computer/stockexchange/history/ui_data(mob/user, datum/tgui/ui) var/list/data = list() //data["var"] = var return data -/obj/machinery/computer/stockexchange/history/ui_act(action, params) +/obj/machinery/computer/stockexchange/history/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) @@ -230,12 +230,12 @@ ui = new(user, src, "StockExchangeArchive") ui.open() -/obj/machinery/computer/stockexchange/archive/ui_data(mob/user) +/obj/machinery/computer/stockexchange/archive/ui_data(mob/user, datum/tgui/ui) var/list/data = list() //data["var"] = var return data -/obj/machinery/computer/stockexchange/archive/ui_act(action, params) +/obj/machinery/computer/stockexchange/archive/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 97a01af469..66e366fb1e 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -62,7 +62,9 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") - affected.take_damage(5, 0) + affected.inflict_bodypart_damage( + brute = 5, + ) /////////////////////////////////////////////////////////////// // Necrosis Surgery Step 1 diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index f60cd02957..1225027510 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -294,7 +294,7 @@ target.adjustToxLoss(5) affected.create_wound(CUT, 5) - for(var/obj/item/organ/I in affected.internal_organs) + for(var/obj/item/organ/internal/I in affected.internal_organs) if(I) I.take_damage(rand(3,5),0) diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm index b9a9f27a28..8be96f2740 100644 --- a/code/modules/tgs/core/core.dm +++ b/code/modules/tgs/core/core.dm @@ -42,11 +42,11 @@ var/datum/tgs_version/max_api_version = TgsMaximumApiVersion(); if(version.suite != null && version.minor != null && version.patch != null && version.deprecated_patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter) - TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.") + TGS_ERROR_LOG("Detected unknown Interop API version! Defaulting to latest. Update the DMAPI to fix this problem.") api_datum = /datum/tgs_api/latest if(!api_datum) - TGS_ERROR_LOG("Found unsupported API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") + TGS_ERROR_LOG("Found unsupported Interop API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") return TGS_INFO_LOG("Activating API for version [version.deprefixed_parameter]") @@ -107,6 +107,13 @@ if(api) return api.ApiVersion() +/world/TgsEngine() +#ifdef OPENDREAM + return TGS_ENGINE_TYPE_OPENDREAM +#else + return TGS_ENGINE_TYPE_BYOND +#endif + /world/TgsInstanceName() var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) if(api) diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index 83420d130a..616263098f 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.7.0" +"5.8.0" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index 48969c0c7d..1c7d67d20c 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -8,7 +8,6 @@ #define DMAPI5_TOPIC_REQUEST_LIMIT 65528 #define DMAPI5_TOPIC_RESPONSE_LIMIT 65529 -#define DMAPI5_BRIDGE_COMMAND_PORT_UPDATE 0 #define DMAPI5_BRIDGE_COMMAND_STARTUP 1 #define DMAPI5_BRIDGE_COMMAND_PRIME 2 #define DMAPI5_BRIDGE_COMMAND_REBOOT 3 @@ -18,6 +17,7 @@ #define DMAPI5_PARAMETER_ACCESS_IDENTIFIER "accessIdentifier" #define DMAPI5_PARAMETER_CUSTOM_COMMANDS "customCommands" +#define DMAPI5_PARAMETER_TOPIC_PORT "topicPort" #define DMAPI5_CHUNK "chunk" #define DMAPI5_CHUNK_PAYLOAD "payload" diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 7226f29bba..a5c064a8ea 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -8,8 +8,12 @@ var/reboot_mode = TGS_REBOOT_MODE_NORMAL + /// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call var/list/intercepted_message_queue + /// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call + var/list/offline_message_queue + var/list/custom_commands var/list/test_merges @@ -17,6 +21,8 @@ var/list/chat_channels var/initialized = FALSE + var/initial_bridge_request_received = FALSE + var/datum/tgs_version/interop_version var/chunked_requests = 0 var/list/chunked_topics = list() @@ -25,7 +31,8 @@ /datum/tgs_api/v5/New() . = ..() - TGS_DEBUG_LOG("V5 API created") + interop_version = version + TGS_DEBUG_LOG("V5 API created: [json_encode(args)]") /datum/tgs_api/v5/ApiVersion() return new /datum/tgs_version( @@ -38,8 +45,8 @@ access_identifier = world.params[DMAPI5_PARAM_ACCESS_IDENTIFIER] var/datum/tgs_version/api_version = ApiVersion() - version = null - var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands())) + version = null // we want this to be the TGS version, not the interop version + var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort())) if(!istype(bridge_response)) TGS_ERROR_LOG("Failed initial bridge request!") return FALSE @@ -53,7 +60,8 @@ TGS_INFO_LOG("DMAPI validation, exiting...") TerminateWorld() - version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) + initial_bridge_request_received = TRUE + version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) // reassigning this because it can change if TGS updates security_level = runtime_information[DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL] visibility = runtime_information[DMAPI5_RUNTIME_INFORMATION_VISIBILITY] instance_name = runtime_information[DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME] @@ -102,10 +110,17 @@ initialized = TRUE return TRUE +/datum/tgs_api/v5/proc/GetTopicPort() +#if defined(OPENDREAM) && defined(OPENDREAM_TOPIC_PORT_EXISTS) + return "[world.opendream_topic_port]" +#else + return null +#endif + /datum/tgs_api/v5/proc/RequireInitialBridgeResponse() TGS_DEBUG_LOG("RequireInitialBridgeResponse()") var/logged = FALSE - while(!version) + while(!initial_bridge_request_received) if(!logged) TGS_DEBUG_LOG("RequireInitialBridgeResponse: Starting sleep") logged = TRUE @@ -183,17 +198,7 @@ var/datum/tgs_chat_channel/channel = I ids += channel.id - message2 = UpgradeDeprecatedChatMessage(message2) - - if (!length(channels)) - return - - var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids - if(intercepted_message_queue) - intercepted_message_queue += list(data) - else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + SendChatMessageRaw(message2, ids) /datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message2, admin_only) var/list/channels = list() @@ -202,26 +207,42 @@ if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only))) channels += channel.id + SendChatMessageRaw(message2, channels) + +/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user) + SendChatMessageRaw(message2, list(user.channel.id)) + +/datum/tgs_api/v5/proc/SendChatMessageRaw(datum/tgs_message_content/message2, list/channel_ids) message2 = UpgradeDeprecatedChatMessage(message2) - if (!length(channels)) + if (!length(channel_ids)) return var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels + data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channel_ids if(intercepted_message_queue) intercepted_message_queue += list(data) - else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + return -/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user) - message2 = UpgradeDeprecatedChatMessage(message2) - var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = list(user.channel.id) - if(intercepted_message_queue) - intercepted_message_queue += list(data) + if(offline_message_queue) + offline_message_queue += list(data) + return + + if(detached) + offline_message_queue = list(data) + + WaitForReattach(FALSE) + + data = offline_message_queue + offline_message_queue = null + + for(var/queued_message in data) + SendChatDataRaw(queued_message) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + SendChatDataRaw(data) + +/datum/tgs_api/v5/proc/SendChatDataRaw(list/data) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) /datum/tgs_api/v5/ChatChannelInfo() RequireInitialBridgeResponse() diff --git a/code/modules/tgs/v5/bridge.dm b/code/modules/tgs/v5/bridge.dm index 37f58bcdf6..a0ab359876 100644 --- a/code/modules/tgs/v5/bridge.dm +++ b/code/modules/tgs/v5/bridge.dm @@ -48,7 +48,9 @@ var/json = CreateBridgeData(command, data, TRUE) var/encoded_json = url_encode(json) - var/url = "http://127.0.0.1:[server_port]/Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" + var/api_prefix = interop_version.minor >= 8 ? "api/" : "" + + var/url = "http://127.0.0.1:[server_port]/[api_prefix]Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" return url /datum/tgs_api/v5/proc/CreateBridgeData(command, list/data, needs_auth) @@ -81,11 +83,16 @@ TGS_ERROR_LOG("Failed bridge request: [bridge_request]") return - var/response_json = file2text(export_response["CONTENT"]) - if(!response_json) + var/content = export_response["CONTENT"] + if(!content) TGS_ERROR_LOG("Failed bridge request, missing content!") return + var/response_json = file2text(content) + if(!response_json) + TGS_ERROR_LOG("Failed bridge request, failed to load content!") + return + var/list/bridge_response = json_decode(response_json) if(!bridge_response) TGS_ERROR_LOG("Failed bridge request, bad json: [response_json]") diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index 2ef0c70a97..05e6c4e1b2 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -175,6 +175,7 @@ var/list/reattach_response = TopicResponse(error_message) reattach_response[DMAPI5_PARAMETER_CUSTOM_COMMANDS] = ListCustomCommands() + reattach_response[DMAPI5_PARAMETER_TOPIC_PORT] = GetTopicPort() return reattach_response if(DMAPI5_TOPIC_COMMAND_SEND_CHUNK) diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index fd1ed7e4cf..d531d4b7b9 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -8,7 +8,6 @@ #undef DMAPI5_TOPIC_REQUEST_LIMIT #undef DMAPI5_TOPIC_RESPONSE_LIMIT -#undef DMAPI5_BRIDGE_COMMAND_PORT_UPDATE #undef DMAPI5_BRIDGE_COMMAND_STARTUP #undef DMAPI5_BRIDGE_COMMAND_PRIME #undef DMAPI5_BRIDGE_COMMAND_REBOOT @@ -18,6 +17,7 @@ #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER #undef DMAPI5_PARAMETER_CUSTOM_COMMANDS +#undef DMAPI5_PARAMETER_TOPIC_PORT #undef DMAPI5_CHUNK #undef DMAPI5_CHUNK_PAYLOAD diff --git a/code/modules/tgui/client.dm b/code/modules/tgui/client.dm new file mode 100644 index 0000000000..75b5a9b15c --- /dev/null +++ b/code/modules/tgui/client.dm @@ -0,0 +1,88 @@ +/** + * External tgui definitions, such as src_object APIs. + * + *! Copyright (c) 2020 Aleksej Komarov + *! SPDX-License-Identifier: MIT + */ + + +/** + * global + * + * Tracks open windows for a user. + */ +/client/var/list/tgui_windows = list() + +/** + * global + * + * TRUE if cache was reloaded by tgui dev server at least once. + */ +/client/var/tgui_cache_reloaded = FALSE + +/** + * verb + * + * Called by UIs when they are closed. + * Must be a verb so winset() can call it. + * + * required uiref ref The UI that was closed. + */ +/client/verb/uiclose(window_id as text) + // Name the verb, and hide it from the user panel. + set name = "uiclose" + set hidden = TRUE + var/mob/user = src?.mob + if(!user) + return + // Close all tgui datums based on window_id. + SStgui.force_close_window(user, window_id) + +/** + * Middleware for /client/Topic. + * + * return bool If TRUE, prevents propagation of the topic call. + */ +/client/proc/tgui_topic(list/href_list) + // Skip non-tgui topics + if(!href_list["tgui"]) + return FALSE + var/type = href_list["type"] + // Unconditionally collect tgui logs + if(type == "log") + var/context = href_list["window_id"] + if (href_list["ns"]) + context += " ([href_list["ns"]])" + log_tgui(usr, href_list["message"], + context = context) + // Reload all tgui windows + if(type == "cacheReloaded") + log_tgui(usr, context = "debug/reload") + // Mark as reloaded + usr.client.tgui_cache_reloaded = TRUE + // Notify windows + var/list/windows = usr.client.tgui_windows + for(var/window_id in windows) + var/datum/tgui_window/window = windows[window_id] + if (window.status == TGUI_WINDOW_READY) + window.on_message(type, null, href_list) + return TRUE + // Locate window + var/window_id = href_list["window_id"] + var/datum/tgui_window/window + if(window_id) + window = usr.client.tgui_windows[window_id] + if(!window) + log_tgui(usr, + "Error: Couldn't find the window datum, force closing.", + context = window_id) + SStgui.force_close_window(usr, window_id) + return TRUE + // Decode payload + var/payload + if(href_list["payload"]) + payload = json_decode(href_list["payload"]) + // Pass message to window + if(window) + window.on_message(type, payload, href_list) + return TRUE diff --git a/code/modules/tgui/datum.dm b/code/modules/tgui/datum.dm new file mode 100644 index 0000000000..e5ff133698 --- /dev/null +++ b/code/modules/tgui/datum.dm @@ -0,0 +1,331 @@ +/** + * External tgui definitions, such as src_object APIs. + * + *! Copyright (c) 2020 Aleksej Komarov + *! SPDX-License-Identifier: MIT + */ + +/** + * global + * + * Associative list of JSON-encoded shared states that were set by + * tgui clients. + */ +/datum/var/list/tgui_shared_states + +//* API - Main - UI devs, look here! *// + +/** + * public + * + * Called on an object when a tgui object is being created, allowing you to + * push various assets to tgui, for examples spritesheets. + * + * todo: support typepaths + * todo: support file paths + * todo: this should be sent to embedding interfaces + * + * return list List of asset datum instances (must be /datum/asset instance, not path) + */ +/datum/proc/ui_assets(mob/user) + return list() + +/** + * public + * + * Called on a UI when the UI receieves a href. + * Think of this as Topic(). + * + * @params + * * action - the string of the TGUI-side act() that was invoked by the user + * * params - the list of key-value parameters of the act() invocation. This is always strings for both key and value! + * * ui - the TGUI instance invoking this (host window) + * + * @return bool If the user's input has been handled and the UI should update. + */ +/datum/proc/ui_act(action, list/params, datum/tgui/ui) + SHOULD_CALL_PARENT(TRUE) + // If UI is not interactive or usr calling Topic is not the UI user, bail. + if(!ui || ui.status != UI_INTERACTIVE) + return TRUE + +/** + * public + * + * Data to be sent to the UI. + * This must be implemented for a UI to work. + * + * @params + * * user - (optional) the mob using the UI + * * ui - (optional) the host tgui + * + * return list Data to be sent to the UI. + */ +/datum/proc/ui_data(mob/user, datum/tgui/ui) + return list() // Not implemented. + +/** + * public + * + * Static Data to be sent to the UI. + * + * Static data differs from normal data in that it's large data that should be + * sent infrequently. This is implemented optionally for heavy uis that would + * be sending a lot of redundant data frequently. Gets squished into one + * object on the frontend side, but the static part is cached. + * + * + * @params + * * user - (optional) the mob using the UI + * * ui - (optional) the host tgui + * + * return list Static Data to be sent to the UI. + */ +/datum/proc/ui_static_data(mob/user, datum/tgui/ui) + return list() + +/** + * public + * + * Used to open and update UIs. + * If this proc is not implemented properly, the UI will not update correctly. + * + * todo: how should i ruin this proc? i don't really like update being twined with opening, but it makes sense..? ~silicons + * + * required user mob The mob who opened/is using the UI. + * optional ui datum/tgui The UI to be updated, if it exists. + * + *! ## To-Be-Deprecated. + * optional parent_ui datum/tgui A parent UI that, when closed, closes this UI as well. + */ +/datum/proc/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + return FALSE // Not implemented. + +/** + * private + * + * todo: this is just completely ignored for modules/embedding. is this a good thing? ~silicons + * + * The UI's host object (usually src_object). + * This allows modules/datums to have the UI attached to them, + * and be a part of another object. + */ +/datum/proc/ui_host() + return src // Default src. + +/** + * private + * + * todo: this is just completely ignored for modules/embedding. is this a good thing? ~silicons + * + * The UI's state controller to be used for created uis + * This is a proc over a var for memory reasons + */ +/datum/proc/ui_state() + return GLOB.default_state + +/** + * Called to route UI act calls to modules. + * + * This is a proc so you can override yourself - very useful if you're doing your own module system + * rather than copy-pasting module code. + * + * @params + * * action - the action string of the ui_act + * * params - list of string key-values; this is always strings, text2num your number args if needed! + * * ui - the host window ui datum + * * id - the module ID of the route request + * + * @return TRUE if it was handled by modules. + */ +/datum/proc/ui_route(action, list/params, datum/tgui/ui, id) + SHOULD_CALL_PARENT(TRUE) + // todo: the fact this is here is probably a bad thing, as it's very poorly documented. + // this basically matches the useModule<>() hook used on the UI side, because id is null if + // we're a host window, and not an act call from an embedded component. + if(!id) + return ui_act(action, params, ui) + return FALSE + +/** + * public + * + * Checks the overall UI state for a mob. + * + * todo: this is just completely ignored for modules/embedding. is this a good thing? ~silicons + * + * @params + * * user - The mob who opened/is using the UI. + * * state - The state to check. + * + * return UI_state The state of the UI. + */ +/datum/proc/ui_status(mob/user, datum/ui_state/state) + var/src_object = ui_host(user) + . = UI_CLOSE + if(!state) + return + + if(isobserver(user)) + // If they turn on ghost AI control, admins can always interact. + if(IsAdminGhost(user)) + . = max(., UI_INTERACTIVE) + + // Regular ghosts can always at least view if in range. + if(user.client) + // todo: in view range for zooming + if(get_dist(src_object, user) < max(CEILING(user.client.current_viewport_width / 2, 1), CEILING(user.client.current_viewport_height / 2, 1))) + . = max(., UI_UPDATE) + + // Check if the state allows interaction + var/result = state.can_use_topic(src_object, user) + . = max(., result) + +//* API - Update - Optimizers, look here! *// + +/** + * public + * + * Forces an update to regular UI data. + * + * If no user is provided, every user will be updated. + * + * todo: this does not update embedders + * + * @params + * * user - (optional) the mob to update + * * ui - (optional) the /datum/tgui to update + */ +/datum/proc/update_ui_data(mob/user, datum/tgui/ui) + if(isnull(user)) + SStgui.update_uis(src) + else + SStgui.try_update_ui(user, src, ui) + +/** + * public + * + * Forces an update on static data. Should be done manually whenever something + * happens to change static data. + * + * If no user is provided, every user will be updated. + * + * todo: this does not update embedders + * + * optional user the mob currently interacting with the ui + * optional ui tgui to be updated + * optional hard_refreshion use if you need to block the ui from showing if the refresh queues + */ +/datum/proc/update_static_data(mob/user, datum/tgui/ui, hard_refresh) + if(!user) + for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) + window.send_full_update(hard_refresh = hard_refresh) + return + if(!ui) + ui = SStgui.get_open_ui(user, src) + if(ui) + ui.send_full_update(hard_refresh = hard_refresh) + +/** + * immediately shunts this data to either an user, an ui, or all users. + * + * prefer to use this instead of update_static_data or update_ui_data, because this supports embedding + * and is generally faster. + * + * @params + * * user - when specified, only pushes this user. else, pushes to all windows. + * * ui - when specified, only pushes this ui for a given user. + * * updates - list(id = list(data...), ...) for modules. the reducer on tgui-side will only overwrite provided data keys. + */ +/datum/proc/push_ui_data(mob/user, datum/tgui/ui, list/data) + // todo: the way this works is so jank; this should be COMSIG_DATUM_HOOK_UI_PUSH instead? + // todo: this is because user, ui, data needs to go to the signal before being auto-resolved, as modules + // todo: won't necessarily match the values! + // FUCK + // ~silicons + SEND_SIGNAL(src, COMSIG_DATUM_PUSH_UI_DATA, user, ui, data) + if(!user) + for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) + window.push_data(data) + return + if(!ui) + ui = SStgui.get_open_ui(user, src) + if(ui) + // todo: this is force because otherwise static data can be desynced. should static data be on another proc instead? + ui.push_data(data, TRUE) + +/** + * immediately pushes module updates to user, an ui, or all users + * + * @params + * * user - when specified, only pushes this user. else, pushes to all windows. + * * ui - when specified, only pushes this ui for a given user. + * * updates - list(id = list(data...), ...) for modules. the reducer on tgui-side will only overwrite provided data keys. + */ +/datum/proc/push_ui_modules(mob/user, datum/tgui/ui, list/updates) + if(!user) + for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) + window.push_modules(updates) + return + if(!ui) + ui = SStgui.get_open_ui(user, src) + if(ui) + ui.push_modules(updates) + +//* Checks *// + +/** + * public + * + * checks if UIs are open + */ +/datum/proc/has_open_ui() + return length(SStgui.open_uis_by_src[REF(src)]) + +//* Hooks *// + +/** + * Called when a new UI is opened with this datum as the host, or when this datum is embedded into another UI. + * + * Called once per embed, if multiple windows embedding this datum is transferred. Handle this accordingly! + * + * When overriding this, be sure to cast embed_context to the right type for your datum. + * + * @params + * * user - opening mob + * * ui - the tgui instance + * * embedded - this was an embedded ui / the datum is being embedded + */ +/datum/proc/on_ui_open(mob/user, datum/tgui/ui, embedded) + SIGNAL_HANDLER + +/** + * Called when an UI with this datum as the host is closed, or when an UI is no longer embedding this datum. + * + * Called once per embed, if multiple windows embedding this datum is transferred. Handle this accordingly! + * + * When overriding this, be sure to cast embed_context to the right type for your datum. + * + * @params + * * user - opening mob + * * ui - the tgui instance + * * embedded - this was an embedded ui / the datum is being un-embedded + */ +/datum/proc/on_ui_close(mob/user, datum/tgui/ui, embedded) + SIGNAL_HANDLER + +/** + * Called on a UI's object when the UI is transferred from one mob to another. + * + * Called once per embed, if multiple windows embedding this datum is transferred. Handle this accordingly! + * + * When overriding this, be sure to cast embed_context to the right type for your datum. + * + * @params + * * old_mob - the old mob + * * new_mob - the new mob + * * ui - the tgui instance + * * embedded - this was an embedded transfer + */ +/datum/proc/on_ui_transfer(mob/old_mob, mob/new_mob, datum/tgui/ui, embedded) + return diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm deleted file mode 100644 index 72429d4a77..0000000000 --- a/code/modules/tgui/external.dm +++ /dev/null @@ -1,300 +0,0 @@ -/** - * External tgui definitions, such as src_object APIs. - * - *! Copyright (c) 2020 Aleksej Komarov - *! SPDX-License-Identifier: MIT - */ - -/** - * public - * - * Used to open and update UIs. - * If this proc is not implemented properly, the UI will not update correctly. - * - * required user mob The mob who opened/is using the UI. - * optional ui datum/tgui The UI to be updated, if it exists. - * - *! ## To-Be-Deprecated. - * optional parent_ui datum/tgui A parent UI that, when closed, closes this UI as well. - */ -/datum/proc/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) - return FALSE // Not implemented. - -/** - * public - * - * Data to be sent to the UI. - * This must be implemented for a UI to work. - * - * required user mob The mob interacting with the UI. - * - * return list Data to be sent to the UI. - */ -/datum/proc/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) - return list() // Not implemented. - -/** - * public - * - * Static Data to be sent to the UI. - * - * Static data differs from normal data in that it's large data that should be - * sent infrequently. This is implemented optionally for heavy uis that would - * be sending a lot of redundant data frequently. Gets squished into one - * object on the frontend side, but the static part is cached. - * - * required user mob The mob interacting with the UI. - * - * return list Statuic Data to be sent to the UI. - */ -/datum/proc/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) - return list() - -/** - * public - * - * Forces an update to regular UI data. - * - * If no user is provided, every user will be updated. - * - * @params - * * user - (optional) the mob to update - * * ui - (optional) the /datum/tgui to update - */ -/datum/proc/update_ui_data(mob/user, datum/tgui/ui) - if(isnull(user)) - SStgui.update_uis(src) - else - SStgui.try_update_ui(user, src, ui) - - -/** - * public - * - * Forces an update on static data. Should be done manually whenever something - * happens to change static data. - * - * If no user is provided, every user will be updated. - * - * optional user the mob currently interacting with the ui - * optional ui tgui to be updated - * optional hard_refreshion use if you need to block the ui from showing if the refresh queues - */ -/datum/proc/update_static_data(mob/user, datum/tgui/ui, hard_refresh) - if(!user) - for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) - window.send_full_update(hard_refresh = hard_refresh) - return - if(!ui) - ui = SStgui.get_open_ui(user, src) - if(ui) - ui.send_full_update(hard_refresh = hard_refresh) - -/** - * immediately shunts this data to either an user, an ui, or all users. - * - * @params - * * user - when specified, only pushes this user. else, pushes to all windows. - * * ui - when specified, only pushes this ui for a given user. - * * updates - list(id = list(data...), ...) for modules. the reducer on tgui-side will only overwrite provided data keys. - */ -/datum/proc/push_ui_data(mob/user, datum/tgui/ui, list/data) - if(!user) - for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) - window.push_data(data) - return - if(!ui) - ui = SStgui.get_open_ui(user, src) - if(ui) - ui.push_data(data) - -/** - * immediately pushes module updates to user, an ui, or all users - * - * @params - * * user - when specified, only pushes this user. else, pushes to all windows. - * * ui - when specified, only pushes this ui for a given user. - * * updates - list(id = list(data...), ...) for modules. the reducer on tgui-side will only overwrite provided data keys. - */ -/datum/proc/push_ui_modules(mob/user, datum/tgui/ui, list/updates) - if(!user) - for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) - window.push_modules(updates) - return - if(!ui) - ui = SStgui.get_open_ui(user, src) - if(ui) - ui.push_modules(updates) - -/** - * public - * - * Called on a UI when the UI receieves a href. - * Think of this as Topic(). - * - * required action string The action/button that has been invoked by the user. - * required params list A list of parameters attached to the button. - * - * return bool If the user's input has been handled and the UI should update. - */ -/datum/proc/ui_act(action, list/params, datum/tgui/ui) - SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL(src, COMSIG_UI_ACT, usr, action, params, ui) - // If UI is not interactive or usr calling Topic is not the UI user, bail. - if(!ui || ui.status != UI_INTERACTIVE) - return TRUE - -/** - * public - * - * Called on an object when a tgui object is being created, allowing you to - * push various assets to tgui, for examples spritesheets. - * - * return list List of asset datums or file paths. - */ -/datum/proc/ui_assets(mob/user) - return list() - -/** - * private - * - * The UI's host object (usually src_object). - * This allows modules/datums to have the UI attached to them, - * and be a part of another object. - */ -/datum/proc/ui_host(mob/user, datum/tgui_module/module) - return src // Default src. - -/** - * private - * - * The UI's state controller to be used for created uis - * This is a proc over a var for memory reasons - */ -/datum/proc/ui_state(mob/user, datum/tgui_module/module) - return GLOB.default_state - -/** - * public - * - * checks if UIs are open - */ -/datum/proc/has_open_ui() - return length(SStgui.open_uis_by_src[REF(src)]) - -/** - * global - * - * Associative list of JSON-encoded shared states that were set by - * tgui clients. - */ -/datum/var/list/tgui_shared_states - -/** - * global - * - * Tracks open UIs for a user. - */ -/mob/var/list/tgui_open_uis = list() - -/** - * global - * - * Tracks open windows for a user. - */ -/client/var/list/tgui_windows = list() - -/** - * global - * - * TRUE if cache was reloaded by tgui dev server at least once. - */ -/client/var/tgui_cache_reloaded = FALSE - -/** - * public - * - * Called on a UI's object when the UI is closed, not to be confused with - * client/verb/uiclose(), which closes the ui window - * - * @params - * * user - closing mob - * * module - (optional) the module it came from, if any - */ -/datum/proc/ui_close(mob/user, datum/tgui_module/module) - SIGNAL_HANDLER - -/** - * public - * - * Called on a UI's object when the UI is transferred from one mob to another. - */ -/datum/proc/on_ui_transfer(mob/old_mob, mob/new_mob, datum/tgui/ui) - return - -/** - * verb - * - * Called by UIs when they are closed. - * Must be a verb so winset() can call it. - * - * required uiref ref The UI that was closed. - */ -/client/verb/uiclose(window_id as text) - // Name the verb, and hide it from the user panel. - set name = "uiclose" - set hidden = TRUE - var/mob/user = src?.mob - if(!user) - return - // Close all tgui datums based on window_id. - SStgui.force_close_window(user, window_id) - -/** - * Middleware for /client/Topic. - * - * return bool If TRUE, prevents propagation of the topic call. - */ -/proc/tgui_Topic(href_list) - // Skip non-tgui topics - if(!href_list["tgui"]) - return FALSE - var/type = href_list["type"] - // Unconditionally collect tgui logs - if(type == "log") - var/context = href_list["window_id"] - if (href_list["ns"]) - context += " ([href_list["ns"]])" - log_tgui(usr, href_list["message"], - context = context) - // Reload all tgui windows - if(type == "cacheReloaded") - log_tgui(usr, context = "debug/reload") - // Mark as reloaded - usr.client.tgui_cache_reloaded = TRUE - // Notify windows - var/list/windows = usr.client.tgui_windows - for(var/window_id in windows) - var/datum/tgui_window/window = windows[window_id] - if (window.status == TGUI_WINDOW_READY) - window.on_message(type, null, href_list) - return TRUE - // Locate window - var/window_id = href_list["window_id"] - var/datum/tgui_window/window - if(window_id) - window = usr.client.tgui_windows[window_id] - if(!window) - log_tgui(usr, - "Error: Couldn't find the window datum, force closing.", - context = window_id) - SStgui.force_close_window(usr, window_id) - return TRUE - // Decode payload - var/payload - if(href_list["payload"]) - payload = json_decode(href_list["payload"]) - // Pass message to window - if(window) - window.on_message(type, payload, href_list) - return TRUE diff --git a/code/modules/tgui/modal_vr_legacy.dm b/code/modules/tgui/legacy/modal_vr_legacy.dm similarity index 100% rename from code/modules/tgui/modal_vr_legacy.dm rename to code/modules/tgui/legacy/modal_vr_legacy.dm diff --git a/code/modules/tgui/mob.dm b/code/modules/tgui/mob.dm new file mode 100644 index 0000000000..9e4113f2b2 --- /dev/null +++ b/code/modules/tgui/mob.dm @@ -0,0 +1,15 @@ +/** + * External tgui definitions, such as src_object APIs. + * + *! Copyright (c) 2020 Aleksej Komarov + *! SPDX-License-Identifier: MIT + */ + +/** + * global + * + * Tracks open UIs for a user. + */ +/mob/var/list/tgui_open_uis = list() + + diff --git a/code/modules/tgui/modals/tgui_alert.dm b/code/modules/tgui/modals/tgui_alert.dm index 449f678045..c39ed6c8a4 100644 --- a/code/modules/tgui/modals/tgui_alert.dm +++ b/code/modules/tgui/modals/tgui_alert.dm @@ -116,14 +116,14 @@ ui = new(user, src, "AlertModal") ui.open() -/datum/tgui_modal/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_modal/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE -/datum/tgui_modal/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_modal/ui_state() return GLOB.always_state -/datum/tgui_modal/ui_static_data(mob/user) +/datum/tgui_modal/ui_static_data(mob/user, datum/tgui/ui) . = list() .["autofocus"] = autofocus .["buttons"] = buttons @@ -132,12 +132,12 @@ .["swapped_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) .["title"] = title -/datum/tgui_modal/ui_data(mob/user) +/datum/tgui_modal/ui_data(mob/user, datum/tgui/ui) . = list() if(timeout) .["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) -/datum/tgui_modal/ui_act(action, list/params) +/datum/tgui_modal/ui_act(action, list/params, datum/tgui/ui) . = ..() if (.) return diff --git a/code/modules/tgui/modals/tgui_dynamic_input.dm b/code/modules/tgui/modals/tgui_dynamic_input.dm index 8fc7338ccc..e58b1b0e7b 100644 --- a/code/modules/tgui/modals/tgui_dynamic_input.dm +++ b/code/modules/tgui/modals/tgui_dynamic_input.dm @@ -173,7 +173,7 @@ closed = TRUE return ..() -/datum/tgui_dynamic_input/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_dynamic_input/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["query"] = query.get_query() .["title"] = title @@ -202,7 +202,7 @@ finish(null) return TRUE -/datum/tgui_dynamic_input/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_dynamic_input/ui_state() return GLOB.always_state /datum/tgui_dynamic_input/proc/block_on_finished() diff --git a/code/modules/tgui/modals/tgui_input_list.dm b/code/modules/tgui/modals/tgui_input_list.dm index 55c10203bd..388359e22c 100644 --- a/code/modules/tgui/modals/tgui_input_list.dm +++ b/code/modules/tgui/modals/tgui_input_list.dm @@ -134,14 +134,14 @@ ui = new(user, src, "ListInputModal") ui.open() -/datum/tgui_list_input/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_list_input/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE -/datum/tgui_list_input/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_list_input/ui_state() return GLOB.always_state -/datum/tgui_list_input/ui_static_data(mob/user) +/datum/tgui_list_input/ui_static_data(mob/user, datum/tgui/ui) . = list() .["init_value"] = default || items[1] .["items"] = items @@ -150,12 +150,12 @@ .["swapped_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) .["title"] = title -/datum/tgui_list_input/ui_data(mob/user) +/datum/tgui_list_input/ui_data(mob/user, datum/tgui/ui) . = list() if(timeout) .["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) -/datum/tgui_list_input/ui_act(action, list/params) +/datum/tgui_list_input/ui_act(action, list/params, datum/tgui/ui) . = ..() if (.) return diff --git a/code/modules/tgui/modals/tgui_input_number.dm b/code/modules/tgui/modals/tgui_input_number.dm index 7e0f1a308b..6e1a052411 100644 --- a/code/modules/tgui/modals/tgui_input_number.dm +++ b/code/modules/tgui/modals/tgui_input_number.dm @@ -136,14 +136,14 @@ ui = new(user, src, "NumberInputModal") ui.open() -/datum/tgui_input_number/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_input_number/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE -/datum/tgui_input_number/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_input_number/ui_state() return GLOB.always_state -/datum/tgui_input_number/ui_static_data(mob/user) +/datum/tgui_input_number/ui_static_data(mob/user, datum/tgui/ui) . = list() .["init_value"] = default // Default is a reserved keyword .["large_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_large) @@ -153,12 +153,12 @@ .["swapped_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) .["title"] = title -/datum/tgui_input_number/ui_data(mob/user) +/datum/tgui_input_number/ui_data(mob/user, datum/tgui/ui) . = list() if(timeout) .["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) -/datum/tgui_input_number/ui_act(action, list/params) +/datum/tgui_input_number/ui_act(action, list/params, datum/tgui/ui) . = ..() if (.) return diff --git a/code/modules/tgui/modals/tgui_input_text.dm b/code/modules/tgui/modals/tgui_input_text.dm index acadc7124b..6e5dc3ef69 100644 --- a/code/modules/tgui/modals/tgui_input_text.dm +++ b/code/modules/tgui/modals/tgui_input_text.dm @@ -158,14 +158,14 @@ ui = new(user, src, "TextInputModal") ui.open() -/datum/tgui_input_text/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_input_text/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE -/datum/tgui_input_text/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_input_text/ui_state() return GLOB.always_state -/datum/tgui_input_text/ui_static_data(mob/user) +/datum/tgui_input_text/ui_static_data(mob/user, datum/tgui/ui) . = list() .["large_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_large) .["max_length"] = max_length @@ -175,12 +175,12 @@ .["swapped_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) .["title"] = title -/datum/tgui_input_text/ui_data(mob/user) +/datum/tgui_input_text/ui_data(mob/user, datum/tgui/ui) . = list() if(timeout) .["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) -/datum/tgui_input_text/ui_act(action, list/params) +/datum/tgui_input_text/ui_act(action, list/params, datum/tgui/ui) . = ..() if (.) return diff --git a/code/modules/tgui/module.dm b/code/modules/tgui/module.dm index 309c79ee2b..6aebc2669e 100644 --- a/code/modules/tgui/module.dm +++ b/code/modules/tgui/module.dm @@ -54,19 +54,18 @@ SIGNAL_HANDLER qdel(src) -/datum/tgui_module/ui_host(mob/user, datum/tgui_module/module) - return isnull(host)? src : host.ui_host(user, src) +/datum/tgui_module/ui_host() + return isnull(host)? src : host.ui_host() -/datum/tgui_module/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() - host?.ui_close(user, src) if(ephemeral) qdel(src) -/datum/tgui_module/ui_state(mob/user, datum/tgui_module/module) - return isnull(host)? ..() : host.ui_state(user, src) +/datum/tgui_module/ui_state() + return isnull(host)? ..() : host.ui_state() -/datum/tgui_module/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_module/ui_status(mob/user, datum/ui_state/state) return isnull(host)? ..() : host.ui_status(user, state, src) /datum/tgui_module/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) @@ -78,21 +77,19 @@ /** * called directly, if operating standalone. routes to static_data(user), with all other args skipped. */ -/datum/tgui_module/ui_static_data(mob/user) +/datum/tgui_module/ui_static_data(mob/user, datum/tgui/ui) return static_data(user) /** * called directly, if operating standalone. routes to data(user), with all other args skipped. */ -/datum/tgui_module/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module/ui_data(mob/user, datum/tgui/ui) return data(user) /** * called directly, if operating standalone. */ /datum/tgui_module/ui_act(action, list/params, datum/tgui/ui) - // we only override this to provide comment - // yes yes proc overhead sue me it's called like 10k times a round, tops. return ..() /** @@ -109,87 +106,3 @@ */ /datum/tgui_module/proc/data(mob/user, ...) return list() - -/** - * route a received ui_act for module handling - * remember that $id, $ref in params corrosponds to module id, module ref. - * - * we use id instead of module to prevent potential security issues down the line. - */ -/datum/proc/ui_module_route(action, list/params, datum/tgui/ui, id) - if(!id) - // no id? - // i know that guy! - // it's me! - return ui_act(action, params, ui) - // it's not us, respect overrides that wish to hook module behavior - if(ui_module_act(action, params, ui, id)) - return TRUE - -/** - * called as a hook for intercepting ui acts from a module - * remember that $id, $ref in params corrosponds to module id, module ref. - * we don't provide $ref directly for security reasons. - * you can use it if you know what you're doing. - * - * this is an advanced proc. - * the module's ui_status() is *not* checked for you in ..()! - * - * return TRUE for ui update + prevent propagation to the module - */ -/datum/proc/ui_module_act(action, list/params, datum/tgui/ui, id) - SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL(src, COMSIG_UI_MODULE_ACT, usr, id, action, params, ui) - -/** - * called to inject ui module data. - * they will be handled by a separate reducer to make static data work. - * you can technically use this for things other than tgui_module's - * for example, for RIG/other "modular items-in-items" to hold data. - * - * this will be sent into data.modules.* instead of just data.* - * - * @params - * * user - user - * * ui - root tgui module is in - * * state - ui state - */ -/datum/proc/ui_module_data(mob/user, datum/tgui/ui, datum/ui_state/state) - return list() - -/** - * called to inject ui module static data. - * they will be handled by a separate reducer to make static data work. - * you can technically use this for things other than tgui_module's - * for example, for RIG/other "modular items-in-items" to hold data. - * - * this will be sent into data.modules[id].* instead of just data.* - * - * @params - * * user - user - * * ui - root tgui module is in - * * state - ui state - */ -/datum/proc/ui_module_static(mob/user, datum/tgui/ui, datum/ui_state/state) - return list() - -/** - * public - * - * Send an update to module data. - * As with normal data, this will be combined by a reducer - * to overwrite only where necessary, so partial pushes - * can work fine. - * - * WARNING: Do not use this unless you know what you are doing. - * - * @params - * * updates - list(id = list(data...), ...) of modules to update. - * * force - (optional) send update even if UI is not interactive - */ -/datum/tgui/proc/push_modules(list/updates, force) - if(isnull(user.client) || !initialized || closing) - return - if(!force && status < UI_UPDATE) - return - window.send_message("modules", updates) diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm index b00a53707b..b428b233b9 100644 --- a/code/modules/tgui/modules/_base.dm +++ b/code/modules/tgui/modules/_base.dm @@ -23,9 +23,9 @@ Code is pretty much ripped verbatim from nano modules, but with un-needed stuff /datum/tgui_module_old/ui_host() return host ? host.ui_host() : src -/datum/tgui_module_old/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/on_ui_close(mob/user, datum/tgui/ui, embedded) if(host) - host.ui_close(user) + host.on_ui_close(user, ui, TRUE) /datum/tgui_module_old/proc/check_eye(mob/user) return -1 @@ -55,14 +55,14 @@ Code is pretty much ripped verbatim from nano modules, but with un-needed stuff return 0 -/datum/tgui_module_old/ui_static_data() +/datum/tgui_module_old/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/obj/item/modular_computer/host = ui_host() if(istype(host)) . += host.get_header_data() -/datum/tgui_module_old/ui_act(action, params) +/datum/tgui_module_old/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/admin_shuttle_controller.dm b/code/modules/tgui/modules/admin_shuttle_controller.dm index aaf1c73ec5..1f542ffe80 100644 --- a/code/modules/tgui/modules/admin_shuttle_controller.dm +++ b/code/modules/tgui/modules/admin_shuttle_controller.dm @@ -4,7 +4,7 @@ name = "Admin Shuttle Controller" tgui_id = "AdminShuttleController" -/datum/tgui_module_old/admin_shuttle_controller/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/admin_shuttle_controller/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/shuttles = list() @@ -29,7 +29,7 @@ return data -/datum/tgui_module_old/admin_shuttle_controller/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/admin_shuttle_controller/ui_state() return GLOB.tgui_admin_state /datum/tgui_module_old/admin_shuttle_controller/ui_act(action, list/params, datum/tgui/ui) diff --git a/code/modules/tgui/modules/agentcard.dm b/code/modules/tgui/modules/agentcard.dm index 7610d9c87c..ca4cf6eb8b 100644 --- a/code/modules/tgui/modules/agentcard.dm +++ b/code/modules/tgui/modules/agentcard.dm @@ -2,7 +2,7 @@ name = "Agent Card" tgui_id = "AgentCard" -/datum/tgui_module_old/agentcard/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/agentcard/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/obj/item/card/id/syndicate/S = ui_host() @@ -26,7 +26,7 @@ return data -/datum/tgui_module_old/agentcard/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_module_old/agentcard/ui_status(mob/user, datum/ui_state/state) var/obj/item/card/id/syndicate/S = ui_host() if(!istype(S)) return UI_CLOSE @@ -46,7 +46,7 @@ . = TRUE if("age") var/new_age = input(usr,"What age would you like to put on this card?","Agent Card Age", S.age) as null|num - if(!isnull(new_age) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_age) && ui?.still_interactive()) if(new_age < 0) S.age = initial(S.age) else @@ -55,14 +55,14 @@ . = TRUE if("appearance") var/datum/card_state/choice = input(usr, "Select the appearance for this card.", "Agent Card Appearance") as null|anything in id_card_states() - if(choice && ui_status(usr, state) == UI_INTERACTIVE) + if(choice && ui?.still_interactive()) S.icon_state = choice.icon_state S.item_state = choice.item_state to_chat(usr, "Appearance changed to [choice].") . = TRUE if("assignment") var/new_job = sanitize(input(usr,"What assignment would you like to put on this card?\nChanging assignment will not grant or remove any access levels.","Agent Card Assignment", S.assignment) as null|text) - if(!isnull(new_job) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_job) && ui?.still_interactive()) S.assignment = new_job to_chat(usr, "Occupation changed to '[new_job]'.") S.update_name() @@ -74,7 +74,7 @@ if(H.dna) default = H.dna.b_type var/new_blood_type = sanitize(input(usr,"What blood type would you like to be written on this card?","Agent Card Blood Type",default) as null|text) - if(!isnull(new_blood_type) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_blood_type) && ui?.still_interactive()) S.blood_type = new_blood_type to_chat(usr, "Blood type changed to '[new_blood_type]'.") . = TRUE @@ -85,7 +85,7 @@ if(H.dna) default = H.dna.unique_enzymes var/new_dna_hash = sanitize(input(usr,"What DNA hash would you like to be written on this card?","Agent Card DNA Hash",default) as null|text) - if(!isnull(new_dna_hash) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_dna_hash) && ui?.still_interactive()) S.dna_hash = new_dna_hash to_chat(usr, "DNA hash changed to '[new_dna_hash]'.") . = TRUE @@ -96,13 +96,13 @@ if(H.dna) default = md5(H.dna.uni_identity) var/new_fingerprint_hash = sanitize(input(usr,"What fingerprint hash would you like to be written on this card?","Agent Card Fingerprint Hash",default) as null|text) - if(!isnull(new_fingerprint_hash) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_fingerprint_hash) && ui?.still_interactive()) S.fingerprint_hash = new_fingerprint_hash to_chat(usr, "Fingerprint hash changed to '[new_fingerprint_hash]'.") . = TRUE if("name") var/new_name = sanitizeName(input(usr,"What name would you like to put on this card?","Agent Card Name", S.registered_name) as null|text) - if(!isnull(new_name) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_name) && ui?.still_interactive()) S.registered_name = new_name S.update_name() to_chat(usr, "Name changed to '[new_name]'.") @@ -113,12 +113,12 @@ . = TRUE if("sex") var/new_sex = sanitize(input(usr,"What sex would you like to put on this card?","Agent Card Sex", S.sex) as null|text) - if(!isnull(new_sex) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_sex) && ui?.still_interactive()) S.sex = new_sex to_chat(usr, "Sex changed to '[new_sex]'.") . = TRUE if("factoryreset") - if(alert("This will factory reset the card, including access and owner. Continue?", "Factory Reset", "No", "Yes") == "Yes" && ui_status(usr, state) == UI_INTERACTIVE) + if(alert("This will factory reset the card, including access and owner. Continue?", "Factory Reset", "No", "Yes") == "Yes" && ui?.still_interactive()) S.age = initial(S.age) S.access = syndicate_access.Copy() S.assignment = initial(S.assignment) diff --git a/code/modules/tgui/modules/alarm.dm b/code/modules/tgui/modules/alarm.dm index f2d98da5b7..b3f389eb79 100644 --- a/code/modules/tgui/modules/alarm.dm +++ b/code/modules/tgui/modules/alarm.dm @@ -17,11 +17,11 @@ // Subtype for glasses_state /datum/tgui_module_old/alarm_monitor/all/glasses -/datum/tgui_module_old/alarm_monitor/all/glasses/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/all/glasses/ui_state() return GLOB.glasses_state /datum/tgui_module_old/alarm_monitor/all/robot -/datum/tgui_module_old/alarm_monitor/all/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/all/robot/ui_state() return GLOB.self_state /datum/tgui_module_old/alarm_monitor/engineering @@ -31,12 +31,12 @@ // Subtype for glasses_state /datum/tgui_module_old/alarm_monitor/engineering/glasses -/datum/tgui_module_old/alarm_monitor/engineering/glasses/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/engineering/glasses/ui_state() return GLOB.glasses_state // Subtype for nif_state /datum/tgui_module_old/alarm_monitor/engineering/nif -/datum/tgui_module_old/alarm_monitor/engineering/nif/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/engineering/nif/ui_state() return GLOB.nif_state // Subtype for NTOS @@ -50,7 +50,7 @@ // Subtype for glasses_state /datum/tgui_module_old/alarm_monitor/security/glasses -/datum/tgui_module_old/alarm_monitor/security/glasses/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/security/glasses/ui_state() return GLOB.glasses_state // Subtype for NTOS @@ -97,7 +97,7 @@ return all_alarms -/datum/tgui_module_old/alarm_monitor/ui_act(action, params) +/datum/tgui_module_old/alarm_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -115,7 +115,7 @@ usr.switch_to_camera(C) return 1 -/datum/tgui_module_old/alarm_monitor/ui_data(mob/user) +/datum/tgui_module_old/alarm_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/categories[0] diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm index d0e1ee1aaf..3fe3b57b09 100644 --- a/code/modules/tgui/modules/appearance_changer.dm +++ b/code/modules/tgui/modules/appearance_changer.dm @@ -299,7 +299,7 @@ if(custom_state) ui.set_state(custom_state) -/datum/tgui_module_old/appearance_changer/ui_static_data(mob/user) +/datum/tgui_module_old/appearance_changer/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() generate_data(usr) @@ -327,7 +327,7 @@ return data -/datum/tgui_module_old/appearance_changer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/appearance_changer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() generate_data(user) @@ -390,7 +390,7 @@ data["facial_hair_color"] = rgb(target.r_facial, target.g_facial, target.b_facial) return data -/datum/tgui_module_old/appearance_changer/ui_static_data(mob/user) +/datum/tgui_module_old/appearance_changer/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() data["mapRef"] = map_name return data diff --git a/code/modules/tgui/modules/appearance_changer_vr.dm b/code/modules/tgui/modules/appearance_changer_vr.dm index dcfe37cdc9..e6e78817b8 100644 --- a/code/modules/tgui/modules/appearance_changer_vr.dm +++ b/code/modules/tgui/modules/appearance_changer_vr.dm @@ -2,10 +2,10 @@ name = "Appearance Editor (Vore)" flags = APPEARANCE_ALL -/datum/tgui_module_old/appearance_changer/vore/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/appearance_changer/vore/ui_state() return GLOB.tgui_conscious_state -/datum/tgui_module_old/appearance_changer/vore/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_module_old/appearance_changer/vore/ui_status(mob/user, datum/ui_state/state) if(!isbelly(owner.loc)) return UI_CLOSE return ..() @@ -16,7 +16,7 @@ cam_background.fill_rect(1, 1, 1, 1) local_skybox.cut_overlays() -/datum/tgui_module_old/appearance_changer/vore/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/appearance_changer/vore/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() QDEL_IN(src, 1) diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm index 8ad661055a..cb3685a6ea 100644 --- a/code/modules/tgui/modules/atmos_control.dm +++ b/code/modules/tgui/modules/atmos_control.dm @@ -18,7 +18,7 @@ // machines may not yet be ordered at this point monitored_alarms = dd_sortedObjectList(monitored_alarms) -/datum/tgui_module_old/atmos_control/ui_act(action, params, datum/tgui/ui) +/datum/tgui_module_old/atmos_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -45,7 +45,7 @@ ui.open() ui_ref = ui -/datum/tgui_module_old/atmos_control/ui_static_data(mob/user) +/datum/tgui_module_old/atmos_control/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/z = get_z(user) @@ -67,7 +67,7 @@ "z" = alarm.z) .["alarms"] = alarms -/datum/tgui_module_old/atmos_control/ui_data(mob/user) +/datum/tgui_module_old/atmos_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/z = get_z(user) @@ -76,7 +76,7 @@ return data -/datum/tgui_module_old/atmos_control/ui_close() +/datum/tgui_module_old/atmos_control/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() ui_ref = null @@ -110,5 +110,5 @@ ntos = TRUE /datum/tgui_module_old/atmos_control/robot -/datum/tgui_module_old/atmos_control/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/atmos_control/robot/ui_state() return GLOB.self_state diff --git a/code/modules/tgui/modules/camera.dm b/code/modules/tgui/modules/camera.dm index 7ea016037a..0c17cfd2a7 100644 --- a/code/modules/tgui/modules/camera.dm +++ b/code/modules/tgui/modules/camera.dm @@ -102,7 +102,7 @@ ui = new(user, src, tgui_id, name) ui.open() -/datum/tgui_module_old/camera/ui_data() +/datum/tgui_module_old/camera/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["activeCamera"] = null if(active_camera) @@ -112,7 +112,7 @@ ) return data -/datum/tgui_module_old/camera/ui_static_data(mob/user) +/datum/tgui_module_old/camera/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() data["mapRef"] = map_name var/list/cameras = get_available_cameras(user) @@ -127,7 +127,7 @@ data["allNetworks"] |= C.network return data -/datum/tgui_module_old/camera/ui_act(action, params) +/datum/tgui_module_old/camera/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -260,7 +260,7 @@ cam_background.icon_state = "scanline2" cam_background.fill_rect(1, 1, default_map_size, default_map_size) -/datum/tgui_module_old/camera/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/camera/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() var/user_ref = REF(user) var/is_living = isliving(user) diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm index 475a72c579..4ccf0ff79f 100644 --- a/code/modules/tgui/modules/communications.dm +++ b/code/modules/tgui/modules/communications.dm @@ -84,7 +84,7 @@ feedback_inc("alert_comms_blue",1) tmp_alertlevel = 0 -/datum/tgui_module_old/communications/ui_data(mob/user) +/datum/tgui_module_old/communications/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["is_ai"] = isAI(user) || isrobot(user) data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state @@ -194,7 +194,7 @@ frequency.post_signal(null, status_signal) -/datum/tgui_module_old/communications/ui_act(action, params) +/datum/tgui_module_old/communications/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if((LEGACY_MAP_DATUM) && !(get_z(usr) in (LEGACY_MAP_DATUM).contact_levels)) diff --git a/code/modules/tgui/modules/crew_manifest.dm b/code/modules/tgui/modules/crew_manifest.dm index 93c60f980e..311036a3d0 100644 --- a/code/modules/tgui/modules/crew_manifest.dm +++ b/code/modules/tgui/modules/crew_manifest.dm @@ -2,7 +2,7 @@ name = "Crew Manifest" tgui_id = "CrewManifest" -/datum/tgui_module_old/crew_manifest/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/crew_manifest/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(data_core) data_core.get_manifest_list() @@ -10,5 +10,5 @@ return data /datum/tgui_module_old/crew_manifest/robot -/datum/tgui_module_old/crew_manifest/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/crew_manifest/robot/ui_state() return GLOB.self_state diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index 7bdde5185b..c7877af28a 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -7,7 +7,7 @@ get_asset_datum(/datum/asset/simple/nanomaps), ) -/datum/tgui_module_old/crew_monitor/ui_act(action, params, datum/tgui/ui) +/datum/tgui_module_old/crew_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -45,7 +45,7 @@ ui.open() -/datum/tgui_module_old/crew_monitor/ui_data(mob/user) +/datum/tgui_module_old/crew_monitor/ui_data(mob/user, datum/tgui/ui) var/data[0] data["isAI"] = isAI(user) @@ -71,15 +71,15 @@ // Subtype for glasses_state /datum/tgui_module_old/crew_monitor/glasses -/datum/tgui_module_old/crew_monitor/glasses/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/crew_monitor/glasses/ui_state() return GLOB.glasses_state // Subtype for self_state /datum/tgui_module_old/crew_monitor/robot -/datum/tgui_module_old/crew_monitor/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/crew_monitor/robot/ui_state() return GLOB.self_state // Subtype for nif_state /datum/tgui_module_old/crew_monitor/nif -/datum/tgui_module_old/crew_monitor/nif/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/crew_monitor/nif/ui_state() return GLOB.nif_state diff --git a/code/modules/tgui/modules/general/cardmod.dm b/code/modules/tgui/modules/general/cardmod.dm index 8159736558..579cc6a645 100644 --- a/code/modules/tgui/modules/general/cardmod.dm +++ b/code/modules/tgui/modules/general/cardmod.dm @@ -432,7 +432,7 @@ */ /datum/tgui_module/card_mod/admin -/datum/tgui_module/card_mod/admin/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module/card_mod/admin/ui_state() return GLOB.admin_state diff --git a/code/modules/tgui/modules/gyrotron_control.dm b/code/modules/tgui/modules/gyrotron_control.dm index ed6134e02b..8b5fdf5af1 100644 --- a/code/modules/tgui/modules/gyrotron_control.dm +++ b/code/modules/tgui/modules/gyrotron_control.dm @@ -5,7 +5,7 @@ var/gyro_tag = "" var/scan_range = 25 -/datum/tgui_module_old/gyrotron_control/ui_act(action, params) +/datum/tgui_module_old/gyrotron_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -43,7 +43,7 @@ G.rate = new_delay return TRUE -/datum/tgui_module_old/gyrotron_control/ui_data(mob/user) +/datum/tgui_module_old/gyrotron_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/gyros = list() diff --git a/code/modules/tgui/modules/law_manager.dm b/code/modules/tgui/modules/law_manager.dm index f191650502..6185b8fb79 100644 --- a/code/modules/tgui/modules/law_manager.dm +++ b/code/modules/tgui/modules/law_manager.dm @@ -145,7 +145,7 @@ owner.lawsync() return ..() // 800, is_malf(user) ? 600 : 400 -/datum/tgui_module_old/law_manager/ui_data(mob/user) +/datum/tgui_module_old/law_manager/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["ion_law_nr"] = ionnum() @@ -216,9 +216,9 @@ log_and_message_admins("has syncronized [AI]'s laws with its borgs.") /datum/tgui_module_old/law_manager/robot -/datum/tgui_module_old/law_manager/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/law_manager/robot/ui_state() return GLOB.tgui_self_state /datum/tgui_module_old/law_manager/admin -/datum/tgui_module_old/law_manager/admin/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/law_manager/admin/ui_state() return GLOB.tgui_admin_state diff --git a/code/modules/tgui/modules/ntos-only/configurator.dm b/code/modules/tgui/modules/ntos-only/configurator.dm index fe977f4cc4..8397c3bde8 100644 --- a/code/modules/tgui/modules/ntos-only/configurator.dm +++ b/code/modules/tgui/modules/ntos-only/configurator.dm @@ -4,7 +4,7 @@ tgui_id = "Configuration" var/obj/item/modular_computer/movable = null -/datum/tgui_module_old/computer_configurator/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/computer_configurator/ui_data(mob/user, datum/tgui/ui) movable = ui_host() // No computer connection, we can't get data from that. if(!istype(movable)) @@ -37,7 +37,7 @@ data["hardware"] = all_entries return data -/datum/tgui_module_old/computer_configurator/ui_act(action, params) +/datum/tgui_module_old/computer_configurator/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) diff --git a/code/modules/tgui/modules/ntos-only/email.dm b/code/modules/tgui/modules/ntos-only/email.dm index 9ebabf6e78..ad1f1e14d2 100644 --- a/code/modules/tgui/modules/ntos-only/email.dm +++ b/code/modules/tgui/modules/ntos-only/email.dm @@ -67,7 +67,7 @@ last_message_count = 0 read_message_count = 0 -/datum/tgui_module_old/email_client/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/email_client/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() // Password has been changed by other client connected to this email account @@ -228,7 +228,7 @@ return 1 -/datum/tgui_module_old/email_client/ui_act(action, params) +/datum/tgui_module_old/email_client/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm index 469a95e7e4..e216f4cece 100644 --- a/code/modules/tgui/modules/ntos-only/uav.dm +++ b/code/modules/tgui/modules/ntos-only/uav.dm @@ -8,7 +8,7 @@ var/list/viewers //Who's viewing a UAV through us var/adhoc_range = 30 //How far we can operate on a UAV without NTnet -/datum/tgui_module_old/uav/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/uav/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(current_uav) @@ -180,7 +180,7 @@ unlook(M) . = ..() -/datum/tgui_module_old/uav/ui_status(mob/user) +/datum/tgui_module_old/uav/ui_status(mob/user, datum/ui_state/state) . = ..() if(. > UI_DISABLED) if(viewing_uav(user)) @@ -188,7 +188,7 @@ return unlook(user) -/datum/tgui_module_old/uav/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/uav/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() unlook(user) diff --git a/code/modules/tgui/modules/overmap.dm b/code/modules/tgui/modules/overmap.dm index 6b10383615..0797e416d5 100644 --- a/code/modules/tgui/modules/overmap.dm +++ b/code/modules/tgui/modules/overmap.dm @@ -17,7 +17,7 @@ unlook(M) . = ..() -/datum/tgui_module_old/ship/ui_status(mob/user) +/datum/tgui_module_old/ship/ui_status(mob/user, datum/ui_state/state) . = ..() if(. > UI_DISABLED) if(viewing_overmap(user)) @@ -25,7 +25,7 @@ return unlook(user) -/datum/tgui_module_old/ship/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/ship/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() user.unset_machine() unlook(user) @@ -102,7 +102,7 @@ . = ..() -/datum/tgui_module_old/ship/nav/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/ship/nav/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/turf/T = get_turf(linked) @@ -124,7 +124,7 @@ return data -/datum/tgui_module_old/ship/nav/ui_act(action, params) +/datum/tgui_module_old/ship/nav/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -153,7 +153,7 @@ // SENSORS var/obj/machinery/shipsensors/sensors -/datum/tgui_module_old/ship/fullmonty/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/ship/fullmonty/ui_state() return GLOB.admin_state /datum/tgui_module_old/ship/fullmonty/New(host, obj/overmap/entity/visitable/ship/new_linked) @@ -178,7 +178,7 @@ break // Beware ye eyes. This holds all of the data from helm, engine, and sensor control all at once. -/datum/tgui_module_old/ship/fullmonty/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/ship/fullmonty/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() // HELM @@ -294,7 +294,7 @@ return data // Beware ye eyes. This holds all of the ACTIONS from helm, engine, and sensor control all at once. -/datum/tgui_module_old/ship/fullmonty/ui_act(action, params) +/datum/tgui_module_old/ship/fullmonty/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/power_monitor.dm b/code/modules/tgui/modules/power_monitor.dm index 4873addbd5..88f1be5ae0 100644 --- a/code/modules/tgui/modules/power_monitor.dm +++ b/code/modules/tgui/modules/power_monitor.dm @@ -8,7 +8,7 @@ . = ..() refresh_sensors() -/datum/tgui_module_old/power_monitor/ui_data(mob/user) +/datum/tgui_module_old/power_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/sensors = list() @@ -37,7 +37,7 @@ return data -/datum/tgui_module_old/power_monitor/ui_act(action, params) +/datum/tgui_module_old/power_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -81,5 +81,5 @@ // Subtype for self_state /datum/tgui_module_old/power_monitor/robot -/datum/tgui_module_old/power_monitor/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/power_monitor/robot/ui_state() return GLOB.self_state diff --git a/code/modules/tgui/modules/rcon.dm b/code/modules/tgui/modules/rcon.dm index 5e59aec524..319d440a38 100644 --- a/code/modules/tgui/modules/rcon.dm +++ b/code/modules/tgui/modules/rcon.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(tgui_old_rcon_modules) GLOB.tgui_old_rcon_modules -= src -/datum/tgui_module_old/rcon/ui_data(mob/user) +/datum/tgui_module_old/rcon/ui_data(mob/user, datum/tgui/ui) FindDevices() // Update our devices list var/list/data = ..() @@ -40,7 +40,7 @@ GLOBAL_LIST_EMPTY(tgui_old_rcon_modules) return data -/datum/tgui_module_old/rcon/ui_act(action, params) +/datum/tgui_module_old/rcon/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -119,5 +119,5 @@ GLOBAL_LIST_EMPTY(tgui_old_rcon_modules) ntos = TRUE /datum/tgui_module_old/rcon/robot -/datum/tgui_module_old/rcon/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/rcon/robot/ui_state() return GLOB.self_state diff --git a/code/modules/tgui/modules/rustcore_monitor.dm b/code/modules/tgui/modules/rustcore_monitor.dm index 0b8ddee4e9..c693b3b567 100644 --- a/code/modules/tgui/modules/rustcore_monitor.dm +++ b/code/modules/tgui/modules/rustcore_monitor.dm @@ -4,7 +4,7 @@ var/core_tag = "" -/datum/tgui_module_old/rustcore_monitor/ui_act(action, params) +/datum/tgui_module_old/rustcore_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -35,7 +35,7 @@ C.target_field_strength = new_strength return TRUE -/datum/tgui_module_old/rustcore_monitor/ui_data(mob/user) +/datum/tgui_module_old/rustcore_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/cores = list() diff --git a/code/modules/tgui/modules/rustfuel_control.dm b/code/modules/tgui/modules/rustfuel_control.dm index 43eb928c47..6caed63dda 100644 --- a/code/modules/tgui/modules/rustfuel_control.dm +++ b/code/modules/tgui/modules/rustfuel_control.dm @@ -4,7 +4,7 @@ var/fuel_tag = "" -/datum/tgui_module_old/rustfuel_control/ui_act(action, params) +/datum/tgui_module_old/rustfuel_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -26,7 +26,7 @@ if(new_ident) fuel_tag = new_ident -/datum/tgui_module_old/rustfuel_control/ui_data(mob/user) +/datum/tgui_module_old/rustfuel_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/fuels = list() diff --git a/code/modules/tgui/modules/shutoff_monitor.dm b/code/modules/tgui/modules/shutoff_monitor.dm index 78db2be14d..ca557c0cd3 100644 --- a/code/modules/tgui/modules/shutoff_monitor.dm +++ b/code/modules/tgui/modules/shutoff_monitor.dm @@ -2,7 +2,7 @@ name = "Shutoff Valve Monitoring" tgui_id = "ShutoffMonitor" -/datum/tgui_module_old/shutoff_monitor/ui_act(action, params) +/datum/tgui_module_old/shutoff_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -24,7 +24,7 @@ S.open() return TRUE -/datum/tgui_module_old/shutoff_monitor/ui_data(mob/user) +/datum/tgui_module_old/shutoff_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/valves = list() diff --git a/code/modules/tgui/modules/supermatter_monitor.dm b/code/modules/tgui/modules/supermatter_monitor.dm index 43df17079f..bc7d11c676 100644 --- a/code/modules/tgui/modules/supermatter_monitor.dm +++ b/code/modules/tgui/modules/supermatter_monitor.dm @@ -35,7 +35,7 @@ for(var/obj/machinery/power/supermatter/S in supermatters) . = max(., S.get_status()) -/datum/tgui_module_old/supermatter_monitor/ui_data(mob/user) +/datum/tgui_module_old/supermatter_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(istype(active)) @@ -88,7 +88,7 @@ return data -/datum/tgui_module_old/supermatter_monitor/ui_act(action, params) +/datum/tgui_module_old/supermatter_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/teleporter.dm b/code/modules/tgui/modules/teleporter.dm index 67e8574dc8..fb25939868 100644 --- a/code/modules/tgui/modules/teleporter.dm +++ b/code/modules/tgui/modules/teleporter.dm @@ -6,7 +6,7 @@ var/obj/machinery/tele_projector/station = null var/obj/machinery/tele_pad/hub = null -/datum/tgui_module_old/teleport_control/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/teleport_control/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["locked_name"] = locked_name || "No Target" @@ -17,7 +17,7 @@ return data -/datum/tgui_module_old/teleport_control/ui_act(action, params, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/teleport_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index 7d927e799f..4bd764aed5 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -6,37 +6,6 @@ *! SPDX-License-Identifier: MIT */ -/** - * public - * - * Checks the UI state for a mob. - * - * required user mob The mob who opened/is using the UI. - * required state datum/ui_state The state to check. - * - * return UI_state The state of the UI. - */ -/datum/proc/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) - var/src_object = ui_host(user) - . = UI_CLOSE - if(!state) - return - - if(isobserver(user)) - // If they turn on ghost AI control, admins can always interact. - if(IsAdminGhost(user)) - . = max(., UI_INTERACTIVE) - - // Regular ghosts can always at least view if in range. - if(user.client) - // todo: in view range for zooming - if(get_dist(src_object, user) < max(CEILING(user.client.current_viewport_width / 2, 1), CEILING(user.client.current_viewport_height / 2, 1))) - . = max(., UI_UPDATE) - - // Check if the state allows interaction - var/result = state.can_use_topic(src_object, user) - . = max(., result) - /** * private * diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 19c6f57db7..8e806bb64c 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -38,10 +38,18 @@ /// Are byond mouse events beyond the window passed in to the ui var/mouse_hooked = FALSE /// The Parent UI + //? STOP USING THIS. USE MODULES. ~SILICONS var/datum/tgui/parent_ui /// Children of this UI + //? STOP USING THIS. USE MODULES. ~SILICONS var/list/children = list() + //* Modules *// + /// datums to IDs + var/list/datum/modules_registered + /// processed modules + var/list/datum/modules_processed + /** * public * @@ -73,6 +81,8 @@ /datum/tgui/Destroy() user = null src_object = null + for(var/datum/module in modules_registered) + unregister_module(module) return ..() /** @@ -125,6 +135,10 @@ if(mouse_hooked) window.set_mouse_macro() SStgui.on_open(src) + // todo: should these hooks be here? + src_object.on_ui_open(user, src) + for(var/datum/module as anything in modules_registered) + module.on_ui_open(user, src, TRUE) return TRUE /** @@ -146,12 +160,15 @@ // the error message properly. window.release_lock() window.close(can_be_suspended) - src_object.ui_close(user) SStgui.on_close(src) state = null if(parent_ui) parent_ui.children -= src parent_ui = null + // todo: should these hooks be here? + src_object.on_ui_close(user, src) + for(var/datum/module as anything in modules_registered) + module.on_ui_close(user, src, TRUE) qdel(src) /** @@ -169,6 +186,8 @@ * * Enable/disable passing through byond mouse events to the window * + * todo: this is like the least documented proc in history wtf + * * required value bool Enable/disable hooking. */ /datum/tgui/proc/set_mouse_hook(value) @@ -240,24 +259,6 @@ with_data = should_update_data, )) -/** - * public - * - * Send a partial update to the client of only the provided data lists - * Does not update config at all - * - * WARNING: Do not use this unless you know what you are doing - * - * required data The data to send - * optional force bool Send an update even if UI is not interactive. - */ -/datum/tgui/proc/push_data(data, force) - if(!user.client || !initialized || closing) - return - if(!force && status < UI_UPDATE) - return - window.send_message("data", data) - /** * private * @@ -287,14 +288,18 @@ "observer" = isobserver(user), ), ) - var/list/modules + var/list/modules = list() // static first if(with_static_data) json_data["static"] = src_object.ui_static_data(user, src, state) - modules = src_object.ui_module_static(user, src, state) + for(var/datum/module as anything in modules_registered) + var/id = modules_registered[module] + modules[id] = module.ui_static_data(user, src, TRUE) if(with_data) json_data["data"] = src_object.ui_data(user, src, state) - modules = (modules || list()) | src_object.ui_module_data(user, src, state) + for(var/datum/module as anything in (with_static_data? modules_registered : modules_processed)) + var/id = modules_registered[module] + modules[id] = modules[id] | module.ui_data(user, src, TRUE) if(modules) json_data["modules"] = modules if(src_object.tgui_shared_states) @@ -383,7 +388,7 @@ // we're kind of stuck doing this // maybe in the future we'll just have ui modules list but for now // eh. - if(src_object.ui_module_route(action, payload, src, id)) + if(src_object.ui_route(action, payload, src, id)) SStgui.update_uis(src_object) return FALSE switch(type) @@ -407,3 +412,100 @@ LAZYINITLIST(src_object.tgui_shared_states) src_object.tgui_shared_states[href_list["key"]] = href_list["value"] SStgui.update_uis(src_object) + +//* Advanced API - Updates *// + +/** + * public + * + * Send a partial update to the client of only the provided data lists + * Does not update config at all + * + * WARNING: Do not use this unless you know what you are doing + * + * required data The data to send + * optional force bool Send an update even if UI is not interactive. + */ +/datum/tgui/proc/push_data(data, force) + if(!user.client || !initialized || closing) + return + if(!force && status < UI_UPDATE) + return + window.send_message("data", data) + +/** + * public + * + * Send an update to module data. + * As with normal data, this will be combined by a reducer + * to overwrite only where necessary, so partial pushes + * can work fine. + * + * WARNING: Do not use this unless you know what you are doing. + * + * @params + * * updates - list(id = list(data...), ...) of modules to update. + * * force - (optional) send update even if UI is not interactive + */ +/datum/tgui/proc/push_modules(list/updates, force) + if(isnull(user.client) || !initialized || closing) + return + if(!force && status < UI_UPDATE) + return + window.send_message("modules", updates) + +//* Module System *// + +/** + * Registers a datum as a module into this UI. + * + * @params + * * module - the module in question + * * id - the id to use for the module + * * interface - the interface identifier (e.g. TGUILatheContrrol) + * * process - should this be a processed / auto updated module? + */ +/datum/tgui/proc/register_module(datum/module, id, interface, process = TRUE) + if(isnull(interface) && istype(module, /datum/tgui_module)) + var/datum/tgui_module/actual_module = module + interface = actual_module.tgui_id + LAZYINITLIST(modules_registered) + modules_registered[module] = id + if(process) + LAZYINITLIST(modules_processed) + modules_processed += module + RegisterSignal(module, COMSIG_PARENT_QDELETING, PROC_REF(module_deleted)) + RegisterSignal(module, COMSIG_DATUM_PUSH_UI_DATA, PROC_REF(module_send_data)) + +/datum/tgui/proc/unregister_module(datum/module) + modules_processed -= module + modules_registered -= module + UnregisterSignal(module, list( + COMSIG_PARENT_QDELETING, + COMSIG_DATUM_PUSH_UI_DATA, + )) + +/datum/tgui/proc/module_deleted(datum/source) + SIGNAL_HANDLER + unregister_module(source) + +/datum/tgui/proc/module_send_data(datum/source, mob/user, datum/tgui/ui, list/data) + if(!isnull(user) && user != user) + return + if(!isnull(ui) && ui != src) + return + // todo: this is force because otherwise static data can be desynced. should static data be on another proc instead? + push_modules( + updates = list( + (modules_registered[source]) = data, + ), + force = TRUE, + ) + +//* Helpers - Invoked from ui_act() *// + +/** + * Lazy check to see if the host window is still interactive. + */ +/datum/tgui/proc/still_interactive() + return status == UI_INTERACTIVE diff --git a/code/modules/turbolift/turbolift_door.dm b/code/modules/turbolift/turbolift_door.dm index 31fa7de02f..e012229484 100644 --- a/code/modules/turbolift/turbolift_door.dm +++ b/code/modules/turbolift/turbolift_door.dm @@ -8,10 +8,8 @@ glass = 1 autoset_dir = FALSE icon = 'icons/obj/doors/elevator/door.dmi' - fill_file = 'icons/obj/doors/elevator/fill_steel.dmi' - glass_file = 'icons/obj/doors/elevator/fill_glass.dmi' + fill_file = 'icons/obj/doors/elevator/fill_glass.dmi' bolts_file = 'icons/obj/doors/elevator/lights_bolts.dmi' - deny_file = 'icons/obj/doors/elevator/lights_deny.dmi' lights_file = 'icons/obj/doors/elevator/lights_green.dmi' var/datum/turbolift/lift diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index 28dc4a09f6..b9995571d4 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -200,6 +200,7 @@ qdel(thing) if(checking.type == floor_type) // Don't build over empty space on lower levels. var/obj/machinery/door/airlock/lift/newdoor = new door_type(checking) + newdoor.setDir(got_rotated_by_maploader ? got_rotated_by_maploader : dir) if(internal) lift.doors += newdoor newdoor.lift = cfloor diff --git a/code/modules/unit_tests/core/priority_queue.dm b/code/modules/unit_tests/core/priority_queue.dm index 28e0339f0c..83d4a3eca6 100644 --- a/code/modules/unit_tests/core/priority_queue.dm +++ b/code/modules/unit_tests/core/priority_queue.dm @@ -3,9 +3,9 @@ for(var/i in 1 to 1000) queue.enqueue(rand(1, 100000)) var/last = queue.dequeue() - while(length(queue.queue)) + while(length(queue.array)) var/next = queue.dequeue() if(next < last) - TEST_FAIL("Priority queue out of order. next [next] last [last] queue [json_encode(queue.queue)]") + TEST_FAIL("Priority queue out of order. next [next] last [last] queue [json_encode(queue.array)]") return last = next diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 82f17e817c..b4e5a22b77 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -132,13 +132,13 @@ var/list/ventcrawl_machinery = list( if(vent_found.air_contents && !issilicon(src)) switch(vent_found.air_contents.temperature) - if(0 to BODYTEMP_COLD_DAMAGE_LIMIT) + if(0 to LEGACY_BODYTEMP_COLD_DAMAGE_THRESHOLD) to_chat(src, "You feel a painful freeze coming from the vent!") - if(BODYTEMP_COLD_DAMAGE_LIMIT to T0C) + if(LEGACY_BODYTEMP_COLD_DAMAGE_THRESHOLD to T0C) to_chat(src, "You feel an icy chill coming from the vent.") - if(T0C + 40 to BODYTEMP_HEAT_DAMAGE_LIMIT) + if(T0C + 40 to LEGACY_BODYTEMP_HEAT_DAMAGE_THRESHOLD) to_chat(src, "You feel a hot wash coming from the vent.") - if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY) + if(LEGACY_BODYTEMP_HEAT_DAMAGE_THRESHOLD to INFINITY) to_chat(src, "You feel a searing heat coming from the vent!") switch(vent_found.air_contents.return_pressure()) diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index a5b13f61c3..ffe41f72a5 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -42,7 +42,7 @@ ui = new(user, src, "IsolationCentrifuge", name) ui.open() -/obj/machinery/computer/centrifuge/ui_data(mob/user) +/obj/machinery/computer/centrifuge/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["antibodies"] = null data["pathogens"] = list() @@ -90,7 +90,7 @@ if(isolating == 0) isolate() -/obj/machinery/computer/centrifuge/ui_act(action, params) +/obj/machinery/computer/centrifuge/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index 4541157455..b2a1e2ef5d 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -49,7 +49,7 @@ ui = new(user, src, "DiseaseSplicer", name) ui.open() -/obj/machinery/computer/diseasesplicer/ui_data(mob/user) +/obj/machinery/computer/diseasesplicer/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["dish_inserted"] = !!dish diff --git a/code/modules/virus2/immunesystem.dm b/code/modules/virus2/immunesystem.dm index d7adc81620..87b7b94882 100644 --- a/code/modules/virus2/immunesystem.dm +++ b/code/modules/virus2/immunesystem.dm @@ -78,7 +78,7 @@ /datum/immune_system/proc/Overload() body.adjustToxLoss(100) body.afflict_radiation(50, 0, 0) //don't check for armor since Overload is only called when someone has taken Radium - body.bodytemperature = max(body.bodytemperature, BODYTEMP_HEAT_DAMAGE_LIMIT) + body.bodytemperature = max(body.bodytemperature, LEGACY_BODYTEMP_HEAT_DAMAGE_THRESHOLD) to_chat(body, "A terrible fever assails your body, you feel ill as your immune system kicks into overdrive to drive away your infections.") if (ishuman(body)) var/mob/living/carbon/human/H = body diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index c4b98f30f3..ea48c01a5e 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -52,7 +52,7 @@ ui = new(user, src, "PathogenicIsolator", name) ui.open() -/obj/machinery/disease2/isolator/ui_data(mob/user) +/obj/machinery/disease2/isolator/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["syringe_inserted"] = !!sample data["isolating"] = isolating @@ -100,7 +100,7 @@ SStgui.update_uis(src) update_icon() -/obj/machinery/disease2/isolator/ui_act(action, list/params) +/obj/machinery/disease2/isolator/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 3554bb0eb9..b9ec504884 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -13,13 +13,6 @@ /client var/datum/vore_preferences/prefs_vr -/hook/client_new/proc/add_prefs_vr(client/C) - C.prefs_vr = new/datum/vore_preferences(C) - if(C.prefs_vr) - return TRUE - - return FALSE - /datum/vore_preferences //Actual preferences var/digestable = FALSE diff --git a/code/modules/vore/fluffstuff/custom_clothes.dm b/code/modules/vore/fluffstuff/custom_clothes.dm index 321ffd69f2..16700dbe2c 100644 --- a/code/modules/vore/fluffstuff/custom_clothes.dm +++ b/code/modules/vore/fluffstuff/custom_clothes.dm @@ -90,7 +90,7 @@ permeability_coefficient = 0.01 armor_type = /datum/armor/none inv_hide_flags = HIDEMASK|HIDEEARS - cold_protection = HEAD + cold_protection_cover = HEAD siemens_coefficient = 0.9 //Bonnie Head @@ -128,7 +128,7 @@ allowed = list(/obj/item/flashlight,/obj/item/tank) armor_type = /datum/armor/none inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS siemens_coefficient = 0.9 //Bonnie Suit diff --git a/code/modules/vore/fluffstuff/custom_items.dm b/code/modules/vore/fluffstuff/custom_items.dm index a67b7e5c8a..6472bcba36 100644 --- a/code/modules/vore/fluffstuff/custom_items.dm +++ b/code/modules/vore/fluffstuff/custom_items.dm @@ -1397,7 +1397,7 @@ user.visible_message("\The [user] accidentally cuts \himself with \the [src].",\ "You accidentally cut yourself with \the [src].") var/mob/living/carbon/human/H = ishuman(user)? user : null - H?.take_organ_damage(5,5) + H?.take_random_targeted_damage(brute = 5, burn = 5) deactivate(user) else activate(user) diff --git a/code/modules/vore/fluffstuff/guns/gunsword.dm b/code/modules/vore/fluffstuff/guns/gunsword.dm index f6827a7075..ae1b23c184 100644 --- a/code/modules/vore/fluffstuff/guns/gunsword.dm +++ b/code/modules/vore/fluffstuff/guns/gunsword.dm @@ -103,7 +103,7 @@ user.visible_message("\The [user] accidentally cuts [TU.himself] with \the [src].",\ "You accidentally cut yourself with \the [src].") var/mob/living/carbon/human/H = ishuman(user)? user : null - H?.take_organ_damage(5,5) + H?.take_random_targeted_damage(brute = 5, burn = 5) deactivate(user) update_icon() update_held_icon() diff --git a/code/modules/vore/hook-defs_vr.dm b/code/modules/vore/hook-defs_vr.dm index f5aa075a9b..076e1747dc 100644 --- a/code/modules/vore/hook-defs_vr.dm +++ b/code/modules/vore/hook-defs_vr.dm @@ -1,8 +1,6 @@ //The base hooks themselves //New() hooks -/hook/client_new - /hook/mob_new /hook/living_new diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index a8f2486552..f68b066ad1 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -390,7 +390,9 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //If they are a human, do damage (doesn't hurt other mobs...?) if(Ht) for(var/obj/item/organ/external/I in Ht.organs) - I.take_damage(calculated_damage, 0) // 5 damage min, 26.25 damage max, depending on size & RNG. If they're only stepped on once, the damage will (probably not...) heal over time. + I.inflict_bodypart_damage( + brute = calculated_damage, + ) Ht.drip(0.1) add_attack_logs(src,tmob,"Crushed underfoot (run, about [calculated_damage] damage)") @@ -401,8 +403,10 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //If they are a human, do damage (doesn't hurt other mobs...?) if(Ht) - for(var/obj/item/organ/I in Ht.organs) - I.take_damage(calculated_damage, 0) + for(var/obj/item/organ/external/E in Ht.get_damageable_external_organs()) + E.inflict_bodypart_damage( + brute = calculated_damage, + ) Ht.drip(3) add_attack_logs(src,tmob,"Crushed underfoot (walk, about [calculated_damage] damage)") diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index 057630e05b..3e95e22d74 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -147,7 +147,7 @@ ui = new(user, src, "XenoarchReplicator", name) ui.open() -/obj/machinery/replicator/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/replicator/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["tgui_construction"] = tgui_construction return data diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm index 86908954ae..1458663748 100644 --- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm +++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm @@ -54,7 +54,7 @@ return return ui_interact(user) -/obj/item/anodevice/ui_state(mob/user, datum/tgui_module/module) +/obj/item/anodevice/ui_state() return GLOB.inventory_state /obj/item/anodevice/ui_interact(mob/user, datum/tgui/ui) @@ -63,7 +63,7 @@ ui = new(user, src, "XenoarchHandheldPowerUtilizer", name) ui.open() -/obj/item/anodevice/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/anodevice/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["inserted_battery"] = inserted_battery diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 0c1a9bdd76..b10e28b38b 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -38,7 +38,7 @@ ui = new(user, src, "XenoarchArtifactAnalyzer", name) ui.open() -/obj/machinery/artifact_analyser/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/artifact_analyser/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["owned_scanner"] = owned_scanner diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index ce198e5d84..b036b06a21 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -47,7 +47,7 @@ ui = new(user, src, "XenoarchArtifactHarvester", name) ui.open() -/obj/machinery/artifact_harvester/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/artifact_harvester/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["info"] = list( diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index e97e6c8398..8fa28dece2 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -124,7 +124,7 @@ ui = new(user, src, "XenoarchSpectrometer", name) ui.open() -/obj/machinery/radiocarbon_spectrometer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/radiocarbon_spectrometer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index 489349dc9c..d4b03f6657 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -55,7 +55,7 @@ ui = new(user, src, "XenoarchSuspension", name) ui.open() -/obj/machinery/suspension_gen/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/suspension_gen/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["cell"] = cell diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index 0913e1bd87..ee7b66a7bc 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -162,7 +162,7 @@ return ui_interact(user) -/obj/item/depth_scanner/ui_state(mob/user, datum/tgui_module/module) +/obj/item/depth_scanner/ui_state() return GLOB.deep_inventory_state /obj/item/depth_scanner/ui_interact(mob/user, datum/tgui/ui) @@ -171,7 +171,7 @@ ui = new(user, src, "XenoarchDepthScanner", name) ui.open() -/obj/item/depth_scanner/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/depth_scanner/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["current"] = list() @@ -289,7 +289,7 @@ return return ui_interact(user) -/obj/item/beacon_locator/ui_state(mob/user, datum/tgui_module/module) +/obj/item/beacon_locator/ui_state() return GLOB.inventory_state /obj/item/beacon_locator/ui_interact(mob/user, datum/tgui/ui) @@ -298,7 +298,7 @@ ui = new(user, src, "BeaconLocator", name) ui.open() -/obj/item/beacon_locator/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/beacon_locator/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["scan_ticks"] = scan_ticks diff --git a/config/entries/game.txt b/config/entries/game.txt index 0dbc702386..8f155dab9f 100644 --- a/config/entries/game.txt +++ b/config/entries/game.txt @@ -11,9 +11,6 @@ STARLIGHT ## Set to 0 to disable holidays (you monster) ALLOW_HOLIDAYS -## Set to 0 to disable nightshifts (you monster!!) -NIGHTSHIFTS_ENABLED - ## Engine submap probabilities ## Supermatter ENGINE_SUBMAP EngineSubmap_SM 40 @@ -43,3 +40,25 @@ EMOJIS ## Set to 0 to disable everyone on station having maint. ALMOST_EVERYONE_HAS_MAINTENANCE_ACCESS + +### Nightshift ### + +## Set to 0 to disable nightshifts (you monster!!) +NIGHTSHIFTS_ENABLED + +## Nightshift Levels +## Set to 1 or 0 as needed. + +NIGHTSHIFT_LEVELS Unset 0 + +NIGHTSHIFT_LEVELS PublicHalls 1 +NIGHTSHIFT_LEVELS PublicAreas 1 + +NIGHTSHIFT_LEVELS DepartmentHalls 1 +NIGHTSHIFT_LEVELS DepartmentAreas 0 +NIGHTSHIFT_LEVELS DepartmentSecure 0 +NIGHTSHIFT_LEVELS DepartmentLeisure 1 + +NIGHTSHIFT_LEVELS CommandHalls 1 +NIGHTSHIFT_LEVELS CommandAreas 0 +NIGHTSHIFT_LEVELS CommandSecure 0 diff --git a/config_static/jukebox.json b/config_static/jukebox.json index 70ab8251f1..0636d54bf7 100644 --- a/config_static/jukebox.json +++ b/config_static/jukebox.json @@ -10259,5 +10259,15 @@ "jukebox": true, "ost": "Armored Core", "genre": "Arcade" +}, +{ +"url": "https://files.catbox.moe/rzcos7.mp3", +"title": "[ERRRD0NK!@%@!]Hush (ft. Mizz Fish)", +"duration": 1821, +"artist": "kroh", +"genre": "Electronic", +"secret": true, +"lobby": false, +"jukebox": true } ] diff --git a/icons/clothing/head/aureate.dmi b/icons/clothing/head/aureate.dmi new file mode 100644 index 0000000000..ea9a504b34 Binary files /dev/null and b/icons/clothing/head/aureate.dmi differ diff --git a/icons/clothing/suit/coats/aureate_kimono.dmi b/icons/clothing/suit/coats/aureate_kimono.dmi new file mode 100644 index 0000000000..55cd8c56a8 Binary files /dev/null and b/icons/clothing/suit/coats/aureate_kimono.dmi differ diff --git a/icons/clothing/uniform/misc/neko.dmi b/icons/clothing/uniform/misc/neko.dmi new file mode 100644 index 0000000000..b31fd074cb Binary files /dev/null and b/icons/clothing/uniform/misc/neko.dmi differ diff --git a/icons/machinery/security_camera.dmi b/icons/machinery/security_camera.dmi new file mode 100644 index 0000000000..54ab183463 Binary files /dev/null and b/icons/machinery/security_camera.dmi differ diff --git a/icons/misc/map_helpers.dmi b/icons/misc/map_helpers.dmi index 6d1d0c0c16..0bc0666eb5 100644 Binary files a/icons/misc/map_helpers.dmi and b/icons/misc/map_helpers.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 3ab8718217..0f0a35776a 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/ears.dmi b/icons/mob/clothing/ears.dmi index 561c1ba994..1a53707a9c 100644 Binary files a/icons/mob/clothing/ears.dmi and b/icons/mob/clothing/ears.dmi differ diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index 6fc7ba5826..dbb4068a25 100644 Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index 4d209f3cee..0bfa247f2e 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 1b1bfb3924..74e6e84257 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi b/icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi new file mode 100644 index 0000000000..93346b5f92 Binary files /dev/null and b/icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi differ diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index 06897f0216..985a5b96da 100644 Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ diff --git a/icons/mob/monitor_icons.dmi b/icons/mob/monitor_icons.dmi index 8c56c1496c..33789b4179 100644 Binary files a/icons/mob/monitor_icons.dmi and b/icons/mob/monitor_icons.dmi differ diff --git a/icons/mob/sprite_accessories/markings/tatoos.dmi b/icons/mob/sprite_accessories/markings/tatoos.dmi index 6e801b3336..9d92b1e3d4 100644 Binary files a/icons/mob/sprite_accessories/markings/tatoos.dmi and b/icons/mob/sprite_accessories/markings/tatoos.dmi differ diff --git a/icons/modules/atmospherics/air_alarm.dmi b/icons/modules/atmospherics/air_alarm.dmi new file mode 100644 index 0000000000..2335a89956 Binary files /dev/null and b/icons/modules/atmospherics/air_alarm.dmi differ diff --git a/icons/modules/food/items/ice_cream.dmi b/icons/modules/food/items/ice_cream.dmi new file mode 100644 index 0000000000..282a2533ff Binary files /dev/null and b/icons/modules/food/items/ice_cream.dmi differ diff --git a/icons/modules/food/structures/ice_cream.dmi b/icons/modules/food/structures/ice_cream.dmi new file mode 100644 index 0000000000..43d85c9cb5 Binary files /dev/null and b/icons/modules/food/structures/ice_cream.dmi differ diff --git a/icons/obj/apc.dmi b/icons/obj/apc.dmi index 7511f66aa4..90ec06bb4f 100644 Binary files a/icons/obj/apc.dmi and b/icons/obj/apc.dmi differ diff --git a/icons/obj/doors/double/door.dmi b/icons/obj/doors/double/door.dmi index 821d3193f1..6a76b96963 100644 Binary files a/icons/obj/doors/double/door.dmi and b/icons/obj/doors/double/door.dmi differ diff --git a/icons/obj/doors/double/lights_deny.dmi b/icons/obj/doors/double/lights_deny.dmi deleted file mode 100644 index 46a615d620..0000000000 Binary files a/icons/obj/doors/double/lights_deny.dmi and /dev/null differ diff --git a/icons/obj/doors/external/door.dmi b/icons/obj/doors/external/door.dmi index 2b861d13db..0aa1e2dee5 100644 Binary files a/icons/obj/doors/external/door.dmi and b/icons/obj/doors/external/door.dmi differ diff --git a/icons/obj/doors/external/lights_deny.dmi b/icons/obj/doors/external/lights_deny.dmi deleted file mode 100644 index 38c652d9f6..0000000000 Binary files a/icons/obj/doors/external/lights_deny.dmi and /dev/null differ diff --git a/icons/obj/doors/hatch/door.dmi b/icons/obj/doors/hatch/door.dmi index 8e354cf395..98cea2557f 100644 Binary files a/icons/obj/doors/hatch/door.dmi and b/icons/obj/doors/hatch/door.dmi differ diff --git a/icons/obj/doors/hatch/lights_deny.dmi b/icons/obj/doors/hatch/lights_deny.dmi deleted file mode 100644 index 1fe72d724f..0000000000 Binary files a/icons/obj/doors/hatch/lights_deny.dmi and /dev/null differ diff --git a/icons/obj/doors/hazard/floor_inflatables.dmi b/icons/obj/doors/hazard/floor_inflatables.dmi new file mode 100644 index 0000000000..7619814447 Binary files /dev/null and b/icons/obj/doors/hazard/floor_inflatables.dmi differ diff --git a/icons/obj/doors/station/door.dmi b/icons/obj/doors/station/door.dmi index 13740f9611..f1dced5823 100644 Binary files a/icons/obj/doors/station/door.dmi and b/icons/obj/doors/station/door.dmi differ diff --git a/icons/obj/doors/station/lights_deny.dmi b/icons/obj/doors/station/lights_deny.dmi deleted file mode 100644 index fff1fd8445..0000000000 Binary files a/icons/obj/doors/station/lights_deny.dmi and /dev/null differ diff --git a/icons/obj/doors/vault/door.dmi b/icons/obj/doors/vault/door.dmi index ee9e280365..79ad740704 100644 Binary files a/icons/obj/doors/vault/door.dmi and b/icons/obj/doors/vault/door.dmi differ diff --git a/icons/obj/doors/vault/panel.dmi b/icons/obj/doors/vault/panel.dmi new file mode 100644 index 0000000000..fcf3e68df2 Binary files /dev/null and b/icons/obj/doors/vault/panel.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index d04cef2335..b7d88fd8c0 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/firealarm.dmi b/icons/obj/firealarm.dmi index 26d4f3a974..5631ccbb48 100644 Binary files a/icons/obj/firealarm.dmi and b/icons/obj/firealarm.dmi differ diff --git a/icons/obj/integrated_electronics/electronic_setups.dmi b/icons/obj/integrated_electronics/electronic_setups.dmi index 8d5e6f10a6..f053bab991 100644 Binary files a/icons/obj/integrated_electronics/electronic_setups.dmi and b/icons/obj/integrated_electronics/electronic_setups.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 9d869bbe3c..4b46a4a3c1 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi index 2ae9e5a338..6e3b17e8de 100644 Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ diff --git a/icons/screen/actions/pai.dmi b/icons/screen/actions/pai.dmi new file mode 100644 index 0000000000..dc0dcd3251 Binary files /dev/null and b/icons/screen/actions/pai.dmi differ diff --git a/icons/screen/atom_hud/job.dmi b/icons/screen/atom_hud/job.dmi index 6652661284..1910d170f0 100644 Binary files a/icons/screen/atom_hud/job.dmi and b/icons/screen/atom_hud/job.dmi differ diff --git a/icons/turf/outdoors.dmi b/icons/turf/outdoors.dmi index 7308e2f096..e509a72871 100644 Binary files a/icons/turf/outdoors.dmi and b/icons/turf/outdoors.dmi differ diff --git a/icons/turf/river.dmi b/icons/turf/river.dmi new file mode 100644 index 0000000000..590f6f048e Binary files /dev/null and b/icons/turf/river.dmi differ diff --git a/interface/interface.dm b/interface/interface.dm index 57b7e9b48a..17c258a024 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -89,6 +89,11 @@ to_chat(src, "The Github URL is not set in the server configuration.") return +/client/proc/changelog_async() + set waitfor = FALSE + + changelog() + /client/verb/changelog() set name = "Changelog" set category = "OOC" diff --git a/maps/UTILITY_REGEXES.md b/maps/UTILITY_REGEXES.md new file mode 100644 index 0000000000..84b124c0af --- /dev/null +++ b/maps/UTILITY_REGEXES.md @@ -0,0 +1,10 @@ +# Utility regexes + +random regexes, with varying levels of usefulness + +## pulling a dir out of something with multiple dirs to force a /dir subtype instead + +that ; at the end is bad and can lead to issues. + +`/obj/machinery/air_alarm(.*)\{([a-zA-Z0-9\n\t "_=();]*)\n\tdir = 8;` -> `/obj/machinery/air_alarm$1/west{$2` + diff --git a/maps/away_missions/140x140/carpfarm.dmm b/maps/away_missions/140x140/carpfarm.dmm index 1e23650994..df75f4dd3f 100644 --- a/maps/away_missions/140x140/carpfarm.dmm +++ b/maps/away_missions/140x140/carpfarm.dmm @@ -126,11 +126,8 @@ "az" = ( /obj/item/storage/toolbox/electrical, /obj/structure/cable, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + alarms_hidden = 1 }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -507,7 +504,7 @@ icon_state = "intact" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1375; master_tag = "carp_airlock"; name = "interior access button"; @@ -678,7 +675,7 @@ /area/awaymission/carpfarm/base) "ce" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1375; master_tag = "carp_airlock"; name = "exterior access button"; diff --git a/maps/away_missions/140x140/snow_outpost.dmm b/maps/away_missions/140x140/snow_outpost.dmm index 0745747a3f..9eb53929a4 100644 --- a/maps/away_missions/140x140/snow_outpost.dmm +++ b/maps/away_missions/140x140/snow_outpost.dmm @@ -59,11 +59,7 @@ /turf/simulated/floor/tiled/old_tile/white, /area/awaymission/snow_outpost/powered) "am" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) @@ -196,12 +192,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "aK" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; temperature = 80 @@ -265,12 +256,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "aX" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /mob/living/simple_mob/humanoid/merc/ranged/ionrifle, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) @@ -314,12 +300,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "bg" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "bh" = ( @@ -327,11 +308,7 @@ /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/dark) "bi" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ icon_state = "intact"; dir = 10 @@ -487,12 +464,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "bJ" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4; icon_state = "intact" @@ -516,11 +488,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "bM" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber{ dir = 8 }, @@ -895,9 +863,8 @@ /turf/simulated/floor, /area/awaymission/snow_outpost/powered) "dl" = ( -/obj/machinery/power/apc{ - operating = 0; - pixel_x = 31 +/obj/machinery/power/apc/south_mount{ + operating = 0 }, /turf/simulated/floor, /area/awaymission/snow_outpost/powered) @@ -1557,10 +1524,8 @@ /turf/simulated/floor/plating, /area/awaymission/snow_outpost/outside/nospawn) "fo" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "BSD APC"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + name = "BSD APC" }, /turf/simulated/floor/tiled/yellow, /area/awaymission/snow_outpost/powered) @@ -2392,7 +2357,6 @@ pixel_y = 0 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0 diff --git a/maps/away_missions/140x140/snowfield.dmm b/maps/away_missions/140x140/snowfield.dmm index 8c4675c90f..8eff3bdd7e 100644 --- a/maps/away_missions/140x140/snowfield.dmm +++ b/maps/away_missions/140x140/snowfield.dmm @@ -109,12 +109,10 @@ /turf/simulated/floor/plating, /area/awaymission/snowfield/base) "ar" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ alarms_hidden = 1; - dir = 8; name = "west bump-derelict"; - operating = 0; - pixel_x = -24 + operating = 0 }, /obj/structure/cable{ icon_state = "0-4" diff --git a/maps/away_missions/archive/Academy.dmm b/maps/away_missions/archive/Academy.dmm index 80e4346635..67d9d5ffb5 100644 --- a/maps/away_missions/archive/Academy.dmm +++ b/maps/away_missions/archive/Academy.dmm @@ -41,8 +41,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ environ = 0; locked = 0; req_access = "" @@ -1000,8 +999,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, @@ -1665,8 +1663,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, @@ -2465,8 +2462,7 @@ /turf/simulated/floor/carpet, /area/awaymission/academy/academygate) "jW" = ( -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, diff --git a/maps/away_missions/archive/blackmarketpackers.dmm b/maps/away_missions/archive/blackmarketpackers.dmm index 524ef77707..dcd9d3d2f1 100644 --- a/maps/away_missions/archive/blackmarketpackers.dmm +++ b/maps/away_missions/archive/blackmarketpackers.dmm @@ -598,8 +598,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, @@ -836,8 +835,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ environ = 0; locked = 0; req_access = "" @@ -1104,8 +1102,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, diff --git a/maps/away_missions/archive/example.dmm b/maps/away_missions/archive/example.dmm index 3f90555f7b..8440742b10 100644 --- a/maps/away_missions/archive/example.dmm +++ b/maps/away_missions/archive/example.dmm @@ -33,10 +33,7 @@ /turf/simulated/floor, /area/awaymission/example) "ag" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, diff --git a/maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm index 6646f2f00a..3438b17126 100644 --- a/maps/away_missions/archive/stationCollision.dmm +++ b/maps/away_missions/archive/stationCollision.dmm @@ -800,11 +800,9 @@ "dE" = ( /obj/structure/window/reinforced, /obj/structure/cable, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = 7500; - dir = 8; - name = "Research APC"; - pixel_x = -28 + name = "Research APC" }, /turf/simulated/floor/airless, /area/awaymission/research) @@ -1065,11 +1063,9 @@ /turf/simulated/floor/plating, /area/awaymission/northblock) "eN" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = 5000; - dir = 4; - name = "North Block APC"; - pixel_x = 28 + name = "North Block APC" }, /obj/structure/cable, /turf/simulated/floor/airless, @@ -1598,11 +1594,9 @@ /area/awaymission/midblock) "gG" = ( /obj/item/ammo_casing/a12g/pellet, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = 5000; - dir = 8; - name = "Mid Block APC"; - pixel_x = -28 + name = "Mid Block APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -2029,11 +2023,9 @@ /turf/simulated/floor, /area/awaymission/arrivalblock) "ib" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = 7500; - dir = 8; - name = "Arrivals Block APC"; - pixel_x = -28 + name = "Arrivals Block APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -2627,10 +2619,9 @@ /area/awaymission/southblock) "kf" = ( /obj/machinery/light/small, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ cell_type = 5000; - name = "South Block APC"; - pixel_y = -30 + name = "South Block APC" }, /obj/structure/cable, /turf/simulated/floor, @@ -3217,10 +3208,8 @@ /turf/simulated/floor, /area/awaymission/gateroom) "mo" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Gateroom APC"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + name = "Gateroom APC" }, /obj/structure/cable{ icon_state = "0-8" diff --git a/maps/away_missions/archive/zresearchlabs.dmm b/maps/away_missions/archive/zresearchlabs.dmm index a8fc991c1b..929c71d59f 100644 --- a/maps/away_missions/archive/zresearchlabs.dmm +++ b/maps/away_missions/archive/zresearchlabs.dmm @@ -1073,10 +1073,8 @@ }, /area/awaymission/labs/researchdivision) "dH" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-2" @@ -1677,10 +1675,8 @@ /turf/simulated/floor, /area/awaymission/labs/gateway) "ft" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -1748,14 +1744,12 @@ }, /area/awaymission/labs/militarydivision) "fD" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/closet/crate/secure/weapon, /obj/structure/cable{ @@ -1904,14 +1898,12 @@ }, /area/awaymission/labs/militarydivision) "fW" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -2014,14 +2006,12 @@ }, /area/awaymission/labs/militarydivision) "gj" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-2" @@ -2785,10 +2775,9 @@ /turf/simulated/floor, /area/awaymission/labs/researchdivision) "im" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ dir = 0; - name = "Worn-out APC"; - pixel_y = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -3153,14 +3142,12 @@ }, /area/awaymission/labs/militarydivision) "jm" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -3498,16 +3485,16 @@ /area/awaymission/labs/solars) "kp" = ( /obj/item/clothing/suit/space/void/security{ - cold_protection = 1; + cold_protection_cover = 1; desc = "A suit specially designed for Sogun anatomy, as well as operation in high-temperature environments. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; icon_state = "rig-soghun"; item_state = "rig-soghun"; name = "Soghun Hardsuit" }, /obj/item/clothing/head/helmet/space/void/security{ desc = "A special helmet designed for the Soghun anatomy, as well as work in a hazardous, high-temperature environment. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; name = "Soghun Suit Helmet" }, /obj/item/clothing/mask/breath, @@ -3659,14 +3646,12 @@ }, /area/awaymission/desert) "kK" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-2" @@ -4098,10 +4083,8 @@ c_tag = "Aft Port Solar Control"; dir = 1 }, -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable, /obj/machinery/power/terminal{ @@ -4466,11 +4449,9 @@ /turf/simulated/floor, /area/awaymission/labs/cargo) "mI" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ cell_type = 5000; - dir = 1; - name = "Virology APC"; - pixel_y = 24 + name = "Virology APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -4574,16 +4555,16 @@ /area/awaymission/labs/civilian) "mW" = ( /obj/item/clothing/suit/space/void/security{ - cold_protection = 1; + cold_protection_cover = 1; desc = "A suit specially designed for Sogun anatomy, as well as operation in high-temperature environments. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; icon_state = "rig-soghun"; item_state = "rig-soghun"; name = "Soghun Hardsuit" }, /obj/item/clothing/head/helmet/space/void/security{ desc = "A special helmet designed for the Soghun anatomy, as well as work in a hazardous, high-temperature environment. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; name = "Soghun Suit Helmet" }, /obj/item/clothing/mask/breath, @@ -4780,16 +4761,16 @@ /area/awaymission/labs/cave) "nC" = ( /obj/item/clothing/suit/space/void/security{ - cold_protection = 1; + cold_protection_cover = 1; desc = "A suit specially designed for Sogun anatomy, as well as operation in high-temperature environments. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; icon_state = "rig-soghun"; item_state = "rig-soghun"; name = "Soghun Hardsuit" }, /obj/item/clothing/head/helmet/space/void/security{ desc = "A special helmet designed for the Soghun anatomy, as well as work in a hazardous, high-temperature environment. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; name = "Soghun Suit Helmet" }, /obj/item/clothing/mask/breath, @@ -4959,10 +4940,8 @@ /turf/simulated/floor, /area/awaymission/labs/cave) "oc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -5254,10 +5233,9 @@ }, /area/awaymission/labs/civilian) "oS" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ dir = 0; - name = "Worn-out APC"; - pixel_y = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -5267,15 +5245,13 @@ }, /area/awaymission/labs/civilian) "oT" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = 5000; - dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -5419,10 +5395,8 @@ /turf/simulated/floor, /area/awaymission/labs/civilian) "po" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -5722,10 +5696,8 @@ }, /area/awaymission/labs/command) "qm" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -5859,10 +5831,8 @@ }, /area/awaymission/labs/command) "qJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -6042,10 +6012,9 @@ }, /area/awaymission/labs/civilian) "rk" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ dir = 0; - name = "Worn-out APC"; - pixel_y = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -6391,10 +6360,8 @@ /turf/simulated/floor, /area/awaymission/labs/civilian) "sq" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -6978,11 +6945,9 @@ }, /area/awaymission/labs/security) "ug" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ cell_type = 5000; - dir = 1; - name = "Virology APC"; - pixel_y = 24 + name = "Virology APC" }, /obj/structure/cable, /turf/simulated/floor{ @@ -7062,10 +7027,9 @@ "ur" = ( /obj/structure/table/standard, /obj/machinery/light, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ dir = 0; - name = "Worn-out APC"; - pixel_y = -24 + name = "Worn-out APC" }, /obj/structure/cable, /turf/simulated/floor{ diff --git a/maps/euthenia/levels/deck0.dmm b/maps/euthenia/levels/deck0.dmm index bf5983e070..4b9c124529 100644 --- a/maps/euthenia/levels/deck0.dmm +++ b/maps/euthenia/levels/deck0.dmm @@ -2,7 +2,7 @@ "ah" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "al" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, @@ -15,7 +15,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "au" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -32,13 +32,13 @@ /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "aM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "aQ" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, @@ -57,7 +57,25 @@ dir = 4 }, /turf/simulated/open, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) +"bI" = ( +/obj/machinery/door/airlock/glass/command, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0; + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/bridge) +"bM" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) "cC" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot{ @@ -65,29 +83,61 @@ }, /turf/simulated/floor/tiled/techfloor, /area/space) +"cL" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) "cO" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, /area/space) +"de" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "dl" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck0) +"dp" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/structure/lattice, +/turf/simulated/open, /area/space) -"eS" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/sign/vacuum{ - pixel_x = -32 +"dZ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/lattice, +/turf/simulated/open, /area/space) -"eU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +"ef" = ( +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_zero/forward/port) +"ew" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "S-NE-NW" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) +"eR" = ( +/obj/structure/railing/grey{ + dir = 1 }, +/turf/simulated/open, +/area/main_map/hallway/deck0) +"eW" = ( /turf/simulated/wall/r_wall, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "eZ" = ( /obj/machinery/computer/ship/navigation{ dir = 8 @@ -97,18 +147,21 @@ "fD" = ( /obj/machinery/holoplant, /turf/simulated/floor/tiled/techfloor/grid, +/area/bridge) +"fQ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, /area/space) "fT" = ( /obj/machinery/door/airlock/lift, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "fU" = ( /turf/simulated/wall, -/area/space) -"gj" = ( -/obj/machinery/oxygen_pump, -/turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/maintenance/deck_zero/starboard) "gA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -123,22 +176,18 @@ /area/space) "gM" = ( /obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/outdoors, /area/space) "gN" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/space) -"gU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/space) -"hh" = ( -/obj/structure/railing, +"hf" = ( /obj/structure/lattice, -/turf/space, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, /area/space) "hk" = ( /obj/machinery/computer/ship/engines, @@ -147,27 +196,50 @@ "hD" = ( /turf/simulated/floor/plating, /area/maintenance/substation/command) +"hT" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) +"ib" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) "ih" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, -/area/space) -"iD" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/bridge) "iE" = ( /obj/structure/railing, /turf/simulated/open, /area/main_map/hallway/deck0) +"jb" = ( +/obj/structure/catwalk, +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "jm" = ( /turf/simulated/wall/r_wall/prepainted/medical, +/area/main_map/maintenance/deck_zero/forward/starboard) +"jz" = ( +/turf/simulated/floor/tiled/monotile, /area/space) +"jQ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) "jR" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/space) +/area/bridge) "jS" = ( /obj/machinery/door/airlock/maintenance/command, /obj/machinery/door/firedoor{ @@ -183,10 +255,13 @@ dir = 1 }, /turf/simulated/open, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "kd" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) +"kE" = ( +/turf/simulated/floor/glass/reinforced, +/area/bridge) "kY" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -196,25 +271,28 @@ name = "Chemistry Shutters" }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "lB" = ( /obj/machinery/door/airlock/maintenance/command, /obj/machinery/door/firedoor{ dir = 4 }, -/turf/simulated/floor/plating, -/area/space) -"lD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0; dir = 8 }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 4; - id_tag = "deck1_airlock2"; - pixel_x = -26 +/turf/simulated/floor/plating, +/area/bridge) +"lE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) "mk" = ( /obj/structure/railing{ dir = 4 @@ -223,13 +301,25 @@ dir = 4 }, /turf/simulated/open, +/area/main_map/maintenance/deck_zero/forward/starboard) +"mr" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/main_map/hallway/deck0) +"mu" = ( +/obj/machinery/oxygen_pump{ + dir = 4; + pixel_x = 30 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "mw" = ( /obj/machinery/camera/network/outside{ dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "my" = ( /obj/structure/railing{ @@ -237,19 +327,47 @@ }, /turf/simulated/open, /area/space) +"mN" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 6 + }, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/hallway/deck0) +"ne" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck0) +"no" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/space) +"np" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) "ns" = ( /obj/machinery/power/pointdefense{ id_tag = "forward_pd" }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ny" = ( -/obj/structure/lattice, -/obj/machinery/camera/network/outside{ - dir = 5 - }, -/turf/space, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"nv" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/bridge) +"nw" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) "nW" = ( /obj/structure/railing, /obj/structure/window/reinforced, @@ -260,7 +378,14 @@ dir = 4 }, /turf/simulated/open, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) +"nY" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/main_map/hallway/deck0) "ok" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ @@ -270,45 +395,69 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"oo" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_zero/starboard) "ov" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck0) -"oD" = ( -/obj/machinery/door/airlock/glass/security{ - id_tag = "BrigFoyer"; - layer = 2.8; - name = "Security"; - req_one_access = list(38,63) +"oE" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) +"pl" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_grid, /area/main_map/hallway/deck0) -"oE" = ( -/turf/simulated/floor/tiled/steel_grid, -/area/space) +"pp" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck0) "pq" = ( /obj/effect/floor_decal/techfloor{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "pA" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/main_map/hallway/deck0) +"pF" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/forward/starboard) "pG" = ( /obj/structure/railing, /turf/simulated/open, /area/space) +"pM" = ( +/obj/structure/railing, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/space) +"pP" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) "pV" = ( /obj/structure/lattice, /turf/simulated/open, /area/space) "pZ" = ( /turf/simulated/floor/tiled/white, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "qf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1 @@ -321,30 +470,34 @@ }, /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "qo" = ( /turf/simulated/floor/tiled/monofloor{ dir = 1 }, -/area/space) -"qx" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/airlock_sensor{ - dir = 8; - id_tag = "deck1_airlock2"; - pixel_x = 22 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/main_map/hallway/deck0) "qJ" = ( /obj/effect/floor_decal/corner/mauve{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/hallway/deck0) +"qQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/space) +"qW" = ( +/obj/structure/transit_tube/station, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck0) +"rk" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, /area/space) "rl" = ( /obj/structure/table/reinforced, @@ -353,33 +506,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/space) -"rB" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/machinery/door/window/southright{ - dir = 8; - name = "Jetpack Storage"; - req_one_access = list(11,24) - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"rK" = ( -/obj/structure/dispenser{ - phorontanks = 0 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "rS" = ( /turf/simulated/open, /area/main_map/hallway/deck0) +"sj" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/main_map/hallway/deck0) "sJ" = ( /obj/structure/cable{ icon_state = "2-4" @@ -392,11 +524,26 @@ dir = 10 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "tq" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/space) +"tJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) +"ud" = ( +/turf/simulated/wall, +/area/main_map/maintenance/deck_zero/forward/port) +"uf" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/hallway) "uj" = ( /obj/structure/cable{ icon_state = "1-2" @@ -416,21 +563,34 @@ }, /turf/simulated/open, /area/space) -"vw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"vI" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/catwalk, +/obj/structure/railing/grey{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) "vN" = ( /obj/structure/bed/chair/bay/comfy{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/space) +"wz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "wJ" = ( /turf/simulated/floor/plating, /area/space) @@ -443,19 +603,25 @@ "wQ" = ( /obj/machinery/door/airlock/maintenance/command, /turf/simulated/floor/plating, -/area/space) -"wU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/area/main_map/hallway/deck0) +"xd" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_zero/starboard) +"xM" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/railing{ dir = 8 }, -/obj/machinery/door/airlock/glass/engineeringatmos{ - name = "Atmospherics" +/turf/simulated/open, +/area/space) +"xP" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/open, /area/space) "xR" = ( /turf/simulated/floor/glass/reinforced, @@ -466,7 +632,14 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/bridge) +"yE" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/bridge) +"yJ" = ( +/turf/simulated/wall/prepainted/command, +/area/bridge) "yN" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -480,28 +653,54 @@ pixel_x = -26 }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "zp" = ( /turf/simulated/floor/tiled/monotile, -/area/space) +/area/tether/surfacebase/security/hallway) "zx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, +/obj/machinery/door/airlock/multi_tile/glass/exploration, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck0) +"zz" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) +"zA" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/maintenance/deck_zero/starboard) +"zE" = ( +/obj/spawner/window/reinforced/full/firelocks, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) +"zK" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) "zO" = ( /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Ao" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"Ae" = ( +/obj/structure/railing/grey, +/turf/simulated/open, +/area/main_map/hallway/deck0) "AB" = ( /obj/item/tank/emergency/oxygen, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "AL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -513,12 +712,46 @@ /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"AU" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) +"Bb" = ( +/obj/machinery/door/airlock/lift, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck0) "Bf" = ( /obj/machinery/computer/ship/navigation{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"Bj" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/space) +"Bx" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) +"Ci" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) +"CF" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "CT" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -531,7 +764,20 @@ master_tag = "flight_deck_1" }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) +"DX" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/bridge) +"Ea" = ( +/turf/simulated/floor/plating, +/area/bridge) +"Eb" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) "Ee" = ( /obj/structure/cable{ icon_state = "4-8" @@ -542,12 +788,10 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/space) -"EC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/space) +"Ef" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) "EF" = ( /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot{ pixel_y = 3 @@ -555,20 +799,17 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/techfloor, /area/space) -"EN" = ( -/obj/structure/catwalk, -/obj/machinery/shield_diffuser, -/obj/item/sign{ - icon_state = "warning"; - name = "hazard stripes" - }, -/turf/simulated/floor/airless/ceiling, -/area/space) "ES" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) +"Fe" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) "Fp" = ( /turf/simulated/wall/r_wall, /area/space) @@ -576,11 +817,23 @@ /obj/structure/railing, /obj/structure/window/reinforced, /turf/simulated/open, -/area/space) -"GJ" = ( -/obj/machinery/atmospherics/pipe/tank, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) +"FT" = ( +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_zero/starboard) +"FV" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/bridge) +"GZ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/outdoors, +/area/tether/surfacebase/security/hallway) "Ha" = ( /obj/machinery/computer/ship/helm{ dir = 8 @@ -590,7 +843,7 @@ "Hb" = ( /obj/spawner/window/low_wall/borosillicate/full/firelocks, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "Hj" = ( /turf/space/basic, /area/space) @@ -600,7 +853,7 @@ }, /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "Hp" = ( /obj/structure/lattice, /obj/structure/cable/green{ @@ -638,7 +891,11 @@ "HA" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) +"HM" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck0) "If" = ( /obj/structure/lattice, /obj/machinery/door/firedoor/glass, @@ -659,29 +916,48 @@ dir = 8 }, /turf/simulated/open, +/area/main_map/maintenance/deck_zero/starboard) +"Il" = ( +/turf/simulated/floor/tiled/techfloor, +/area/bridge) +"IB" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/structure/lattice, +/turf/simulated/open, /area/space) +"Jc" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) +"Jh" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-SW-NW" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) "Jj" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "Jl" = ( /obj/machinery/holoplant, /turf/simulated/floor/tiled/monotile, -/area/space) -"JP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/space) +/area/main_map/hallway/deck0) "JQ" = ( /turf/simulated/shuttle/wall/voidcraft/blue, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "JS" = ( /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/outdoors, /area/space) "JX" = ( /obj/machinery/door/airlock/maintenance/command, @@ -700,86 +976,86 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"Ke" = ( -/obj/machinery/oxygen_pump/mobile, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"Ki" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Kt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/wall/r_wall, -/area/space) +"Kx" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_zero/forward/starboard) "KG" = ( /turf/simulated/floor/tiled/monofloor, -/area/space) +/area/main_map/hallway/deck0) +"KH" = ( +/turf/simulated/wall, +/area/main_map/hallway/deck0) "KO" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/space) +"Lf" = ( +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge) "LA" = ( /obj/machinery/light/small{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"LW" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Ma" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Ml" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"MI" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/storage/toolbox/mechanical, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 +/obj/structure/cable{ + icon_state = "1-2" }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"LW" = ( +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_zero/starboard) +"Mm" = ( +/turf/simulated/open, +/area/tether/surfacebase/security/hallway) +"Mo" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck0) +"MD" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/bridge) +"MJ" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"MM" = ( +/obj/structure/ladder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/forward/port) "MQ" = ( /obj/effect/floor_decal/techfloor{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) +"MX" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) "Nd" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) +"Np" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) "Nu" = ( /obj/structure/railing/grey{ dir = 4 }, /turf/simulated/open, -/area/space) +/area/bridge) "NG" = ( /turf/simulated/floor/tiled/steel_grid, /area/main_map/hallway/deck0) @@ -787,30 +1063,52 @@ /obj/structure/handrail{ dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "NT" = ( /turf/space, /area/space) -"NV" = ( -/obj/machinery/shield_diffuser, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) "Oe" = ( /obj/machinery/computer/ship/helm{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/space) +"Oi" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) +"Om" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/main_map/hallway/deck0) +"On" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/bridge) +"Ou" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) "Ox" = ( /turf/simulated/open, /area/space) +"OE" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) "OM" = ( /turf/simulated/floor/glass/reinforced, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "Pm" = ( /obj/machinery/door/airlock/maintenance/command, /obj/machinery/door/firedoor, @@ -820,19 +1118,33 @@ "Pr" = ( /obj/machinery/door/airlock/glass/command, /obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0 + }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/bridge) +"PS" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/forward/port) "Qd" = ( /obj/structure/table/reinforced, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"Qp" = ( +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) "QR" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Elevator Shaft Access"; req_one_access = null }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "Rj" = ( /obj/structure/cable{ icon_state = "2-8" @@ -844,78 +1156,98 @@ dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/space) -"RX" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Sl" = ( -/obj/machinery/shield_diffuser, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/access_button/airlock_exterior{ - master_tag = "deck1_airlock2"; - pixel_x = 24 +/area/main_map/hallway/deck0) +"RK" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 6 + }, +/obj/structure/transit_tube/station{ + dir = 8 }, -/obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/main_map/hallway/deck0) +"Sc" = ( +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) +"Sj" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) "Sq" = ( /obj/effect/floor_decal/techfloor{ dir = 6 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "SH" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/space) -"SN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/area/main_map/hallway/deck0) +"SI" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/obj/machinery/light/small/emergency{ +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/outdoors, +/area/tether/surfacebase/security/hallway) +"SJ" = ( +/obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck0) "SU" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck0) "Ti" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/space) -"Tx" = ( -/obj/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/access_button/airlock_interior{ - master_tag = "deck1_airlock2"; - pixel_x = 24 - }, -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) "TB" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Us" = ( -/obj/structure/catwalk, -/turf/simulated/floor/airless/ceiling, +/turf/simulated/floor/reinforced/outdoors, /area/space) -"Vz" = ( -/obj/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +"TR" = ( +/obj/structure/railing/grey{ + dir = 8 }, -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/main_map/hallway/deck0) +"Uf" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"UM" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) +"Vd" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) +"Vo" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck0) +"VI" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) "VJ" = ( -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/outdoors, /area/space) "VK" = ( /obj/structure/table/reinforced, @@ -927,17 +1259,21 @@ "VR" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "Wy" = ( /obj/item/banner/command, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck0) -"WG" = ( -/obj/structure/catwalk, -/obj/structure/handrail{ - dir = 4 +"WD" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/turf/simulated/floor/airless/ceiling, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) +"WI" = ( +/obj/structure/railing, +/obj/structure/lattice, +/turf/simulated/open, /area/space) "WT" = ( /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot{ @@ -945,17 +1281,19 @@ }, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/bridge) "WW" = ( /obj/spawner/window/low_wall/borosillicate/full/firelocks, /turf/simulated/floor/reinforced, -/area/space) -"Xg" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8 +/area/bridge) +"WX" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "Xi" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, @@ -964,9 +1302,15 @@ "Xt" = ( /obj/structure/closet/emcloset, /obj/structure/cable, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"Xv" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "Xz" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, @@ -979,6 +1323,12 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck0) +"XQ" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "XX" = ( /obj/structure/railing, @@ -986,7 +1336,13 @@ dir = 1 }, /turf/simulated/open, -/area/space) +/area/main_map/maintenance/deck_zero/starboard) +"XY" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck0) "Yd" = ( /obj/machinery/door/airlock/glass{ name = "Helm"; @@ -1000,26 +1356,38 @@ dir = 8 }, /turf/simulated/open, -/area/space) +/area/bridge) "Ys" = ( /obj/structure/bed/chair/bay/comfy, /turf/simulated/floor/tiled/techfloor, /area/space) -"YG" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/techmaint, -/area/space) "YL" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, /area/main_map/hallway/deck0) +"YM" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/bridge) +"Zg" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/hallway/deck0) "Zt" = ( /obj/structure/catwalk, /turf/simulated/open, /area/space) +"ZD" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/space) (1,1,1) = {" NT @@ -4819,17 +5187,17 @@ Ox Ox VJ VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG +pV +pV +pV +pV +pV +pV +pV +pV +pV +pV +pV VJ VJ Ox @@ -5013,17 +5381,17 @@ VJ VJ VJ VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG +pV +pV +pV +pV +pV +pV +pV +pV +pV +pV +pV VJ VJ VJ @@ -5205,21 +5573,21 @@ VJ VJ VJ VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ +zO +zO +hf +hf +hf +hf +hf +hf +hf +hf +hf +hf +hf +zO +zO VJ VJ VJ @@ -5398,23 +5766,23 @@ VJ VJ VJ VJ -VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ +MJ +gM +gM +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +gM +gM +Xv VJ VJ VJ @@ -5592,23 +5960,23 @@ VJ VJ VJ VJ -VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ +MJ +gM +gM +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +gM +gM +Xv VJ VJ VJ @@ -5786,23 +6154,23 @@ VJ VJ VJ VJ -VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ +MJ +gM +gM +xM +rk +rk +rk +rk +rk +rk +rk +rk +rk +xP +gM +gM +Xv VJ VJ VJ @@ -5980,9 +6348,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -5994,11 +6362,11 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ +Bj VJ VJ VJ @@ -6174,9 +6542,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6188,11 +6556,11 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ +Bj VJ VJ VJ @@ -6368,9 +6736,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6382,13 +6750,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -6562,9 +6930,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6576,13 +6944,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -6756,9 +7124,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6770,13 +7138,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -6950,9 +7318,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6964,13 +7332,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -7144,9 +7512,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -7158,13 +7526,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -7338,9 +7706,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -7352,15 +7720,15 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz +no +no VJ VJ VJ @@ -7532,29 +7900,29 @@ VJ VJ VJ VJ +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz +no +no VJ VJ VJ @@ -7664,60 +8032,25 @@ NT NT NT NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +NT +NT +NT +NT +NT +NT +NT +NT +NT +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox VJ VJ VJ @@ -7729,17 +8062,6 @@ VJ VJ VJ VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG VJ VJ VJ @@ -7748,7 +8070,53 @@ VJ VJ VJ VJ +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +CF +fQ +fQ +IB +dp +dp +dp +dZ +dZ +dZ +dp +dp +dp +pM +fQ +jb +WX VJ +Bj +jz +jz +no +no VJ VJ VJ @@ -7877,16 +8245,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -7905,6 +8263,7 @@ VJ VJ VJ VJ +Uf VJ VJ VJ @@ -7923,26 +8282,35 @@ VJ VJ VJ VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ VJ VJ VJ VJ VJ VJ +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8071,16 +8439,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8098,6 +8456,10 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ VJ VJ VJ @@ -8117,6 +8479,12 @@ VJ VJ VJ VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -8128,15 +8496,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8265,16 +8633,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8292,6 +8650,13 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -8311,6 +8676,9 @@ VJ VJ VJ VJ +MJ +gM +gM my Ox Ox @@ -8322,15 +8690,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8459,16 +8827,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8486,25 +8844,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ VJ VJ VJ VJ VJ -JP -wU -Fp -Fp -Fp -Fp -Fp -Fp -Fp VJ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -8516,15 +8884,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8653,16 +9021,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8680,25 +9038,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -JP -vw -Ma -eS -Vz -lD -SN -NV -WG VJ VJ VJ VJ VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -8710,15 +9078,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8847,16 +9215,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8874,25 +9232,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -JP -MI -Ao -Ki -Tx -Xg -qx -Sl -Us VJ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -8904,15 +9272,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -9041,16 +9409,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9068,25 +9426,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -JP -Ml -Ao -YG -Kt -Fp -Fp -Fp -EN VJ VJ VJ VJ VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -9098,15 +9466,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -9235,16 +9603,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9262,25 +9620,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -JP -rB -rK -GJ -eU -Fp -ny -hh -EN VJ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -9292,15 +9660,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -9429,16 +9797,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9456,25 +9814,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -EC -Fp -Fp -Fp -Fp -NT -NT -hh -Us VJ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -9486,15 +9854,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -9623,16 +9991,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9650,6 +10008,11 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ VJ VJ VJ @@ -9669,6 +10032,11 @@ VJ VJ VJ VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -9680,21 +10048,21 @@ Ox Ox Ox pG +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj VJ VJ VJ @@ -9817,16 +10185,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9844,6 +10202,13 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -9863,6 +10228,9 @@ VJ VJ VJ VJ +MJ +gM +gM my Ox Ox @@ -9874,21 +10242,21 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +uf +zp +zp +oE +oE +uf +Bj +Bj +Bj +Bj +Bj VJ VJ VJ @@ -10011,16 +10379,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10038,6 +10396,10 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ VJ VJ VJ @@ -10057,6 +10419,12 @@ VJ VJ VJ VJ +VJ +wJ +VJ +MJ +gM +gM my Ox Ox @@ -10068,16 +10436,16 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +uf +zp +Oi +Fe +Fe +uf VJ VJ VJ @@ -10205,16 +10573,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10232,38 +10590,7 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ +Uf VJ VJ VJ @@ -10287,6 +10614,47 @@ VJ VJ VJ VJ +wJ +VJ +MJ +gM +gM +my +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox +pG +gM +gM +Xv +VJ +SI +Ef +pP +np +np +GZ +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -10399,16 +10767,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10426,6 +10784,10 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ VJ VJ VJ @@ -10445,6 +10807,12 @@ VJ VJ VJ VJ +VJ +wJ +VJ +MJ +gM +gM my Ox Ox @@ -10456,27 +10824,27 @@ Ox Ox Ox pG +gM +gM +Xv +uf +uf +Jh +Ci +WD +WD +uf +uf +uf +uf +uf +uf VJ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -10593,16 +10961,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10620,6 +10978,10 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ VJ VJ VJ @@ -10639,6 +11001,12 @@ VJ VJ VJ VJ +VJ +wJ +VJ +MJ +gM +gM my Ox Ox @@ -10650,28 +11018,28 @@ Ox Ox Ox pG +gM +gM +Xv +uf +uf +Bx +zp +oE +oE +uf +uf +Mm +Mm +uf +uf VJ VJ VJ VJ VJ VJ -VJ -VJ -VJ -Fp -Fp -Fp -Fp -Fp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -10787,16 +11155,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10807,10 +11165,6 @@ VJ VJ VJ VJ -ov -CT -CT -ov VJ VJ VJ @@ -10818,6 +11172,15 @@ VJ VJ VJ VJ +Uf +VJ +VJ +ov +CT +CT +ov +VJ +VJ VJ VJ VJ @@ -10833,6 +11196,11 @@ VJ VJ VJ VJ +wJ +VJ +MJ +gM +gM my Ox Ox @@ -10844,6 +11212,21 @@ Ox Ox Ox pG +gM +gM +Xv +uf +jQ +zp +zp +oE +oE +uf +uf +Mm +Mm +uf +uf VJ VJ VJ @@ -10851,22 +11234,7 @@ VJ VJ VJ VJ -VJ -VJ -Fp -Fp -Ox -Ox -Fp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -10981,16 +11349,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -11001,6 +11359,16 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ +VJ CT rS rS @@ -11022,9 +11390,9 @@ VJ VJ VJ VJ +wJ VJ -VJ -RX +MJ gM gM my @@ -11038,22 +11406,21 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp +gM +gM +Xv +uf +Bx zp -Ox -Ox zp -Fp -VJ +oE +oE +zp +zp +oE +oE +zp +uf VJ VJ VJ @@ -11062,6 +11429,7 @@ VJ VJ VJ VJ +Uf VJ VJ VJ @@ -11175,16 +11543,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -11195,6 +11553,16 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ +VJ CT rS rS @@ -11216,9 +11584,9 @@ VJ VJ VJ VJ +wJ VJ -VJ -RX +MJ gM gM my @@ -11232,22 +11600,21 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp +gM +gM +Xv +uf +Bx +zp zp oE oE +oE +oE +oE +oE zp -Fp -VJ +uf VJ VJ VJ @@ -11257,6 +11624,7 @@ VJ VJ VJ VJ +Uf VJ VJ VJ @@ -11264,10 +11632,10 @@ VJ VJ VJ VJ -Fp -Xi -Xi -Fp +ov +CT +CT +ov Ox Ox Ox @@ -11369,16 +11737,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -11389,11 +11747,6 @@ VJ VJ VJ VJ -CT -rS -rS -CT -VJ VJ VJ VJ @@ -11401,8 +11754,13 @@ VJ VJ VJ VJ +Uf VJ VJ +CT +rS +rS +CT VJ VJ VJ @@ -11412,20 +11770,6 @@ VJ VJ VJ VJ -RX -gM -gM -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG VJ VJ VJ @@ -11434,14 +11778,37 @@ VJ VJ VJ VJ +wJ VJ -Fp +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv +uf +Bx +zp zp oE oE +oE +oE +oE +oE zp -Fp -VJ +uf VJ VJ VJ @@ -11452,16 +11819,17 @@ VJ VJ VJ VJ +Uf VJ VJ VJ VJ VJ VJ -Xi -Ox -Ox -Xi +CT +rS +rS +CT Ox Ox Ox @@ -11563,18 +11931,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ VJ VJ VJ @@ -11582,13 +11938,6 @@ VJ VJ VJ VJ -ov -ov -SU -SU -ov -ov -VJ VJ VJ VJ @@ -11599,27 +11948,22 @@ VJ VJ VJ VJ +Uf VJ +ov +ov +SU +SU +ov +ov +wJ +wJ VJ VJ VJ VJ VJ VJ -RX -gM -gM -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG VJ VJ VJ @@ -11628,14 +11972,37 @@ VJ VJ VJ VJ +wJ VJ -Fp -zp +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv +uf +AU +uf +uf oE oE zp -Fp -VJ +zp +zp +zp +zp +uf VJ VJ VJ @@ -11647,15 +12014,16 @@ VJ VJ VJ VJ +Uf VJ VJ VJ VJ VJ -Xi -Ox -Ox -Xi +CT +rS +rS +CT Ox Ox Ox @@ -11757,31 +12125,11 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ VJ VJ VJ VJ VJ -ov -XL -NG -NG -XL -ov VJ VJ VJ @@ -11794,26 +12142,21 @@ VJ VJ VJ VJ +Uf VJ +ov +XL +NG +NG +XL +ov +wJ +wJ VJ VJ VJ VJ VJ -RX -gM -gM -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG VJ VJ VJ @@ -11823,13 +12166,37 @@ VJ VJ VJ VJ -Fp +wJ +wJ +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv +mr +XY +XL +uf +zz +tJ +uf zp -oE -oE zp -Fp -VJ +zp +zp +uf VJ VJ VJ @@ -11842,14 +12209,15 @@ VJ VJ VJ VJ +Uf VJ VJ VJ VJ -Xi -Ox -Ox -Xi +CT +rS +rS +CT Ox Ox Ox @@ -11951,16 +12319,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -11970,12 +12328,24 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ ov XL NG NG XL ov +wJ +wJ VJ VJ VJ @@ -11991,10 +12361,8 @@ VJ VJ VJ VJ -VJ -VJ -VJ -RX +wJ +MJ gM gM my @@ -12008,21 +12376,21 @@ Ox Ox Ox pG -VJ -VJ -VJ -ov -ov -ov -ov -ov -ov -ov -ov -oD -oD -ov -ov +gM +gM +Xv +mr +qW +XL +XL +NG +NG +uf +uf +uf +uf +uf +uf ov ov ov @@ -12035,15 +12403,15 @@ ov ov ov ov +zE ov ov ov ov ov -Fp pq to -Fp +ov Ox Ox Ox @@ -12145,16 +12513,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -12164,12 +12522,24 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ ov XL NG NG XL ov +wJ +wJ VJ VJ VJ @@ -12184,11 +12554,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -RX +wJ +wJ +Fp gM gM my @@ -12202,17 +12570,13 @@ uS uS uS uD -VJ -VJ -VJ +gM +gM +Xv ov XL XL XL -XL -XL -XL -XL NG NG XL @@ -12232,12 +12596,16 @@ XL XL XL XL +pp +zE +ne +XL XL ov qJ MQ HA -Xi +CT Ox Ox Ox @@ -12339,16 +12707,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -12358,12 +12716,24 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ ov XL NG NG XL ov +wJ +wJ VJ VJ VJ @@ -12378,10 +12748,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ +wJ +wJ +ZD gM gM gM @@ -12396,9 +12765,8 @@ gM gM gM gM -VJ -VJ -VJ +gM +Xv ov XL xR @@ -12422,16 +12790,16 @@ NG NG NG NG -NG -NG -NG +UM +vI +lE NG NG zx pq XN HA -Xi +CT Ox Ox Ox @@ -12533,16 +12901,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -12552,12 +12910,24 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ ov XL NG NG XL ov +wJ +wJ VJ VJ VJ @@ -12572,10 +12942,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ +wJ +wJ +ZD gM gM gM @@ -12590,9 +12959,8 @@ gM gM gM gM -VJ -VJ -VJ +gM +Xv ov XL xR @@ -12616,16 +12984,16 @@ NG NG NG NG +UM +vI +lE NG NG -NG -NG -NG -zx -Rp -dl -Sq -Xi +HM +MQ +SU +HA +CT Ox Ox Ox @@ -12727,33 +13095,9 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ VJ VJ VJ -ov -XL -NG -NG -XL -ov -VJ -VJ VJ VJ VJ @@ -12768,25 +13112,49 @@ VJ VJ VJ VJ +Uf VJ -VJ -NQ +ov +XL +NG +NG +XL +ov +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +Fp mw gM gM -gM +wz NQ -gM -gM -gM -gM -gM -gM -gM -gM -VJ -VJ -VJ +de +de +de +de +de +de +de +de +de +de +XQ ov XL xR @@ -12810,16 +13178,16 @@ XL XL XL XL -XL -XL -XL +SJ +Mo +Vo XL XL ov -iD -iD -iD -Fp +MQ +SU +HA +ov Ox Ox Ox @@ -12921,31 +13289,8 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ VJ VJ -ov -XL -NG -NG -XL -ov VJ VJ VJ @@ -12957,19 +13302,42 @@ VJ VJ VJ VJ -Hu -Hu VJ VJ VJ VJ +Uf VJ -Fp -Fp +ov +Sj +Qp +Qp +Sj +ov +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +ov +ov aw CU -Fp -Fp +ov +ov VJ VJ VJ @@ -13005,15 +13373,15 @@ Xz ov ov ov +zK ov ov ov ov +MQ +SU +HA ov -Fp -Fp -Fp -Fp Ox Ox Ox @@ -13113,35 +13481,8 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -ov -XL -NG -NG -XL -ov -VJ -VJ +Ox +Ox VJ VJ VJ @@ -13151,21 +13492,48 @@ VJ VJ VJ VJ -gj -Ke VJ VJ VJ VJ VJ -VR +ov +ov +ov +ov +ov +ov +XL +NG +NG +XL +KH +KH +KH +KH +KH +KH +KH +KH +Sj +Sj +Sj +KH +KH +KH +KH +KH +KH +KH +aQ +ov yU Jj aM Hk -VR -VJ +Sj VJ +mu VJ VJ VJ @@ -13181,33 +13549,33 @@ NG NG XL ov -wJ -wJ -wJ -wJ -Ao +nw +nw +nw +nw +xd LW -Ao -Ao -Ao -Ao -Ao +xd +xd +xd +xd +xd fU -wJ -wJ -Ao -wJ -wJ -wJ -wJ -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ +nw +nw +xd +nw +nw +nw +Jc +nw +nw +nw +ov +MQ +SU +HA +ov Ox Ox Ox @@ -13309,34 +13677,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -ov -XL -NG -NG -XL -ov -VJ -VJ -VJ VJ VJ VJ @@ -13351,13 +13691,41 @@ VJ VJ VJ VJ -VJ -VR +ov +Ou +VI +VI +VI +VI +TR +xR +xR +Vd +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +TR +Zg +Sj AB -Hu +SU SH -wJ -Fp +Sc +ov Fp Fp Fp @@ -13375,33 +13743,33 @@ NG NG XL aQ -Ao -Ao -Ao -Ao -Ao +xd +xd +xd +xd +xd fU -wJ -wJ -wJ -wJ -Ao +nw +nw +nw +nw +xd LW -Ao -Ao -Ao -wJ -wJ -wJ -wJ -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ +xd +xd +xd +xd +xd +xd +oo +xd +xd +xd +aQ +MQ +SU +HA +CT Ox Ox Ox @@ -13503,35 +13871,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -ov -XL -NG -NG -XL -ov -VJ -VJ -VJ -VJ VJ VJ VJ @@ -13546,12 +13885,41 @@ VJ VJ VJ VJ -VR +ov +eR +rS +rS +rS +rS +Ae +xR +xR +eR +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +Ae +Zg +Sj ES Jj ah qf -Fp +ov wJ wJ wJ @@ -13569,33 +13937,33 @@ NG NG XL ov -yN -tq -wJ -wJ -wJ +Np +OE +nw +nw +nw fU -wJ -wJ -wJ -wJ -wJ +nw +nw +nw +nw +nw fU -wJ -wJ -Ao -wJ -wJ -wJ -wJ -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ +nw +nw +xd +nw +fU +fU +ib +nw +nw +nw +ov +MQ +SU +HA +CT Ox Ox Ox @@ -13697,16 +14065,7 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox +VJ VJ VJ VJ @@ -13717,35 +14076,44 @@ VJ VJ VJ ov -XL -NG -NG -XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -Fp +ov +ov +ov +MX +Eb +Eb +Eb +Eb +nY +xR +xR +MX +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +nY +Zg +ov +ov Nd al -Fp -Fp +ov +ov wJ wJ wJ @@ -13763,33 +14131,33 @@ NG NG XL ov -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT fU LW fU -fU -Fp -Fp -Fp -Fp -Fp -VJ -VJ -VJ -VJ -VJ +fU +fU +fU +ib +ib +nw +ov +Rp +dl +Sq +CT Ox Ox Ox @@ -13891,16 +14259,7 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox +VJ VJ VJ VJ @@ -13912,34 +14271,43 @@ VJ VJ ov XL +XL +XL +XL +XL +XL +XL +XL +XL +XL NG NG XL -ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL Jl -oE -gU +NG +YL Jl -Fp +ov wJ wJ wJ @@ -13957,33 +14325,33 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ -Ao -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw +xd +nw +nw +nw +fU +fU +fU +ew +hT +mN +mN +RK +ov Ox Ox Ox @@ -14088,26 +14456,50 @@ VJ VJ VJ VJ -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Fp -ov -ov -ov -ov -ov -ov -ov -ov +VJ +VJ +VJ +VJ +VJ +VJ +VJ ov XL NG NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +YL XL ov ov @@ -14122,62 +14514,38 @@ ov ov ov ov -ov -ov -ov -ov -ov -ov -ov XL NG -YL +NG XL ov +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw +xd +nw +nw +FT +FT +FT +zA +FT ov ov ov ov ov -ov -ov -ov -ov -ov -ov -ov -XL -NG -NG -XL -ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ -Ao -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ Ox Ox Ox @@ -14284,46 +14652,46 @@ VJ VJ VJ VJ -Fp -Fp -Fp -Fp -Fp -Fp -XL -XL -XL -XL -XL -XL -XL -XL -XL +ov +ov +ov +ov +ov +ov XL NG NG -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG NG NG XL @@ -14345,26 +14713,26 @@ NG NG XL ov +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw +xd +nw +nw +FT VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ -Ao -wJ -wJ -Fp -VJ -VJ +Uf VJ VJ VJ @@ -14478,46 +14846,46 @@ VJ VJ VJ VJ -Fp -zp -zp -zp -zp -zp +ov +XL +XL +XL +XL +XL XL NG NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL NG NG NG @@ -14539,25 +14907,25 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw XX -wJ -wJ -Fp -VJ +nw +nw +FT +Uf VJ VJ VJ @@ -14672,38 +15040,7 @@ VJ VJ VJ VJ -VJ -oE -oE -oE -oE -oE -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG +ov NG NG NG @@ -14712,6 +15049,37 @@ NG NG NG NG +XL +KH +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +KH +KH +KH +XL NG NG NG @@ -14733,25 +15101,25 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw XX -wJ +nw If -Fp -VJ +FT +Uf VJ VJ VJ @@ -14866,86 +15234,86 @@ VJ VJ VJ VJ -VJ -oE -oE -oE -oE -oE +ov +NG NG NG NG -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL NG NG -XL -XL -XL -XL -XL NG NG XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +Sc +Sc +KH XL +NG +NG XL XL XL XL XL -XL -XL -XL -XL -ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -Fp -Fp -Fp -Fp -Fp -VJ +NG +NG +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +ov +nw +nw +nw +nw +nw +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Uf VJ VJ VJ @@ -15060,42 +15428,42 @@ VJ VJ VJ VJ -Fp -zp -oE -oE -oE -oE +ov +XL +NG +NG +NG +NG NG NG NG XL -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS ov ov ov @@ -15121,6 +15489,12 @@ ov ov ov ov +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -15132,13 +15506,7 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -15254,57 +15622,73 @@ VJ VJ VJ VJ -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +MM +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -15315,23 +15699,7 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -15448,73 +15816,73 @@ gM gM gM gM -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -zp -oE -oE -zp -oE -zp +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +XL +NG +XL +NG +NG +XL +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -15631,46 +15999,10 @@ NT NT NT NT -NT -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +NT +Ox +Ox +Ox VJ VJ VJ @@ -15678,37 +16010,73 @@ VJ VJ VJ VJ -Fp -zp -oE -oE +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -15836,73 +16204,73 @@ VJ VJ VJ VJ -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -Fp -Fp -zp -oE -oE -zp -Fp -Fp -Fp +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +ov +ov XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +ov +ov +XL +NG +NG +XL +ov +nw +nw +nw +nw +nw +nw +nw +FT +FT +FT +FT +FT +FT +FT +FT +FT VJ VJ VJ @@ -16030,65 +16398,65 @@ VJ VJ VJ VJ -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -16191,68 +16559,32 @@ NT NT NT NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE -oE -zp -zp -zp -zp -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT VJ VJ VJ @@ -16260,29 +16592,65 @@ VJ VJ VJ VJ -Fp -zp -oE -zp -oE -oE -zp -oE -zp +ov +XL +NG +NG +NG +XL +XL +XL +XL +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +XL +NG +XL +NG +NG +XL +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -16418,65 +16786,65 @@ Ox Ox VJ VJ -Fp -zp -oE -oE -oE -Xi -Fp -Fp -Fp -Fp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE +ov +XL +NG +NG +NG +CT +ov +ov +ov +ov +ov +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -16612,16 +16980,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -zp -zp -zp -Fp -VJ +CT +XL +NG +NG +NG +XL +XL +XL +ov +ov VJ VJ VJ @@ -16648,29 +17016,29 @@ VJ VJ VJ VJ -Fp -Fp -Fp -zp -oE -oE -zp -Fp -Fp -Fp +ov +ov +ov XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +ov +ov +XL +NG +NG +XL +ov +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -16806,16 +17174,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -16842,29 +17210,29 @@ VJ VJ VJ VJ -Fp -zp -oE -oE +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17000,16 +17368,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -17036,29 +17404,29 @@ VJ VJ VJ VJ -Fp -zp -oE -zp -oE -oE -zp -oE -zp +ov +XL +NG +XL +NG +NG +XL +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17194,16 +17562,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -17230,29 +17598,29 @@ VJ VJ VJ VJ -Fp -zp -oE -oE +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17388,16 +17756,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -Fp -VJ +CT +XL +NG +NG +NG +NG +NG +NG +ov +ov VJ VJ VJ @@ -17424,29 +17792,29 @@ VJ VJ VJ VJ -Fp -Fp -zp -zp -zp -zp -zp -zp -Fp -Fp +ov +ov +XL +XL +XL +XL +XL +XL +ov +ov XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17582,16 +17950,16 @@ NT Ox VJ VJ -Fp -zp -zp -zp -zp -zp -oE -oE -Fp -VJ +ov +XL +XL +XL +XL +XL +NG +NG +ov +ov VJ VJ VJ @@ -17618,29 +17986,29 @@ VJ VJ VJ VJ -Fp -Fp -Fp -Fp -Fp -Fp +ov +ov +ov +ov +ov +ov wQ -Fp -Fp -Fp +ov +ov +ov XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17776,17 +18144,16 @@ NT Ox VJ VJ -kd -JQ -JQ -JQ -kd -zp -oE -oE -zp -VJ -VJ +Om +Sj +Sj +Sj +Om +XL +NG +NG +XL +ov VJ VJ VJ @@ -17813,6 +18180,7 @@ VJ VJ VJ VJ +KO wJ wJ wJ @@ -17827,14 +18195,14 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17970,17 +18338,16 @@ NT Ox VJ VJ -JQ -Ox -Ox -Ox -JQ -zp -oE -oE -zp -VJ -VJ +sj +rS +rS +rS +sj +XL +NG +NG +XL +ov VJ VJ VJ @@ -18007,6 +18374,7 @@ VJ VJ VJ VJ +KO wJ wJ wJ @@ -18021,21 +18389,21 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +jm +jm +jm +jm +jm jm jm jm -pZ -pZ -pZ -pZ -pZ jm jm jm @@ -18164,17 +18532,16 @@ NT Ox VJ VJ -JQ -Ox -Ox -Ox -zp -zp -oE -oE -zp -VJ -VJ +sj +rS +rS +rS +Bb +XL +NG +NG +XL +ov VJ VJ VJ @@ -18201,6 +18568,7 @@ VJ VJ VJ VJ +KO wJ wJ wJ @@ -18215,13 +18583,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -18352,28 +18720,22 @@ NT NT NT NT -NT -NT -NT -Ox -VJ -VJ -JQ -Ox -Ox -Ox -zp -zp -oE -oE -zp -VJ -VJ -VJ -VJ -VJ +NT +NT +NT +Ox VJ VJ +sj +rS +rS +rS +Bb +XL +NG +NG +XL +ov VJ VJ VJ @@ -18400,6 +18762,12 @@ VJ VJ VJ VJ +KO +KO +KO +KO +KO +KO VO VO jS @@ -18409,13 +18777,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -18427,10 +18795,10 @@ pZ pZ pZ jm -Fp -Fp -Fp -Fp +eW +eW +eW +eW VJ VJ VJ @@ -18552,17 +18920,16 @@ NT Ox VJ VJ -JQ -Ox -Ox -Ox -JQ -zp -oE -oE -zp -VJ -VJ +sj +rS +rS +rS +sj +XL +NG +NG +XL +ov VJ VJ VJ @@ -18589,6 +18956,7 @@ VJ VJ VJ VJ +KO VJ VJ VJ @@ -18603,28 +18971,28 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ pZ jZ -Ox +Kx FO pZ pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -18746,17 +19114,16 @@ NT Ox VJ VJ -kd -JQ -JQ -JQ -kd -zp -oE -oE -zp -VJ -VJ +Om +Sj +Sj +Sj +Om +XL +NG +NG +XL +ov VJ VJ VJ @@ -18783,6 +19150,7 @@ VJ VJ VJ VJ +KO VJ VJ VJ @@ -18797,13 +19165,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -18815,10 +19183,10 @@ OM pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -18940,23 +19308,16 @@ NT Ox VJ VJ -Fp -zp -zp -zp -zp -zp -oE -oE -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +ov +XL +XL +XL +XL +XL +NG +NG +ov +ov VJ VJ VJ @@ -18982,6 +19343,13 @@ VJ VJ VJ VJ +Lf +Lf +Lf +Lf +Lf +Lf +KO VO au hD @@ -18991,13 +19359,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19009,10 +19377,10 @@ OM pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -19134,21 +19502,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -Fp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +NG +NG +NG +NG +NG +NG +ov +ov VJ VJ VJ @@ -19174,7 +19537,12 @@ VJ VJ VJ VJ -KO +Lf +nv +Il +Il +nv +Lf KO VO JX @@ -19185,13 +19553,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19203,10 +19571,10 @@ OM pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -19328,21 +19696,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -19368,7 +19731,12 @@ VJ VJ VJ VJ -KO +Lf +nv +Il +Il +nv +Lf wJ wJ gA @@ -19379,13 +19747,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19397,10 +19765,10 @@ OM pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -19522,21 +19890,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -19562,7 +19925,12 @@ VJ VJ VJ VJ -KO +Lf +nv +Il +Il +nv +Lf wJ wJ wJ @@ -19573,13 +19941,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19716,21 +20084,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -19756,7 +20119,12 @@ VJ VJ VJ VJ -KO +Lf +nv +Il +Il +nv +Lf wJ wJ wJ @@ -19767,13 +20135,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19784,10 +20152,10 @@ OM OM pZ pZ -fT -Ox -Ox -Ox +JQ +Kx +Kx +Kx JQ VJ VJ @@ -19910,21 +20278,16 @@ NT Ox VJ VJ -Xi -zp -zp -zp -zp -zp -zp -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +XL +XL +XL +XL +XL +XL +ov +ov VJ VJ VJ @@ -19950,24 +20313,29 @@ VJ VJ VJ VJ -KO -KO +Lf +nv +Il +Il +nv +Lf +Lf lB -KO -KO -KO -KO -NG -NG +Lf +Lf +Lf +Lf +Qp +cL ov ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19979,9 +20347,9 @@ OM pZ pZ fT -Ox -Ox -Ox +Kx +Kx +Kx JQ VJ VJ @@ -20104,20 +20472,15 @@ NT NT VJ VJ -Fp -Xi -Xi -Xi -Xi -Xi -Fp -Fp -Fp -VJ -VJ -VJ -VJ -VJ +ov +CT +CT +CT +CT +CT +ov +ov +ov VJ VJ VJ @@ -20144,24 +20507,29 @@ VJ VJ VJ VJ -Ti -Ti -Ti -Ti -Ti +Lf +nv +Il +Il +nv +nv +nv +nv +nv +nv fD -KO +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -20172,10 +20540,10 @@ pZ pZ pZ pZ -fT -Ox -Ox -Ox +VR +Kx +Kx +Kx JQ VJ VJ @@ -20333,29 +20701,29 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -Hu -Hu -Hu -Hu +Lf +nv +Il +Il +Il +Il +Il +Il +Il Ym Ym -KO +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +pF jm jm jm @@ -20527,30 +20895,30 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -Hu -Hu -Hu -Hu +Lf +nv +Il +Il +Il +Il +Il +Il +Il Nu Nu -KO -NG +Lf +pl NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +pF +eW VJ VJ VJ @@ -20721,30 +21089,30 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -Ti -Hu -Hu -Ti -Ti +Lf +nv +nv +On +nv +nv +Il +Il +On +nv fD -KO +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +pF +eW VJ VJ VJ @@ -20914,31 +21282,31 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -KO -KO +Lf +Lf +Lf +Lf +Lf +Lf xY xY -KO -KO -KO -KO +Lf +Lf +Lf +Lf +Lf NG NG ov ov ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +eW VJ VJ VJ @@ -21108,17 +21476,17 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -KO +Lf +nv +nv +nv +Lf fD -Hu -Hu +Il +Il fD -KO +Lf +Lf Wy XL NG @@ -21126,13 +21494,13 @@ NG pA iE ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +eW VJ VJ VJ @@ -21302,16 +21670,16 @@ VJ VJ VJ VJ -VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu +Lf +nv +Il +Il +Il +Il +Il +Il +Il +Il Pr NG NG @@ -21320,13 +21688,13 @@ NG pA iE ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +ov +ov +pF +pF +pF +pF +eW VJ VJ VJ @@ -21496,31 +21864,31 @@ VJ VJ VJ VJ -VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu +Lf +nv +Il +Il +Il +Il +Il +Il +Il +Il Pr NG NG NG NG -XL -XL +NG +NG +NG +NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -21690,31 +22058,31 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -KO +Lf +nv +nv +nv +Lf fD -Hu -Hu +Il +Il fD -KO +Lf +Lf Wy XL NG -NG -XL -XL -ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +bM +NG +NG +NG +NG +ov +pF +pF +pF +pF +eW VJ VJ VJ @@ -21884,31 +22252,31 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -KO -KO +Lf +Lf +Lf +Lf +Lf +Lf xY xY -KO -KO -KO -KO +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf NG NG -XL -XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -22083,26 +22451,26 @@ VJ VJ VJ VJ -VJ -KO -Hu -Hu -KO -wJ -wJ -KO +Lf +Il +Il +Lf +Ea +Ea +Ea +Ea +Ea +Ea +Ea +Lf NG NG -XL -XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -22277,26 +22645,26 @@ VJ VJ VJ VJ -VJ -KO -Hu -Hu -KO -wJ -wJ -KO -NG -NG +Lf +Il +Il +Lf +Ea +Ea +Ea +Ea +Ea +Ea +Ea +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -22471,26 +22839,26 @@ VJ VJ VJ VJ -VJ -VJ -Hu -Hu -KO -wJ -wJ -KO -NG -NG +Lf +Il +Il +Lf +Ea +Ea +Ea +Ea +Ea +Ea +Ea +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -22665,26 +23033,26 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -KO -wJ -wJ -KO -KO -KO -KO -KO -KO -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Lf +Il +Il +Lf +Ea +Ea +Ea +Ea +Ea +Ea +Ea +Lf +bI +bI +Lf +pF +pF +pF +pF +eW VJ VJ VJ @@ -22859,26 +23227,26 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -KO -KO -KO -KO -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Lf +Il +Il +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Il +Il +Lf +eW +eW +eW +eW +eW VJ VJ VJ @@ -23053,21 +23421,21 @@ VJ VJ VJ VJ -VJ -OM -OM -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -OM -OM -VJ +Lf +kE +kE +Il +Il +Il +Il +Il +Il +Il +Il +Il +kE +kE +Lf VJ VJ VJ @@ -23247,21 +23615,21 @@ VJ VJ VJ VJ -VJ -OM -OM -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -OM -OM -VJ +Lf +kE +kE +Il +Il +Il +Il +Il +Il +Il +Il +Il +kE +kE +Lf VJ VJ VJ @@ -23441,21 +23809,21 @@ VJ VJ VJ VJ -VJ -OM -OM -VJ -VJ -KO -KO -KO -KO -KO -VJ -VJ -OM -OM -VJ +Lf +kE +kE +Il +Il +Il +Il +Il +Il +Il +Il +Il +kE +kE +Lf VJ VJ VJ @@ -23635,21 +24003,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Hu -Hu -VJ +Lf +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Lf VJ VJ VJ @@ -23829,21 +24197,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Hu -Hu -VJ +Lf +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Lf VJ VJ VJ @@ -24023,21 +24391,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -OM -OM -OM -OM -OM -OM -OM -OM -OM -Hu -Hu -VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -24217,21 +24585,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -OM -OM -OM -OM -OM -OM -OM -OM -OM -Hu -Hu -VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -24411,21 +24779,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -OM -OM -Hu -Hu -Hu -Hu -Hu -OM -OM -Hu -Hu -VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -24605,26 +24973,26 @@ VJ VJ VJ VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -VJ -VJ -VJ -VJ -VJ -VJ +Lf +Il +Il +yJ +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Il +Lf +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -24799,21 +25167,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -VJ +Lf +Il +Il +yJ +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Il +Lf VJ VJ VJ @@ -24993,21 +25361,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -VJ +Lf +Il +Il +yJ +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Il +Lf VJ VJ VJ @@ -25187,21 +25555,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -VJ +Lf +Il +Il +yJ +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Il +Lf VJ VJ VJ @@ -25381,21 +25749,21 @@ VJ VJ VJ VJ -VJ -VJ -VJ -OM -OM -Hu -Hu -Hu -Hu -Hu -OM -OM -VJ -VJ -VJ +Lf +Il +Il +kE +kE +kE +Lf +Lf +Lf +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -25575,21 +25943,21 @@ VJ VJ VJ VJ -VJ -VJ -VJ -OM -OM -OM -OM -OM -OM -OM -OM -OM -VJ -VJ -VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -25769,21 +26137,21 @@ VJ VJ VJ VJ -VJ -VJ -VJ -OM -OM -OM -OM -OM -OM -OM -OM -OM -VJ -VJ -VJ +Lf +Il +Lf +kE +kE +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Lf VJ VJ VJ @@ -25959,28 +26327,28 @@ Ox Ox Ox Ox -VJ -VJ -VJ -VJ -VJ -VJ -KO -wJ -wJ -wJ -Hu -Hu -Hu -wJ -wJ -wJ KO VJ VJ VJ +Lf +Il +Lf +Lf +Lf +Lf +kE +kE +kE +Lf +Lf +Lf +Lf +Il +Lf VJ VJ +KO Ox Ox Ox @@ -26153,28 +26521,28 @@ Ox Ox Ox Ox -VJ -VJ KO VJ -VJ -VJ -KO -OM -OM -OM -Hu -Hu -Hu -OM -OM -OM KO VJ +Lf +Il +Lf +kE +kE +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Lf VJ VJ -VJ -VJ +KO Ox Ox Ox @@ -26347,28 +26715,28 @@ Ox Ox Ox Ox -VJ -VJ KO VJ -VJ -VJ -KO -OM -OM -OM -Hu -Hu -Hu -OM -OM -OM KO VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ -VJ -VJ +KO Ox Ox Ox @@ -26541,28 +26909,28 @@ Ox Ox Ox Ox -VJ -VJ KO -VJ -VJ -VJ KO -OM -OM -OM -Hu -Hu -Hu -OM -OM -OM KO VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ -VJ -VJ -VJ +KO +KO Ox Ox Ox @@ -26739,23 +27107,23 @@ Ox Ox KO VJ -VJ -VJ -KO +Lf +Il +Il jR jR jR -Hu -Hu -Hu +Il +Il +Il jR jR jR -KO -VJ -VJ -VJ +Lf +Il +Lf VJ +KO Ox Ox NT @@ -26931,25 +27299,25 @@ Ox NT Ox Ox -VJ -VJ -VJ -VJ KO -Ti -Ti -Ti +KO +Lf +Lf +Lf +nv +nv +nv WT -Hu -Hu -Ti -Ti -Ti +Il +Il +nv +nv +nv +Lf +Lf +Lf +KO KO -VJ -VJ -VJ -VJ Ox Ox NT @@ -27129,17 +27497,17 @@ Ox Ox Ox Ox -Xi -Ti -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Ti -Xi +DX +nv +Il +Il +Il +Il +Il +Il +Il +nv +DX Ox Ox Ox @@ -27323,17 +27691,17 @@ Ox Ox Ox Ox -Xi -Ti -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Ti -Xi +DX +nv +Il +Il +Il +Il +Il +Il +Il +nv +DX Ox Ox Ox @@ -27517,17 +27885,17 @@ Ox Ox Ox Ox -Xi -Ti -Hu -Hu -OM -OM -OM -Hu -Ox -Ox -Xi +DX +nv +Il +Il +kE +kE +kE +Il +FV +yE +DX Ox Ox Ox @@ -27711,17 +28079,17 @@ Ox Ox Ox Ox -KO -Ti -Hu -Hu -OM -OM -OM -Hu -Ox -Ox -KO +Lf +nv +Il +Il +kE +kE +kE +Il +YM +MD +Lf Ox Ox Ox @@ -27906,15 +28274,15 @@ Ox Ox VJ WW -Ti -Ti -Ti -OM -OM -OM -Ti -Ti -Ti +nv +nv +nv +kE +kE +kE +nv +nv +nv WW VJ Ox @@ -28101,13 +28469,13 @@ Ox VJ WW WW -Ti -Ti -Ti -Ti -Ti -Ti -Ti +nv +nv +nv +nv +nv +nv +nv WW WW VJ @@ -28296,11 +28664,11 @@ VJ VJ WW ih -KO +Lf ih ih ih -KO +Lf ih WW VJ diff --git a/maps/euthenia/levels/deck1.dmm b/maps/euthenia/levels/deck1.dmm index 5e91da2e00..4712a295e6 100644 --- a/maps/euthenia/levels/deck1.dmm +++ b/maps/euthenia/levels/deck1.dmm @@ -1,4 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aav" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/floor/reinforced, +/area/security/tactical) "aax" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -30,10 +34,18 @@ /obj/machinery/power/solar_control, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/solars) -"acO" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/space) +"acq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "acZ" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -51,6 +63,13 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/sleep/Dorm_8) +"adB" = ( +/obj/spawner/window/reinforced/full/firelocks, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "adC" = ( /obj/machinery/door/airlock/command{ id_tag = "captaindoor"; @@ -70,12 +89,21 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"aeM" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +"aeH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "aeO" = ( /obj/structure/railing{ dir = 1 @@ -121,6 +149,15 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) +"agF" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/shower{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "agL" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -161,6 +198,17 @@ "aiY" = ( /turf/simulated/wall/r_wall, /area/rnd/xenobiology/xenoflora) +"ajH" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck1/fore) +"ajP" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "ajS" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -172,18 +220,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) -"ajY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) "akc" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 1 @@ -213,6 +249,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) +"akH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"akR" = ( +/obj/structure/stairs/spawner/north, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "akX" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 4 @@ -261,16 +306,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) -"alN" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/door/airlock/glass/research{ - name = "Fighter Bay"; - req_one_access = list(19,29,38,43,47,63,67) - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) "alR" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ @@ -328,13 +363,47 @@ /obj/machinery/door/window/brigdoor/southright, /turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) +"anf" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"anl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science"; + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "ano" = ( /turf/simulated/wall/prepainted/medical, /area/medical/surgery_hallway) +"anp" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/port) "anH" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "anX" = ( /turf/simulated/floor/tiled/steel_ridged, @@ -360,10 +429,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) -"apA" = ( -/obj/structure/catwalk, -/turf/simulated/open, -/area/space) "apD" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -428,6 +493,22 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) +"atW" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "auP" = ( /obj/machinery/air_alarm{ pixel_y = 30 @@ -445,29 +526,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"auW" = ( -/obj/effect/floor_decal/industrial/halfstair, -/turf/simulated/floor/tiled, -/area/space) -"avn" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"avz" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "avO" = ( /obj/structure/table/hardwoodtable, /obj/item/stamp/denied{ @@ -483,11 +541,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"axd" = ( -/obj/structure/railing, -/obj/structure/window/reinforced, -/turf/simulated/open, -/area/space) "axh" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -500,6 +553,13 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck1) +"axU" = ( +/obj/machinery/shower{ + dir = 1 + }, +/obj/effect/mist, +/turf/simulated/floor/water/pool, +/area/bridge/hallway) "ayi" = ( /obj/machinery/button/remote/airlock{ id = "dorm6"; @@ -532,25 +592,14 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) -"azc" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay emergency access door."; - id = "MedbayEmergency"; - name = "Door Switch"; - pixel_x = -24; - pixel_y = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +"azw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/bar) "azB" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /turf/simulated/floor/carpet/oracarpet, @@ -573,6 +622,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/solars) +"aAR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "aBe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -580,7 +635,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "aBA" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -592,20 +647,29 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"aBL" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/beige, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "aBR" = ( /turf/simulated/wall/r_wall, /area/space) +"aCm" = ( +/obj/structure/cable/green, +/obj/machinery/power/solar, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "aCV" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck1) +"aDs" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "kitchen-c"; + name = "Kitchen Service Shutters" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/kitchen) "aDO" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 @@ -621,14 +685,8 @@ "aEg" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) -"aEl" = ( -/obj/machinery/atmospherics/component/unary/engine/biggest{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "aEt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -658,6 +716,12 @@ /obj/random/bedsheet, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) +"aFP" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/hallway/deck1) "aGB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -679,6 +743,18 @@ /obj/item/storage/box/donut, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"aHo" = ( +/obj/machinery/door/airlock/glass/security{ + name = "Locker Room"; + req_one_access = list(2) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/security/security_lockerroom) "aHx" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled, @@ -694,6 +770,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"aJv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "aJB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -719,32 +800,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) -"aKS" = ( -/obj/spawner/window/reinforced/full/firelocks, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) "aLc" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck1) -"aMO" = ( -/obj/machinery/button/remote/airlock{ - id = "bathroomlock100"; - name = "Bathroom Lock"; - pixel_x = -20; - pixel_y = -20; - specialfunctions = 4 - }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/white, -/area/space) "aNp" = ( /obj/structure/bed/double/padded, /obj/random/bedsheet/double, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"aNE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"aNW" = ( +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/main_map/maintenance/atmospheric_substation/medical) "aNY" = ( /obj/structure/sign/directions/evac{ dir = 1; @@ -752,20 +827,20 @@ }, /turf/simulated/wall, /area/main_map/hallway/deck1) -"aOe" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) +"aOJ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "aOO" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/mechbay) -"aPE" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/space) "aQa" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) @@ -777,21 +852,16 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"aRn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"aRg" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/lattice, +/obj/structure/sign/deck1{ + pixel_y = -32 }, -/turf/simulated/floor/wood, -/area/bridge/hallway) +/turf/simulated/open, +/area/main_map/maintenance/deck_one/port) "aRD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -813,6 +883,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) +"aRW" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) +"aSr" = ( +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/obj/effect/mist, +/turf/simulated/floor/water/pool, +/area/bridge/hallway) "aSs" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -831,7 +914,7 @@ pixel_y = -26; specialfunctions = 4 }, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -864,12 +947,6 @@ /obj/structure/closet/lawcloset, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officeb) -"aVt" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "aVu" = ( /obj/structure/undies_wardrobe, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -879,16 +956,10 @@ /area/crew_quarters/captain) "aWt" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 27 }, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) -"aXw" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/wall/prepainted/civilian, -/area/main_map/maintenance/deck_one) "aXK" = ( /obj/machinery/computer/med_data/laptop, /obj/structure/table/reinforced, @@ -915,6 +986,18 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) +"aYP" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"aZi" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rift/station/fighter_bay/hangar) "aZm" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/red/border, @@ -934,10 +1017,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"bak" = ( -/obj/machinery/computer/timeclock/premade/west, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) "bat" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -961,13 +1040,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/bar) -"bdb" = ( -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) "bdd" = ( /obj/structure/bed/chair{ dir = 4 @@ -983,14 +1055,12 @@ "bdQ" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/maintenance/security/port) -"beR" = ( -/obj/machinery/door/airlock{ - name = "Internal Affairs"; - req_access = list(38) +"bel" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officea) +/turf/simulated/floor/glass/reinforced, +/area/tether/surfacebase/security/hallway) "bfr" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -999,16 +1069,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) -"bgk" = ( -/obj/structure/bed/chair/comfy/purp{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +"bgf" = ( +/obj/structure/bed/chair/comfy/brown{ dir = 1 }, -/mob/living/simple_mob/humanoid/clown, +/obj/landmark/spawnpoint/job/assistant, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/recreation_area) +"bgq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced, +/area/security/tactical) "bia" = ( /obj/structure/table/steel, /obj/item/cell/device/weapon{ @@ -1025,12 +1108,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) -"biS" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "bja" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck" @@ -1047,6 +1124,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) +"bjM" = ( +/obj/machinery/iv_drip, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "bjV" = ( /obj/machinery/optable, /obj/machinery/oxygen_pump/anesthetic{ @@ -1063,24 +1144,20 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"bkw" = ( -/obj/structure/sink/kitchen{ - dir = 8; - name = "sink"; - pixel_x = 13 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) -"bkx" = ( +"bkH" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/shuttle_control/emergency, +/turf/simulated/floor/tiled/steel_grid, +/area/space) +"bkY" = ( /obj/structure/railing{ - dir = 4 + dir = 1 }, /obj/structure/railing{ dir = 8 }, -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "bla" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 @@ -1107,12 +1184,69 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora) +"blP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/junction/yjunction, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"blY" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"bmu" = ( +/obj/machinery/door/window/westright{ + dir = 4; + name = "Bar"; + req_access = list(25); + req_one_access = list(25) + }, +/obj/machinery/door/window/eastleft{ + dir = 8; + name = "Kitchen"; + req_one_access = list(28) + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bmy" = ( /obj/structure/railing/grey{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"bmI" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "bmJ" = ( /obj/effect/floor_decal/corner/paleblue/bordercee{ dir = 1 @@ -1148,6 +1282,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"boO" = ( +/obj/machinery/holopad, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/lino, +/area/security/detectives_office) "bph" = ( /obj/machinery/requests_console/preset/security{ pixel_y = 30 @@ -1199,6 +1339,36 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"brn" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) +"brK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/junction/flipped{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"brX" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/obj/structure/table/standard, +/obj/random/soap, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "bsP" = ( /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 @@ -1229,9 +1399,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) -"btn" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/space) +"bts" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "buO" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -1259,27 +1432,22 @@ /obj/item/bodybag/cryobag, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"bve" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) "bvn" = ( /obj/effect/floor_decal/corner/white/border{ dir = 9 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_2) -"bvw" = ( -/obj/structure/bed/chair/comfy/blue, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +"bvW" = ( +/obj/machinery/door/airlock/engineering{ + name = "Hangar Substation" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) +"bvZ" = ( +/obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck1) "bwN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1331,6 +1499,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"bAg" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "bAX" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 8 @@ -1348,36 +1523,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) -"bBH" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/Hangar_bay/deck1/a) -"bBN" = ( -/obj/machinery/door/blast/regular{ - dir = 8; - id = "armorytactical"; - name = "Tactical Armory Access" - }, -/turf/simulated/floor/reinforced, -/area/security/tactical) -"bCn" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/space) -"bCq" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/reinforced/airless, -/area/space) "bDO" = ( /obj/structure/grille, /obj/structure/girder/reinforced, @@ -1386,12 +1531,6 @@ "bEp" = ( /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"bFy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) "bFR" = ( /obj/machinery/door/airlock/engineering{ name = "Solars"; @@ -1400,12 +1539,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/solars) -"bFU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1) "bGk" = ( /obj/structure/table/steel, /obj/item/folder/red, @@ -1440,6 +1573,19 @@ /obj/item/clothing/mask/gas/half, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) +"bHe" = ( +/obj/machinery/door/airlock/glass/security/polarized{ + id_tag = "detdoor"; + id_tint = "det_office"; + name = "Detective's Office"; + req_access = list(4) + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "bHp" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Elevator Shaft Access"; @@ -1477,15 +1623,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_3) -"bLa" = ( -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/obj/structure/cable/heavyduty{ - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "bLn" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -1502,20 +1639,45 @@ "bLI" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"bLP" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "bLT" = ( /turf/simulated/floor/tiled/white, /area/medical/surgery2) -"bMX" = ( -/obj/structure/railing{ - dir = 1 +"bMn" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 4; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 }, -/obj/structure/railing{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/medical{ + dir = 8; + id_tag = "MedbayEmergency"; + name = "Medbay Emergency Access"; + req_one_access = list(5) + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "bNd" = ( /obj/structure/table/rack, /obj/item/tank/jetpack/oxygen, @@ -1524,18 +1686,21 @@ /obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) -"bNz" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +"bNE" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) -"bNS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) +"bOl" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bOP" = ( /obj/structure/table/steel_reinforced, /obj/item/reagent_containers/blood/OMinus, @@ -1567,6 +1732,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) +"bPh" = ( +/obj/machinery/button/windowtint{ + id = "det_office"; + pixel_x = -24; + pixel_y = 24 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "bPn" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 @@ -1596,6 +1773,13 @@ "bQH" = ( /turf/simulated/floor/carpet/arcadecarpet, /area/main_map/maintenance/deck_one/port) +"bRr" = ( +/obj/structure/closet/crate/biohazard, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/medical/surgery) "bRU" = ( /obj/structure/table/standard, /obj/item/stack/cable_coil, @@ -1610,6 +1794,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"bSb" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "bTt" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/industrial/outline/red, @@ -1740,6 +1930,12 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"bYo" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "bYD" = ( /obj/structure/railing{ dir = 8 @@ -1749,26 +1945,33 @@ }, /turf/simulated/open, /area/crew_quarters/recreation_area) +"bYV" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "armorylight"; + name = "Light Armory Acccess" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/security/armoury) "bZY" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor/hole, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"cab" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck1) "cal" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) -"cam" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) "cbe" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -1776,13 +1979,17 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "cbf" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/Hangar_bay/deck1/a) +"cbZ" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "ccE" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -1791,50 +1998,81 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, /area/medical/medbay) -"cee" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"cdY" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-8" }, +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) +"cex" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) -"ceP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/security/hallway) -"ceY" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officeb) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "cfT" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/hallway/deck1) -"chI" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-8" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" +"cgX" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"chn" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 9 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass/medical, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"chC" = ( +/obj/machinery/turnstile/entry{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"chG" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "chW" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -1851,19 +2089,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"ciA" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/starboard) -"cjx" = ( -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Fighter Bay Maintenance"; - req_one_access = list(19,29,38,43,47,63,67) - }, -/turf/simulated/floor/tiled/steel_grid, -/area/space) "cjB" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ @@ -1890,6 +2115,20 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"cko" = ( +/obj/machinery/conveyor_switch/oneway{ + pixel_y = 14 + }, +/obj/map_helper/conveyor/lever{ + id_tag = "_mobile_mining_interior"; + name = "Ore Processing" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/delivery) +"ckq" = ( +/obj/effect/mist, +/turf/simulated/floor/water/pool, +/area/bridge/hallway) "ckx" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/suit/armor/vest/wolftaur{ @@ -1931,6 +2170,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"clv" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "clX" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -1957,30 +2206,31 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) +"cmQ" = ( +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 4; + name = "Fighter Hangar"; + req_one_access = list(1,19,29,38,43,47,63,67) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "cmR" = ( /turf/simulated/floor/crystal, /area/space) -"cnj" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/recreation_area) -"cnu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"cnb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) +/turf/simulated/floor/lino, +/area/security/detectives_office) "cnv" = ( /obj/machinery/door/window/eastleft{ dir = 1 }, /obj/structure/cable/green, /obj/effect/floor_decal/steeldecal/steel_decals_central6, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/monotile, /area/security/forensics) "cnB" = ( @@ -2010,6 +2260,13 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/steel_grid, /area/main_map/Hangar_bay/deck1/a) +"cnV" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/briefingroom) "cos" = ( /obj/structure/table/steel, /obj/item/folder/red, @@ -2027,15 +2284,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_2) -"coX" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 +"cpB" = ( +/obj/machinery/conveyor, +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/delivery) "cpF" = ( /obj/structure/toilet{ dir = 4 @@ -2052,18 +2308,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) -"cqQ" = ( -/obj/structure/bed/chair/comfy/purp, -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24; - pixel_y = -5 +"cqI" = ( +/obj/machinery/door/blast/regular{ + dir = 4 }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) +/turf/simulated/floor/reinforced, +/area/main_map/Hangar_bay/deck1/a) +"crA" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) +"crH" = ( +/obj/machinery/cryopod/robot/door/shuttle, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck1) "csa" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -2091,6 +2355,22 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/tether/surfacebase/security/lobby) +"cuD" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "cuX" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing/grey{ @@ -2117,6 +2397,13 @@ /obj/structure/table/fancyblack, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/bar) +"cvu" = ( +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/starboard) "cvU" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -2172,6 +2459,38 @@ }, /turf/simulated/floor/carpet/oracarpet, /area/tether/surfacebase/security/iaa/officea) +"cyz" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"cyF" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/security/armoury) +"cyI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/bar) "cyQ" = ( /obj/machinery/light_switch{ pixel_x = -9; @@ -2208,7 +2527,7 @@ /obj/fiftyspawner/glass, /obj/fiftyspawner/glass, /turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) +/area/space) "cAw" = ( /turf/simulated/shuttle/wall/voidcraft/blue, /area/medical/medbay_emt_bay) @@ -2228,33 +2547,13 @@ /obj/machinery/papershredder, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"cBJ" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass/security{ - id_tag = "BrigFoyer"; - layer = 2.8; - name = "Security"; - req_one_access = list(38,63) - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "cBZ" = ( /turf/simulated/wall/r_wall, /area/security/riot_control) +"cCn" = ( +/obj/item/chess/bknight, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "cEi" = ( /obj/structure/table/steel, /obj/item/tool/crowbar, @@ -2293,36 +2592,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"cFn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/bar) "cFD" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"cGb" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) -"cGd" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/open, -/area/medical/medbay) "cGk" = ( /obj/machinery/button/remote/airlock{ id = "dorm1"; @@ -2356,7 +2628,7 @@ "cHK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) "cHM" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -2369,12 +2641,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_2) -"cIK" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 +"cJK" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/light/no_nightshift{ + dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/bar) +/area/bridge/hallway) "cKt" = ( /obj/structure/railing, /turf/simulated/open, @@ -2393,13 +2666,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"cNl" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/space) "cNI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -2410,18 +2676,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/warden) -"cNQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "kitchen-c"; - layer = 3.3; - name = "Kitchen Service Shutters" +"cOg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/crew_quarters/kitchen) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "cOt" = ( /obj/structure/closet/wardrobe, /turf/simulated/floor/wood, @@ -2435,6 +2698,18 @@ }, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_6) +"cPk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"cPn" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "cPo" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) @@ -2450,15 +2725,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"cPY" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/port) "cQb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) +"cQj" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "cQx" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -2483,6 +2758,12 @@ /obj/effect/floor_decal/corner/blue/bordercorner, /turf/simulated/floor/tiled/white, /area/medical/reception) +"cRj" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "cRE" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -2504,6 +2785,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"cSk" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "cSq" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/portables_connector{ @@ -2511,6 +2799,18 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"cSD" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "cTQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2562,16 +2862,36 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/aft/starboard) +"cVt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/structure/closet/l3closet/scientist/double, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "cWf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"cWt" = ( +/turf/simulated/wall/r_wall, +/area/rift/station/fighter_bay/hangar) "cWG" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing, /turf/simulated/floor/plating, /area/medical/medbay) +"cXs" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/quartermaster/delivery) "cXH" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -2579,10 +2899,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) -"cXP" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1/fore) "cZb" = ( /obj/structure/railing{ dir = 1 @@ -2595,13 +2911,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/deck_one) -"cZI" = ( -/obj/structure/sign/directions/evac{ - dir = 1; - pixel_y = 10 - }, -/turf/simulated/wall/r_wall, -/area/space) "cZP" = ( /turf/simulated/wall/r_wall, /area/security/tactical) @@ -2614,15 +2923,14 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) -"daD" = ( -/obj/machinery/power/apc/critical/east_bump, -/obj/structure/cable/green, -/turf/simulated/floor/tiled, -/area/space) -"dcp" = ( -/obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"daB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "dcS" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 4 @@ -2641,6 +2949,10 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"ddp" = ( +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/glass/reinforced, +/area/hydroponics) "ddC" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2657,11 +2969,6 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_4) -"des" = ( -/obj/machinery/door/airlock/multi_tile/glass, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/monotile, -/area/space) "deI" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(30,47,77) @@ -2698,18 +3005,6 @@ /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"dho" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) "dhu" = ( /turf/simulated/floor/carpet, /area/security/detectives_office) @@ -2741,15 +3036,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"djK" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/open, -/area/medical/medbay) "dkD" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -2763,6 +3049,17 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/medical/reception) +"dlF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"dlQ" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/rift/station/fighter_bay/hangar) "dme" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -2778,18 +3075,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"dpc" = ( -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) +"dmV" = ( +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/obj/effect/mist, +/turf/simulated/floor/water/pool, +/area/bridge/hallway) "dpu" = ( /obj/structure/table/steel_reinforced, /obj/machinery/recharger, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/dark, /area/medical/medbay) -"dpB" = ( -/turf/simulated/floor/tiled, -/area/space) "dpM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -2797,7 +3098,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "dqF" = ( /obj/machinery/camera/network/security{ @@ -2870,6 +3171,12 @@ /obj/structure/sign/deck/first, /turf/simulated/wall, /area/crew_quarters/bar) +"dux" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "dvm" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -2918,6 +3225,15 @@ }, /turf/simulated/floor/plating, /area/bridge/hallway) +"dvN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "dwD" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, @@ -2937,12 +3253,23 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"dwU" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "dwV" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) +"dxb" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "dxv" = ( /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) @@ -2981,79 +3308,70 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) +"dAH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "dAM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"dBY" = ( -/obj/structure/railing{ - dir = 1 +"dAO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled, +/area/security/security_lockerroom) "dCH" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) -"dDa" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "dDn" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/door/airlock/glass/security, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) -"dDz" = ( -/obj/structure/bed/chair{ - dir = 4 +"dDF" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled, -/area/rnd/research_foyer) -"dDE" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"dFw" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/lobby) -"dDU" = ( -/obj/machinery/appliance/cooker/grill, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/kitchen) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "dFP" = ( /obj/structure/sign/deck/first, /turf/simulated/wall/prepainted/medical, /area/medical/reception) -"dHn" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/main_map/maintenance/deck_one/port) -"dHC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"dIr" = ( -/obj/structure/table/marble, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/kitchen) "dJq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"dJz" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "dJT" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -3069,12 +3387,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"dKt" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) "dLJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -3097,13 +3409,11 @@ }, /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/sleep/Dorm_7) -"dNV" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/reinforced/airless, -/area/space) +"dNX" = ( +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "dOe" = ( /obj/machinery/iv_drip, /obj/effect/floor_decal/industrial/outline/blue, @@ -3161,30 +3471,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "dQq" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/robotics) -"dQt" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1) -"dRw" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/space) "dRI" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3204,6 +3496,12 @@ "dSS" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) +"dTl" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "dUq" = ( /obj/machinery/computer/security, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3242,12 +3540,12 @@ "dVR" = ( /obj/structure/closet/crate/solar, /turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) +/area/space) "dXV" = ( /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "dXW" = ( /obj/structure/flora/pottedplant/thinbush, @@ -3261,6 +3559,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) +"dYu" = ( +/obj/structure/table/marble, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/chemical_dispenser/catering/bar_alc, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) +"dYv" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/security/upper) "dYM" = ( /obj/structure/cable/heavyduty{ icon_state = "2-8" @@ -3277,6 +3588,22 @@ /obj/structure/railing/grey, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/Hangar_bay/deck1/a) +"dZj" = ( +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/captain) +"eaF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "ebc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3294,13 +3621,6 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/warden) -"ecf" = ( -/obj/structure/filingcabinet/tall, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/security/lobby) "ecv" = ( /obj/structure/closet/emcloset, /obj/machinery/light/no_nightshift{ @@ -3354,6 +3674,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"ege" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) +"egH" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/heads/chief) "egZ" = ( /turf/simulated/wall, /area/tether/surfacebase/security/iaa/officea) @@ -3380,10 +3710,24 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) +"eip" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "eiv" = ( /obj/machinery/appliance/mixer/candy, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"eiY" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "eja" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -3393,6 +3737,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"ejn" = ( +/obj/machinery/iv_drip, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "eju" = ( /obj/structure/closet/wardrobe/red, /obj/effect/floor_decal/industrial/outline/yellow, @@ -3407,17 +3765,20 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"ejG" = ( -/obj/structure/railing{ - dir = 4 +"ejM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/structure/railing, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/open, -/area/space) +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "ekp" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -3430,6 +3791,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"eks" = ( +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) "ekw" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -3443,6 +3807,41 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"eky" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/rnd{ + req_access = list(47) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/research/researchdivision) +"ekO" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) +"elf" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "elt" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloor{ @@ -3453,6 +3852,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"emI" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/structure/closet/crate/biohazard, +/turf/simulated/floor/tiled, +/area/medical/surgery2) "emJ" = ( /obj/structure/filingcabinet, /turf/simulated/floor/wood, @@ -3484,6 +3890,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"enK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "enT" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -3491,7 +3904,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) "eof" = ( /obj/structure/railing{ @@ -3507,6 +3920,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"eow" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "epg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3515,8 +3933,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) +"epn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/starboard) "epA" = ( -/obj/machinery/power/apc/critical/east_bump, +/obj/machinery/power/apc/critical/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3547,14 +3980,53 @@ }, /turf/simulated/floor/tiled, /area/medical/surgery2) +"eqV" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"eri" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/maintenance/security/port) "erm" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"erB" = ( +/obj/machinery/holopad, +/turf/simulated/floor/lino, +/area/security/detectives_office) "erM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"erP" = ( +/obj/machinery/door/airlock/command{ + id_tag = "captaindoor"; + name = "Facility Director's Office"; + req_access = list(20) + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "erU" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -3562,12 +4034,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"esd" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +"esp" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/red, -/area/space) +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "eth" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3588,6 +4060,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"etO" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/briefingroom) +"euS" = ( +/obj/structure/bed/chair/comfy/purp, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24; + pixel_y = -5 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_7) +"evz" = ( +/obj/structure/bed/chair/comfy/brown, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "evA" = ( /obj/structure/undies_wardrobe, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3629,6 +4122,19 @@ }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_2) +"exf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "eyg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3638,12 +4144,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) -"eyk" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "eym" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -3676,26 +4176,10 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/lobby) -"ezf" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - id = "MedbayFoyer"; - name = "Door Switch"; - pixel_x = 27; - pixel_y = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "eAb" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -3726,27 +4210,11 @@ /obj/landmark/spawnpoint/job/medical_doctor, /turf/simulated/floor/tiled/white, /area/medical/surgery2) -"eBr" = ( +"eBW" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/space) -"eBM" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/main_map/maintenance/deck_one/starboard) -"eBY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "eCl" = ( @@ -3777,11 +4245,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"eDy" = ( -/obj/structure/railing, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/space) +"eDE" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/detective, +/turf/simulated/floor/lino, +/area/security/detectives_office) "eDG" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -3824,19 +4294,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"eDU" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"eDV" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "eEa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -3900,6 +4357,10 @@ "eHd" = ( /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"eHz" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "eHE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3907,6 +4368,18 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"eIE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction/flipped{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "eJi" = ( /obj/structure/table/rack/shelf/steel{ pixel_y = -2 @@ -3929,7 +4402,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "eJR" = ( /obj/structure/cable/green{ @@ -3968,6 +4441,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"eMO" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck1) "eMT" = ( /obj/machinery/door/airlock/glass/security, /turf/simulated/floor/tiled/techmaint, @@ -3987,22 +4464,30 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"eNJ" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"eNZ" = ( +/obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/turf/simulated/floor/lino, +/area/security/detectives_office) +"eOb" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "ePj" = ( /obj/machinery/computer/timeclock/premade/east, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) +"ePF" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/starboard) "ePK" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 4 @@ -4010,16 +4495,25 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"eQJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"ePS" = ( +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"eQf" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ dir = 4 }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/recreation_area) +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) +"eQj" = ( +/obj/structure/closet/crate/biohazard, +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) "eRN" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, @@ -4033,11 +4527,15 @@ /obj/structure/flora/pottedplant/small, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) -"eSr" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/east, -/turf/simulated/floor/tiled, -/area/rnd/research_foyer) +"eSY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck1/a) "eTp" = ( /obj/structure/bed/chair/wood{ dir = 4 @@ -4060,6 +4558,24 @@ /obj/item/bedsheet/iandouble, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) +"eUT" = ( +/obj/machinery/camera/network/security{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "eVI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -4069,6 +4585,13 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) +"eVK" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "eVW" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4109,7 +4632,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4142,24 +4665,10 @@ }, /turf/simulated/floor/reinforced, /area/security/tactical) -"eYG" = ( -/obj/machinery/computer/timeclock/premade/east, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) -"eZw" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/monotile, +"eZR" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, /area/space) -"eZK" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/rnd{ - req_access = list(47) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/rnd/research/researchdivision) "fak" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, @@ -4199,6 +4708,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_3) +"faE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) +"faG" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "fbE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -4218,18 +4735,40 @@ /obj/item/material/knife/butch, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"fcC" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) +"fcR" = ( +/obj/structure/disposalpipe/sortjunction/untagged/flipped, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "fdk" = ( /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"feG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"fdu" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"fec" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/bar) "fgg" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/hallway) @@ -4240,6 +4779,15 @@ }, /turf/simulated/floor/airless, /area/space) +"fgs" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "fgF" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -4253,16 +4801,24 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"fhS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"fhg" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "fhX" = ( /obj/structure/panic_button{ pixel_x = -32 @@ -4313,13 +4869,6 @@ }, /turf/simulated/wall, /area/main_map/hallway/deck1) -"fmV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) "fnl" = ( /obj/structure/table/bench/steel, /obj/landmark/spawnpoint/job/security_officer, @@ -4378,6 +4927,12 @@ /obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"fsi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "fsn" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/hallway/deck1) @@ -4386,7 +4941,7 @@ /area/maintenance/solars) "ftC" = ( /obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "ftD" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible, @@ -4396,16 +4951,17 @@ "ftR" = ( /turf/simulated/open, /area/main_map/hallway/deck1/fore) -"fuV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"fuO" = ( +/obj/structure/closet/l3closet/security, +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/dark, +/area/security/armoury) "fvj" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -4463,10 +5019,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"fxL" = ( -/obj/structure/bed/chair/office/dark, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) "fxM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -4506,6 +5058,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"fyh" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "fym" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -4519,27 +5077,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) -"fzx" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/red/border, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/briefingroom) -"fzJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/chemistry) -"fzY" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "Port to Isolation" - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "fBj" = ( /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) @@ -4562,50 +5099,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/Hangar_bay/deck1/a) -"fBA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) -"fCh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "fCs" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled/monowhite, /area/security/forensics) +"fCG" = ( +/obj/machinery/door/airlock/maintenance/command, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/bridge/hallway) "fCJ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/medical/surgery) -"fCM" = ( -/obj/machinery/camera/network/security{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) "fDi" = ( /obj/machinery/door/airlock/glass/medical{ name = "Medbay Reception"; @@ -4628,15 +5142,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"fDC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "fEq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -4685,29 +5190,28 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"fGn" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) +"fGz" = ( +/obj/machinery/camera/network/medbay{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "fGB" = ( /obj/structure/shuttle/engine/heater{ dir = 4 }, /turf/simulated/shuttle/wall/voidcraft, /area/main_map/Hangar_bay/deck1/a) -"fHf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/space) "fHw" = ( /obj/machinery/photocopier, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"fIh" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "fIK" = ( /obj/structure/cable/heavyduty, /obj/structure/cable/green{ @@ -4743,20 +5247,29 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"fKr" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/bridge/hallway) "fKH" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"fKV" = ( -/obj/machinery/washing_machine, -/turf/simulated/floor/tiled/white, -/area/space) +"fLd" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/port) "fLu" = ( /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) @@ -4767,16 +5280,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"fLR" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) -"fNz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "fND" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -4787,6 +5290,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics) +"fOY" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "fPY" = ( /obj/structure/railing{ dir = 4 @@ -4829,10 +5335,6 @@ /obj/landmark/spawnpoint/job/paramedic, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"fQI" = ( -/obj/machinery/door/airlock/maintenance/engi, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/aft/port) "fQJ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -4860,18 +5362,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"fRZ" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "fSj" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/window/northright, -/turf/simulated/floor/glass/reinforced, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) "fSr" = ( /obj/structure/window/reinforced{ @@ -4909,6 +5402,15 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, /area/security/tactical) +"fUl" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) +"fUK" = ( +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "fUW" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -4952,17 +5454,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"fWp" = ( -/obj/machinery/door/blast/regular{ - dir = 8; - id = "armorytactical"; - name = "Tactical Armory Access" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/security/tactical) "fWS" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -4993,6 +5484,11 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"fYm" = ( +/obj/structure/railing, +/obj/structure/window/reinforced, +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "fYx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5037,6 +5533,14 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) +"fZS" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "gaL" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -5130,13 +5634,36 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"gfx" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 +"gfn" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, -/turf/simulated/open, -/area/space) +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay emergency access door."; + id = "MedbayEmergency"; + name = "Door Switch"; + pixel_x = -24; + pixel_y = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"gfK" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/recreation_area) "gfN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -5174,6 +5701,13 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"gfX" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/head_of_security, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/briefingroom) "ggi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5182,10 +5716,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"ggJ" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) "ggN" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/portables_connector, @@ -5197,9 +5727,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"ght" = ( -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/bar_backroom) +"ghd" = ( +/obj/machinery/door/airlock/glass_external, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "ghG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5216,6 +5748,13 @@ /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officeb) +"gii" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "gir" = ( /obj/machinery/computer/prisoner{ dir = 1 @@ -5233,6 +5772,24 @@ /obj/structure/catwalk, /turf/simulated/floor/airless, /area/space) +"giZ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "gjj" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -5263,13 +5820,30 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"gkF" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/railing{ +"gjE" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) +"gjG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"gjO" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"gkF" = ( +/obj/effect/floor_decal/spline/plain, /obj/machinery/door/window/southleft, -/turf/simulated/floor/glass/reinforced, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) "glc" = ( /obj/machinery/door/firedoor/glass, @@ -5279,6 +5853,19 @@ }, /turf/simulated/floor, /area/holodeck_control) +"glF" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "glV" = ( /obj/structure/closet/bombclosetsecurity, /obj/effect/floor_decal/corner/blue{ @@ -5286,11 +5873,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"gmr" = ( -/obj/machinery/door/airlock/glass, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_one/aft/port) "gms" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -5301,10 +5883,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) -"gnB" = ( -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) +"gnq" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "gnD" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -5319,7 +5901,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "gnZ" = ( /obj/structure/cable/green{ @@ -5329,18 +5911,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/bridge/hallway) +"gov" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "goR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) -"gpm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) "gqE" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -5355,6 +5941,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/lino, /area/security/detectives_office) +"gqS" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) "gqX" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -5365,20 +5957,6 @@ /obj/item/paper/dockingcodes, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) -"gru" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"gry" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "gsh" = ( /obj/structure/table/steel, /obj/item/storage/box/evidence, @@ -5410,6 +5988,32 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_lockerroom) +"gtn" = ( +/obj/structure/table/steel_reinforced, +/obj/item/storage/box/traumainjectors, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"gue" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "gul" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/robotics/mechbay) @@ -5445,6 +6049,15 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) +"gvY" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "gwf" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -5468,15 +6081,6 @@ }, /turf/simulated/floor/plating, /area/security/forensics) -"gyD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "gyF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5487,19 +6091,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/lobby) -"gyH" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/space) -"gyO" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officecommon) "gzy" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -5520,6 +6111,15 @@ /obj/structure/railing, /turf/simulated/floor/reinforced, /area/space) +"gzI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "gAl" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5535,17 +6135,10 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"gBp" = ( -/obj/machinery/door/airlock/glass_external/public, -/turf/simulated/floor/tiled, -/area/space) "gBz" = ( /obj/structure/table/standard, /turf/simulated/floor/wood, /area/bridge/hallway) -"gCL" = ( -/turf/simulated/floor/tiled/red, -/area/space) "gDe" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -5570,18 +6163,36 @@ }, /turf/simulated/floor/crystal, /area/space) +"gDS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/security/warden) +"gDV" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "gEp" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/open, /area/main_map/hallway/deck1/fore) -"gFU" = ( -/obj/structure/railing{ - dir = 4 +"gFh" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "armorytactical"; + name = "Tactical Armory Access" }, -/turf/simulated/open, -/area/rnd/research/researchdivision) +/turf/simulated/floor/reinforced, +/area/security/tactical) "gGu" = ( /obj/structure/sign/deck/first, /turf/simulated/wall/prepainted/civilian, @@ -5612,13 +6223,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"gIA" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/security/hallway) "gJU" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -5637,6 +6241,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"gKt" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/hallway/deck1/fore) "gKw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5649,6 +6259,21 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"gKZ" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "gLe" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -5661,15 +6286,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) -"gLZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/bar) "gMs" = ( /obj/structure/closet/secure_closet/security, /obj/structure/window/basic{ @@ -5678,16 +6294,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"gMF" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/medical/reception) "gMN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5700,12 +6306,6 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"gMZ" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) "gNG" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -5732,16 +6332,28 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_2) -"gNQ" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/reinforced/airless, -/area/space) +"gNX" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) +"gPj" = ( +/obj/structure/ladder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "gQs" = ( /obj/machinery/door/airlock/glass/medical{ name = "Paramedic Storage" }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"gQw" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "gQF" = ( /obj/machinery/appliance/mixer/cereal, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -5758,14 +6370,21 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"gRF" = ( -/obj/machinery/vending/nifsoft_shop{ - dir = 8 +"gRV" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "gRZ" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, @@ -5782,16 +6401,13 @@ /obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) -"gSx" = ( -/obj/machinery/conveyor{ - dir = 4 - }, -/obj/map_helper/conveyor/belt{ - id_tag = "cargo_mailroom"; - name = "Cargo Mail belt" +"gSE" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "gTl" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/box/gloves{ @@ -5825,10 +6441,24 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck1) -"gXp" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/research/researchdivision) +"gWj" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock101"; + name = "Toilet 2" + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) +"gWt" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "gXq" = ( /obj/machinery/camera/network/research{ dir = 8 @@ -5842,16 +6472,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora) -"gXK" = ( -/obj/machinery/door/airlock/medical{ - name = "Chemistry"; - req_one_access = list(33) - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/medical/chemistry) "gZM" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) @@ -5859,6 +6479,21 @@ /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"haP" = ( +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) +"hbt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "hbN" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -5903,9 +6538,24 @@ }, /turf/simulated/floor/reinforced, /area/security/tactical) +"heq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "heZ" = ( /turf/simulated/wall, /area/main_map/hallway/deck1) +"hfn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) "hfG" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -5925,25 +6575,71 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_equiptment_storage) +"hgD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "hhb" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"hjv" = ( -/obj/structure/closet/crate/bin{ - desc = "A large bin for medical and other personnel that deals with bio-grade waste."; - icon_closed = "biohazard"; - icon_opened = "biohazardopen"; - icon_state = "biohazard"; - name = "biohazard bin" +"hhH" = ( +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/light/no_nightshift{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/holodeck_control) +"hhN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/medical/surgery) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/security/upper) +"hhP" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/bar) +"his" = ( +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) "hjR" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/medical/medbay) @@ -5951,24 +6647,9 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/critical/north_bump, +/obj/machinery/power/apc/critical/north_mount, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck1/a) -"hkO" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"hlb" = ( -/obj/structure/closet/l3closet/security, -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/north, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) "hlh" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -5989,6 +6670,12 @@ "hmh" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/cmo) +"hml" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/glass/reinforced, +/area/main_map/hallway/deck1) "hmK" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) @@ -6046,6 +6733,20 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"hpI" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "hpV" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -6073,6 +6774,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"hrb" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "hrh" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -6161,6 +6872,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) +"hwV" = ( +/obj/machinery/papershredder, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/medical/reception) "hxc" = ( /obj/machinery/door/firedoor/glass, /obj/structure/table/reinforced, @@ -6187,6 +6909,13 @@ /obj/structure/bed/chair/wood, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/bar) +"hyj" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "hzV" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -6200,6 +6929,15 @@ "hzX" = ( /turf/simulated/open, /area/main_map/hallway/deck1) +"hAg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) "hAj" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -6229,14 +6967,13 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"hBO" = ( -/obj/machinery/door/airlock/glass, +"hBJ" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/firedoor/glass{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/port) "hBV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6257,6 +6994,13 @@ /obj/machinery/door/window/brigdoor/northleft, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/lobby) +"hCZ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "hDc" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/captain) @@ -6273,33 +7017,34 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"hHj" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 8 +"hEZ" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 }, -/obj/structure/table/steel, -/obj/item/storage/box/firingpins, -/obj/item/storage/box/firingpins, -/obj/machinery/recharger/wallcharger{ - pixel_x = -22 +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) +"hJi" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-8" }, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/north, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) -"hHn" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "hJz" = ( /obj/structure/bed/double/padded, /obj/random/bedsheet/double, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) +"hJF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "hJO" = ( /obj/machinery/door/airlock/maintenance, /obj/map_helper/network_builder/power_cable/green/auto, @@ -6308,10 +7053,6 @@ "hKl" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_4) -"hKm" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/bridge/hallway) "hLw" = ( /obj/machinery/button/windowtint{ id = "holodeck"; @@ -6331,16 +7072,6 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"hMl" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) -"hMx" = ( -/obj/structure/cable/green{ - icon_state = "32-2" - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_one/port) "hMB" = ( /obj/structure/filingcabinet, /obj/machinery/light/no_nightshift{ @@ -6372,6 +7103,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"hNc" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "hOo" = ( /obj/machinery/door/window/brigdoor/northright{ req_access = null; @@ -6385,16 +7125,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"hPH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1) +"hOp" = ( +/obj/structure/bed/chair/comfy/blue, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_8) "hPX" = ( /obj/structure/bed/padded, /obj/random/bedsheet, @@ -6525,11 +7259,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"hYb" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/lab) "hYz" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6554,6 +7283,10 @@ }, /turf/simulated/open, /area/rnd/xenobiology/xenoflora_storage) +"hYL" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "hZr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6600,15 +7333,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"iaT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "ibx" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -6625,12 +7349,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) -"idb" = ( -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/security/briefingroom) "idX" = ( /obj/machinery/light_switch{ pixel_x = 25 @@ -6649,16 +7369,19 @@ /obj/item/bedsheet/hosdouble, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/heads/hos) -"ieA" = ( -/obj/machinery/conveyor_switch/oneway{ - pixel_y = 14 +"iey" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/map_helper/conveyor/lever{ - id_tag = "_mobile_mining_interior"; - name = "Ore Processing" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/port) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "ifl" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/light/no_nightshift, @@ -6686,13 +7409,47 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) +"igq" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "igr" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/forward/port) +"igz" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/hallway) "igQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/steel_grid, /area/main_map/Hangar_bay/deck1/a) +"igS" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/landmark{ + name = "lightsout" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) +"ihC" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "ihS" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/accessory/armor/helmcover/nt, @@ -6728,6 +7485,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) +"ijP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/aft/port) "ijT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6791,19 +7555,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"ipY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "iqc" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"isf" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "isn" = ( /obj/machinery/door/airlock/atmos{ name = "Medical Atmospherics Backup"; @@ -6848,6 +7615,11 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one) +"itm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "itv" = ( /obj/machinery/button/remote/blast_door{ dir = 8; @@ -6876,7 +7648,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen-c"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -6884,6 +7655,25 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"iuu" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"iuI" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) "iuK" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -6899,59 +7689,75 @@ name = "Medical Maintenance Access"; req_access = list(5) }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/dark, /area/medical/medbay) "ivd" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck1) +"ivs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"ivv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"ivI" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/briefingroom) "iwo" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"iwG" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "iwV" = ( /obj/structure/railing, /turf/simulated/floor/plating, /area/medical/medbay) +"ixc" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one) "ixM" = ( /obj/structure/bed/padded, /obj/random/bedsheet, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) -"iyd" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass/security{ - id_tag = "BrigFoyer"; - layer = 2.8; - name = "Security"; - req_one_access = list(38,63) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "iyz" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/carpet/tealcarpet, /area/crew_quarters/heads/cmo) +"iyD" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "iyQ" = ( /turf/simulated/floor/tiled/dark, /area/medical/medbay) -"izi" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/bed/chair/comfy/beige{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "izF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -6972,25 +7778,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) -"iAi" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/space) -"iAt" = ( -/obj/machinery/door/airlock/glass/security{ - name = "Locker Room"; - req_one_access = list(2) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) "iAC" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -7042,31 +7829,19 @@ "iBF" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) +"iCg" = ( +/obj/effect/floor_decal/industrial/halfstair, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "iDo" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/captain) -"iDv" = ( -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/aft/port) -"iDB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) "iDV" = ( /obj/structure/sign/deck1, /turf/simulated/wall, -/area/maintenance/solars) +/area/space) "iEd" = ( /obj/machinery/vending/security, /obj/effect/floor_decal/industrial/outline/yellow, @@ -7102,22 +7877,31 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"iFS" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 +"iFo" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"iFJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) "iGH" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -7137,14 +7921,21 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) -"iHS" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1) +"iHo" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/open, +/area/medical/medbay) "iIt" = ( /obj/structure/sink{ pixel_y = 22 @@ -7188,10 +7979,24 @@ "iKd" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/tactical) -"iKu" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/space) +"iKe" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "iKP" = ( /obj/machinery/computer/borgupload, /obj/effect/floor_decal/corner/purple{ @@ -7202,36 +8007,40 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"iLb" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) +"iLB" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) +"iLN" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/vending/nifsoft_shop{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "iMf" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) -"iMj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1/fore) "iMl" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck1/a) -"iNp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/security/upper) "iOk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -7241,35 +8050,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"iOF" = ( -/obj/structure/closet/crate/solar, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) "iOT" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"iPA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/lab) -"iQA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one) "iQD" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorwhite{ @@ -7317,6 +8103,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) +"iTi" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/starboard) "iTu" = ( /obj/machinery/button/remote/airlock{ id = "dorm9"; @@ -7362,6 +8152,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) +"iUP" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) +"iUY" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hop) "iVG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7386,7 +8191,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/door/firedoor{ @@ -7394,23 +8198,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"iWI" = ( -/obj/structure/ladder, -/turf/simulated/floor/plating, -/area/medical/medbay) -"iXz" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) -"iXB" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "iXF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7422,10 +8209,40 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"iXQ" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "iYu" = ( /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) +"iYL" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) +"iYM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officeb) +"iYZ" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "iZB" = ( /obj/structure/table/woodentable, /obj/item/tape_recorder{ @@ -7434,20 +8251,18 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) -"iZI" = ( -/obj/machinery/door/blast/regular, -/turf/simulated/floor/reinforced, -/area/main_map/Hangar_bay/deck1/a) -"iZQ" = ( -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "bar"; - name = "Bar counter shutters"; - pixel_x = -24; - pixel_y = 10 +"jaq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) "jaL" = ( /obj/effect/floor_decal/corner/green/full{ dir = 8 @@ -7462,11 +8277,6 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/maintenance/solars) -"jch" = ( -/obj/structure/cable/green, -/obj/machinery/power/solar, -/turf/simulated/floor/reinforced/airless, -/area/space) "jcB" = ( /turf/simulated/shuttle/wall/voidcraft, /area/main_map/Hangar_bay/deck1/a) @@ -7477,9 +8287,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"jdS" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/starboard) "jeu" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7488,18 +8295,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/captain) -"jew" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/space) -"jhy" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) "jhN" = ( /turf/simulated/wall/prepainted/security, /area/security/security_lockerroom) @@ -7539,6 +8334,10 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/monotile, /area/security/forensics) +"jms" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "jmx" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -7549,13 +8348,6 @@ "jny" = ( /turf/simulated/wall/r_wall, /area/maintenance/security/port) -"jou" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/space) "joZ" = ( /turf/simulated/wall/prepainted/engineering/atmos, /area/main_map/maintenance/deck_one/aft/port) @@ -7571,15 +8363,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) -"jqj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/chemistry) "jqt" = ( /obj/structure/railing{ dir = 4 @@ -7593,13 +8376,6 @@ "jqy" = ( /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) -"jrb" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/hole/right, -/obj/effect/floor_decal/techfloor/hole, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/white, -/area/space) "jta" = ( /obj/item/radio/intercom{ dir = 8; @@ -7638,6 +8414,14 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"juY" = ( +/obj/item/chess/wpawn, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) +"jvh" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "jvs" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_3) @@ -7648,6 +8432,16 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/Hangar_bay/deck1/a) +"jwg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "jwl" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -7664,10 +8458,9 @@ "jwS" = ( /turf/simulated/wall/prepainted/medical, /area/medical/surgery2) -"jxN" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/aft/port) +"jxs" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/security/tactical) "jxY" = ( /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/briefingroom) @@ -7680,6 +8473,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"jzc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"jzh" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/forward/port) "jzA" = ( /obj/machinery/door/airlock{ name = "Hydroponics"; @@ -7694,7 +8502,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/hydroponics) "jzJ" = ( /obj/structure/filingcabinet/chestdrawer, @@ -7705,8 +8513,7 @@ /area/security/warden) "jAs" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -7715,13 +8522,6 @@ /obj/item/defib_kit/loaded, /turf/simulated/floor/tiled, /area/medical/surgery2) -"jAA" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/plating, -/area/space) -"jBk" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/rnd/research/researchdivision) "jBA" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -7746,25 +8546,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"jCH" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"jCL" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1) "jDH" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -7861,6 +8642,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"jHV" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "jIe" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -7903,26 +8695,38 @@ "jKW" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/maintenance/deck_one) -"jLH" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) +"jLk" = ( +/obj/structure/sign/deck/first, +/turf/simulated/wall, +/area/main_map/maintenance/deck_one/forward/starboard) "jLN" = ( /obj/machinery/door/airlock/maintenance/common, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_one/aft/port) -"jML" = ( -/obj/machinery/button/windowtint{ - id = "det_office"; - pixel_x = -24; - pixel_y = 24 +"jLV" = ( +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) +"jMX" = ( +/obj/machinery/vending/nifsoft_shop{ + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/security/detectives_office) +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"jNK" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) +"jNO" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "jOg" = ( /turf/simulated/wall/prepainted/science, /area/main_map/maintenance/deck_one/starboard) @@ -7930,6 +8734,18 @@ /obj/structure/sign/deck/first, /turf/simulated/wall/r_wall, /area/main_map/hallway/deck1) +"jQD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/starboard) "jQS" = ( /obj/structure/table/rack/shelf/steel, /obj/item/cell/device/weapon{ @@ -7985,6 +8801,22 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techfloor, /area/space) +"jSR" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/crystal, +/area/space) +"jSV" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "jSW" = ( /obj/structure/window/reinforced{ dir = 4 @@ -8015,31 +8847,12 @@ }, /turf/simulated/open, /area/rnd/lab) -"jUd" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/space) "jUE" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"jUI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "jUJ" = ( /obj/structure/sign/directions/evac{ dir = 8 @@ -8049,13 +8862,18 @@ "jVi" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/starboard) +"jVx" = ( +/obj/structure/bedsheetbin, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) "jWJ" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/space) "jWO" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "jXb" = ( @@ -8098,37 +8916,37 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"jYg" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "jYE" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"jYU" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 +"jYI" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/door/airlock/glass{ - name = "Medbay Lobby" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/reception) +"jZH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/recreation_area) "jZX" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/iv_drip, @@ -8143,13 +8961,10 @@ }, /turf/simulated/floor/reinforced, /area/security/tactical) -"kaB" = ( -/turf/simulated/wall/prepainted/command, -/area/space) -"kcG" = ( -/obj/machinery/door/airlock/maintenance/common, +"kao" = ( +/obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one) +/area/quartermaster/delivery) "kdH" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -8170,6 +8985,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"keX" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "keY" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -8182,6 +9003,19 @@ /obj/landmark/spawnpoint/job/lawyer, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) +"kfo" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -25 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, +/area/security/riot_control) "kgz" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8234,19 +9068,26 @@ "kij" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) -"kiK" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +"kil" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/turnstile/entry{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) +"kiR" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kjj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 @@ -8264,12 +9105,10 @@ }, /turf/simulated/open, /area/crew_quarters/recreation_area) -"kkJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) +"kkd" = ( +/obj/structure/sign/greencross, +/turf/simulated/wall/prepainted/medical, +/area/main_map/hallway/deck1) "kkN" = ( /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical/emt, @@ -8304,6 +9143,15 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) +"kmY" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/structure/bed/chair/sofa/black/right{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "knx" = ( /obj/structure/bed/chair/bay/chair/padded/red/smallnest, /obj/random/plushie, @@ -8322,10 +9170,20 @@ }, /turf/simulated/floor/airless, /area/space) +"knI" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/starboard) "knK" = ( /obj/structure/sign/deck1, /turf/simulated/wall/r_wall, /area/maintenance/solars) +"kob" = ( +/turf/simulated/wall/r_wall/prepainted/command, +/area/main_map/maintenance/deck_one) "koc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -8336,6 +9194,11 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"koG" = ( +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp, +/turf/simulated/floor/lino, +/area/security/detectives_office) "koY" = ( /obj/structure/railing{ dir = 4 @@ -8343,6 +9206,12 @@ /obj/structure/railing, /turf/space, /area/space) +"kpK" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kpX" = ( /obj/structure/filingcabinet, /obj/machinery/light/no_nightshift{ @@ -8403,16 +9272,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"ktt" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/obj/machinery/shower{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/space) "ktz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -8436,21 +9295,19 @@ "ktR" = ( /turf/simulated/floor/glass/reinforced, /area/main_map/maintenance/deck_one) -"kuG" = ( -/obj/map_helper/network_builder/power_cable/green/auto, +"kub" = ( +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) -"kuH" = ( -/obj/machinery/door/airlock/maintenance/command, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "bridge_lockdown"; - name = "Bridge Lockdown"; - opacity = 0 +/area/main_map/maintenance/deck_one) +"kuJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_one) "kuK" = ( /obj/machinery/flasher/portable, /obj/effect/floor_decal/corner/blue{ @@ -8471,21 +9328,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"kwb" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "kwx" = ( /obj/structure/closet/wardrobe, /turf/simulated/floor/wood, @@ -8524,6 +9366,15 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_one/forward/starboard) +"kxQ" = ( +/obj/structure/bed/chair/comfy/purp{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_5) "kxV" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8563,15 +9414,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"kzO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) "kAb" = ( /obj/structure/railing{ dir = 4 @@ -8606,10 +9448,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officea) -"kBW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/lobby) "kDw" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -8617,21 +9455,15 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"kDy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "kEI" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"kFg" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/quartermaster/delivery) "kFJ" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 8 @@ -8653,6 +9485,11 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/maintenance/security/upper) +"kGv" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/communications, +/turf/simulated/floor/tiled/steel_grid, +/area/space) "kGP" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8664,6 +9501,18 @@ /obj/structure/table/glass, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"kHm" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "kHF" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8678,6 +9527,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/xenobiology/xenoflora) +"kIO" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/recreation_area) "kJp" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/kitchen) @@ -8697,40 +9549,48 @@ /obj/structure/ladder, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"kKP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/space) +"kKN" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "kLp" = ( /obj/structure/bed/chair/sofa/brown/left{ dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) +"kLy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "kLM" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) -"kMt" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock100"; - name = "Toilet 1" - }, -/turf/simulated/floor/tiled/white, -/area/space) "kMM" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"kMQ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "kMU" = ( /obj/machinery/door/airlock/glass{ name = "Hydroponics"; @@ -8774,44 +9634,20 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"kNS" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 6 - }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass{ - name = "Medbay Lobby" - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) -"kOz" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/aft/port) "kOA" = ( /obj/effect/floor_decal/corner/white/border{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) +"kOR" = ( +/turf/simulated/floor/reinforced, +/area/main_map/Hangar_bay/deck1) "kOT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "kOZ" = ( /obj/structure/railing{ @@ -8839,11 +9675,6 @@ "kPF" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/cmo) -"kPH" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/crystal, -/area/space) "kPV" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass{ @@ -8851,19 +9682,6 @@ }, /turf/simulated/floor/plating, /area/main_map/hallway/deck1/fore) -"kPZ" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "kQk" = ( /obj/machinery/door/window/brigdoor/southright{ req_access = null; @@ -8877,12 +9695,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"kQx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/chemistry) "kQy" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -8900,6 +9712,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"kQJ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "kRe" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/aft/starboard) @@ -8910,14 +9731,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"kRv" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/bar) "kRJ" = ( /obj/structure/railing, /obj/structure/railing{ @@ -8938,11 +9751,34 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officecommon) +"kTu" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "kTQ" = ( /obj/structure/ladder, /obj/structure/catwalk, /turf/simulated/open, /area/maintenance/security/port) +"kTW" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) +"kUm" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "kUB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -8950,6 +9786,35 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"kUD" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"kUO" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light/no_nightshift, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) +"kUQ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/port) "kVA" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9036,6 +9901,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"kYZ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "kZq" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -9052,6 +9922,11 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"laz" = ( +/obj/structure/grille, +/obj/structure/girder/reinforced, +/turf/simulated/floor/reinforced/carbon_dioxide, +/area/rift/station/fighter_bay/hangar) "laC" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -9085,9 +9960,6 @@ /obj/structure/railing, /turf/simulated/floor/glass/reinforced, /area/hydroponics) -"leG" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/main_map/maintenance/deck_one/port) "leK" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -9113,6 +9985,21 @@ }, /turf/simulated/floor/tiled/monowhite, /area/security/forensics) +"lfz" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) +"lhu" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officea) "liV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/mauve{ @@ -9170,9 +10057,36 @@ /obj/landmark/spawnpoint/job/chef, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"lmG" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/obj/structure/table/steel, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/dark, +/area/security/riot_control) "lnc" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/recreation_area) +"lnA" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "kitchen-c"; + name = "Kitchen Service Shutters" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/kitchen) "lnG" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -9182,11 +10096,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"lnR" = ( -/obj/machinery/door/airlock/glass/security, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/security/briefingroom) +"loW" = ( +/turf/simulated/wall, +/area/security/detectives_office) +"lph" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "lpN" = ( /obj/machinery/air_alarm{ dir = 8; @@ -9195,6 +10114,55 @@ /obj/structure/table/glass, /turf/simulated/floor/crystal, /area/space) +"lqe" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/aft/port) +"lqo" = ( +/obj/machinery/door/airlock/security{ + name = "Equipment Storage"; + req_access = list() + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/security/security_equiptment_storage) +"lrl" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"lsF" = ( +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/deliveryChute{ + dir = 8 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"lsH" = ( +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/port) "lsP" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, @@ -9251,6 +10219,38 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"lxm" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"lxZ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/black{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) +"lyo" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "lyW" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/white, @@ -9268,12 +10268,6 @@ }, /turf/simulated/open, /area/maintenance/security/port) -"lBm" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "lBr" = ( /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, @@ -9306,12 +10300,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"lCI" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) +"lCX" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) "lDd" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"lDo" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one) "lDx" = ( /obj/structure/railing{ dir = 1 @@ -9327,6 +10339,13 @@ "lFl" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/port) +"lFK" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) "lFP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -9336,6 +10355,33 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) +"lGR" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/open, +/area/medical/medbay) +"lGU" = ( +/obj/machinery/door/blast/regular{ + id = "armorylight"; + name = "Light Armory Acccess" + }, +/turf/simulated/floor/reinforced, +/area/security/armoury) +"lHp" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"lHx" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "lHC" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -9356,10 +10402,16 @@ /obj/machinery/vending/medical, /turf/simulated/floor/tiled/dark, /area/medical/medbay) -"lJR" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/crystal, -/area/space) +"lJb" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "lJV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -9380,7 +10432,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "solar_dock"; name = "interior access button"; @@ -9397,17 +10449,6 @@ "lKP" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_5) -"lLO" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) -"lLS" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "armoryriot"; - name = "Emergency Armory Access" - }, -/turf/simulated/floor/reinforced, -/area/security/riot_control) "lLX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9424,13 +10465,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/wall, /area/main_map/hallway/deck1/fore) -"lMH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "lMW" = ( /turf/simulated/open, /area/space) @@ -9449,21 +10483,9 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"lOo" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/structure/closet/l3closet/scientist/double, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/east, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "lOT" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "solar_dock"; name = "exterior access button"; @@ -9471,7 +10493,16 @@ pixel_y = -26 }, /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) +"lPc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "lPz" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/marble, @@ -9480,28 +10511,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"lPP" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) -"lPW" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) "lQn" = ( /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) @@ -9509,6 +10518,9 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) +"lQP" = ( +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "lRr" = ( /obj/effect/floor_decal/techfloor/orange/corner, /turf/simulated/floor/tiled/techmaint, @@ -9521,12 +10533,41 @@ /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/tiled, /area/medical/surgery2) -"lTD" = ( +"lSP" = ( +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) +"lTf" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"lTm" = ( +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) +"lTE" = ( +/obj/machinery/door/airlock/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) +"lVy" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"lWs" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "lWV" = ( /obj/structure/table/standard, /obj/item/disk/design_disk{ @@ -9572,6 +10613,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"lYx" = ( +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/crystal, +/area/space) "lZc" = ( /obj/structure/table/woodentable, /obj/item/folder/red, @@ -9605,6 +10653,16 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"lZx" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck1/fore) +"lZM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) "lZV" = ( /obj/machinery/door/airlock/glass/medical{ name = "Paramedic Storage" @@ -9617,28 +10675,23 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"maf" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/crew, +/turf/simulated/floor/tiled/steel_grid, +/area/space) "mbb" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /obj/machinery/seed_extractor, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"mbz" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 +"mbE" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/main_map/maintenance/deck_one/forward/port) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "mdg" = ( /obj/machinery/door/airlock/glass/research{ name = "Xenoflora Research"; @@ -9658,6 +10711,10 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, /area/space) +"meL" = ( +/obj/machinery/computer/timeclock/premade/north, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "mfl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -9665,8 +10722,52 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"mfw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) +"mfP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/hallway) +"mgA" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) +"mhf" = ( +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = -32 + }, +/obj/structure/bed/chair/comfy/brown, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) +"mis" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"mjs" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "mjv" = ( /obj/machinery/atmospherics/valve/digital{ dir = 4; @@ -9677,19 +10778,22 @@ "mjw" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/bar) +"mjM" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "mjR" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) -"mlU" = ( -/obj/machinery/shower{ - dir = 1 - }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/space) +"mlH" = ( +/obj/machinery/holopad, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "mmw" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -9717,8 +10821,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "mnb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/table/glass, @@ -9735,13 +10838,49 @@ }, /obj/item/hand_labeler, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/medical/reception) +"moz" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/tealcarpet, +/area/crew_quarters/heads/cmo) +"moV" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck1) +"mpc" = ( +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/obj/structure/cable/heavyduty, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mpd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "mpj" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, /area/security/tactical) +"mpC" = ( +/obj/machinery/button/remote/airlock{ + id = "bathroomlock100"; + name = "Bathroom Lock"; + pixel_x = -20; + pixel_y = -20; + specialfunctions = 4 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "mpQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9756,6 +10895,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) +"mqr" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "mqQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -9773,6 +10918,28 @@ /obj/structure/girder/reinforced, /turf/simulated/floor/reinforced/carbon_dioxide, /area/space) +"mqZ" = ( +/obj/machinery/door/blast/regular{ + dir = 8; + id = "armorytactical2"; + name = "Tactical Armory Access" + }, +/turf/simulated/floor/reinforced, +/area/security/tactical) +"mrp" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officeb) +"mry" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/open, +/area/main_map/hallway/deck1/fore) +"mrH" = ( +/turf/simulated/wall/r_wall, +/area/main_map/Hangar_bay/deck1) "msK" = ( /obj/effect/floor_decal/corner/red{ dir = 10 @@ -9802,6 +10969,15 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"mtV" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "muA" = ( /obj/structure/bed/chair/bay/chair/padded/red/bignest, /obj/random/plushielarge, @@ -9860,18 +11036,6 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"mvR" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) "mwK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -9881,39 +11045,31 @@ "mxc" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_6) -"mxr" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/open, -/area/medical/medbay) -"myy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/aft/starboard) "myO" = ( /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) -"mzA" = ( -/obj/structure/railing{ - dir = 4 +"myV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/window/reinforced{ +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) +"mzs" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) +"mAY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/open, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "mBp" = ( /obj/effect/floor_decal/corner/green/full, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, @@ -9921,6 +11077,28 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) +"mCD" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"mCJ" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "mDT" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 @@ -9965,6 +11143,26 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/aft/port) +"mEB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"mEL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "mES" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/bunker) @@ -9994,7 +11192,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen-c"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -10004,32 +11201,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"mGL" = ( -/obj/machinery/iv_drip, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"mHM" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) "mId" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 @@ -10053,14 +11224,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"mIH" = ( -/obj/machinery/door/airlock/maintenance, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck1/fore) "mJE" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, @@ -10098,40 +11261,34 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"mKx" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 - }, -/obj/effect/floor_decal/spline/plain{ +"mKt" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/space) -"mKV" = ( -/obj/machinery/door/airlock/glass_external/public, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "mLa" = ( /obj/structure/railing, /obj/structure/window/basic, /turf/simulated/open, /area/crew_quarters/bar) -"mMO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"mLP" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/ai_status_display{ + pixel_y = 32 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/disposal, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/bar) "mMY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -10147,6 +11304,10 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) +"mND" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck1) "mNL" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "eva_paramedic_airlock"; @@ -10194,6 +11355,10 @@ }, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) +"mQo" = ( +/obj/machinery/light, +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/captain) "mRf" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10207,14 +11372,27 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"mSl" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mSq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/computer/timeclock/premade/south, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "mSC" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck1/fore) -"mTt" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) "mTw" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -10247,15 +11425,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) -"mUN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) "mUP" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/portables_connector, @@ -10270,12 +11439,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"mVg" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "mVz" = ( /obj/structure/cable{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) +"mVD" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "mVZ" = ( /obj/structure/railing{ dir = 4 @@ -10294,18 +11484,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"mXv" = ( -/obj/effect/floor_decal/corner/paleblue/bordercee{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "mYh" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -10313,11 +11491,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"mYx" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/port) "mYB" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -10366,7 +11539,7 @@ dir = 1 }, /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) "nal" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10397,6 +11570,15 @@ }, /turf/simulated/open, /area/space) +"nbe" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/black{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "nbs" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/spray/cleaner{ @@ -10431,24 +11613,51 @@ "nbK" = ( /turf/simulated/wall/prepainted/science, /area/rnd/research/researchdivision) -"nbN" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, -/area/space) "nbZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"ncc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) +"ncf" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) +"nch" = ( +/obj/structure/catwalk, +/obj/structure/handrail, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "ncr" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"ndV" = ( +"ncO" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "neO" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 1 @@ -10458,25 +11667,26 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"nfd" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "nfj" = ( /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/bar) "nfl" = ( /obj/effect/floor_decal/spline/plain, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/window/southright, -/turf/simulated/floor/glass/reinforced, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) -"ngh" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = -32 +"nfJ" = ( +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 24 }, -/obj/structure/bed/chair/comfy/brown, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "nhh" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -10489,6 +11699,13 @@ "niL" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one) +"njl" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) "njr" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -10497,24 +11714,21 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"nks" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 +"nkZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "nlb" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) -"nlf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/space) "nmA" = ( /obj/machinery/vending/nifsoft_shop{ dir = 8 @@ -10541,25 +11755,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/blue, /area/crew_quarters/sleep/Dorm_8) -"noo" = ( -/obj/structure/table/steel_reinforced, -/obj/item/storage/box/traumainjectors, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +"nov" = ( +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/light/no_nightshift{ - dir = 1 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) +"noA" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "noS" = ( /obj/landmark/spawnpoint/job/bartender, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10568,6 +11775,9 @@ "noW" = ( /turf/simulated/floor/plating, /area/maintenance/security/port) +"npe" = ( +/turf/simulated/open, +/area/quartermaster/delivery) "npj" = ( /obj/structure/table/steel, /obj/effect/floor_decal/corner/red{ @@ -10603,20 +11813,22 @@ }, /turf/simulated/floor/tiled/monowhite, /area/security/forensics) -"nsj" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "nsq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"nsv" = ( +/obj/landmark/spawnpoint/job/xenobotanist, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "nsF" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10626,18 +11838,9 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) -"ntf" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "ntk" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -10675,7 +11878,7 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/bar) "nvx" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10713,22 +11916,23 @@ "nwB" = ( /turf/simulated/wall, /area/rnd/research/researchdivision) -"nwG" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, +"nwT" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/security/tactical) +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) "nxa" = ( /turf/simulated/wall/prepainted/security, /area/security/security_equiptment_storage) +"nxh" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "nxk" = ( /turf/simulated/wall, /area/space) @@ -10740,16 +11944,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/medical/surgery2) -"nyv" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/bar) "nyN" = ( /obj/structure/cable/heavyduty{ icon_state = "0-4" @@ -10759,34 +11953,10 @@ }, /turf/simulated/floor/airless, /area/space) -"nzi" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "armorytactical2"; - name = "Tactical Armory Access" - }, -/turf/simulated/floor/reinforced, -/area/security/tactical) "nzv" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) -"nzG" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armorylight"; - name = "Light Armory Acccess" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/security/armoury) -"nzJ" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/north, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1) "nAe" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -10799,6 +11969,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/surgery) +"nBi" = ( +/obj/machinery/door/airlock/glass_external, +/obj/structure/fans/tiny, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "nBE" = ( /obj/structure/flora/pottedplant/bamboo, /turf/simulated/floor/wood, @@ -10815,6 +11991,22 @@ }, /turf/simulated/floor/plating, /area/medical/medbay) +"nCv" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"nEd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/security/security_lockerroom) "nEv" = ( /obj/structure/closet/walllocker{ dir = 4; @@ -10849,14 +12041,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"nGm" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officea) "nGt" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) +"nGw" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "nGL" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -10880,15 +12075,18 @@ /obj/structure/sign/deck/first, /turf/simulated/wall, /area/main_map/hallway/deck1/fore) -"nHL" = ( -/turf/simulated/floor/carpet/tealcarpet, -/area/crew_quarters/heads/cmo) -"nHZ" = ( +"nHK" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, /turf/simulated/floor/tiled/monotile, -/area/space) +/area/main_map/hallway/deck1) +"nHL" = ( +/turf/simulated/floor/carpet/tealcarpet, +/area/crew_quarters/heads/cmo) "nIb" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -10933,17 +12131,39 @@ "nIe" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/maintenance/security/upper) +"nID" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "nIE" = ( /obj/landmark/spawnpoint/job/scientist, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"nIH" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) +"nIK" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "nIR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "nJl" = ( /obj/spawner/window/reinforced/full/firelocks, @@ -10970,7 +12190,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/lino, /area/security/detectives_office) "nLk" = ( @@ -10984,22 +12204,30 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) +"nLr" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 4; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "nLu" = ( /turf/simulated/wall, /area/tether/surfacebase/security/iaa/officeb) -"nMa" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "nMe" = ( /obj/structure/sign/hangar/one, /turf/simulated/wall, /area/main_map/Hangar_bay/deck1/a) "nMo" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/solars) "nOk" = ( @@ -11007,9 +12235,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"nOl" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/aft/starboard) "nOp" = ( /obj/structure/window/reinforced, /turf/simulated/floor/tiled, @@ -11020,15 +12245,25 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) -"nPJ" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) "nPU" = ( /turf/simulated/open, /area/medical/medbay) +"nQs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"nQB" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "nQH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11053,25 +12288,16 @@ "nRV" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora) -"nSu" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"nSy" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/machinery/door/firedoor{ - dir = 1 +"nSq" = ( +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1/fore) "nTJ" = ( /obj/structure/closet/crate/solar, /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) "nUD" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_7) @@ -11079,7 +12305,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "nUG" = ( @@ -11109,12 +12335,36 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) +"nXm" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/lino, +/area/security/detectives_office) "nXo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) +"nXR" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/glass/reinforced, +/area/main_map/hallway/deck1) +"nXT" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/obj/machinery/holoplant, +/obj/machinery/power/apc/high/north_mount, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/lab) "nYb" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -11146,8 +12396,22 @@ "nZH" = ( /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/lobby) +"oaw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "oaB" = ( -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_one) "oaM" = ( /obj/structure/cable/green{ @@ -11155,38 +12419,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"obN" = ( -/obj/structure/sink/kitchen{ - dir = 8; - name = "sink"; - pixel_x = 13 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/kitchen) -"obR" = ( -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/effect/floor_decal/techfloor/hole{ +"oaW" = ( +/obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/lab) -"ocd" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/medical/medbay) -"oco" = ( -/obj/landmark/spawnpoint/overflow/station, -/turf/simulated/floor/tiled/techfloor, -/area/space) +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "ocr" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/hop) +"ocC" = ( +/obj/machinery/appliance/cooker/grill, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/kitchen) "ocP" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/techmaint, @@ -11195,18 +12443,24 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) +"ocY" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"oda" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "odi" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_8) -"oeA" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"oeC" = ( -/turf/simulated/floor/plating, -/area/security/tactical) "oeT" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11233,14 +12487,24 @@ /obj/structure/adherent_bath, /turf/simulated/floor/crystal, /area/space) +"ofT" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) "ogl" = ( /turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/briefingroom) -"ogt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/bar) "ogG" = ( /turf/simulated/floor/reinforced, /area/security/riot_control) @@ -11259,6 +12523,17 @@ /obj/structure/railing, /turf/simulated/open, /area/rnd/robotics/mechbay) +"ohi" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 4; + name = "Fighter Hangar"; + req_one_access = list(1,19,29,38,43,47,63,67) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rift/station/fighter_bay/hangar) "ohL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11268,15 +12543,15 @@ "oih" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"oir" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"oiy" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/light/no_nightshift{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "oiY" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -11296,6 +12571,15 @@ }, /turf/simulated/floor/reinforced, /area/space) +"ojk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "okA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11334,15 +12618,16 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"omH" = ( -/obj/machinery/door/airlock/sandstone{ - name = "Command Showers" +"omZ" = ( +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 24 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/space) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/security/warden) "onv" = ( /obj/structure/railing{ dir = 8 @@ -11370,11 +12655,22 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"oqR" = ( -/obj/machinery/holopad, +"opN" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck1/fore) +"oqF" = ( +/obj/machinery/door/airlock{ + name = "Internal Affairs"; + req_access = list(38) + }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/security/detectives_office) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officeb) "orj" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/maintenance/deck_one/port) @@ -11393,6 +12689,10 @@ "ort" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/hallway/deck1/fore) +"orw" = ( +/obj/item/chess/bqueen, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "orT" = ( /obj/structure/railing, /obj/structure/railing{ @@ -11410,16 +12710,9 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/forward/starboard) -"orW" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 - }, -/obj/machinery/camera/network/medbay, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +"orZ" = ( +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "osi" = ( /obj/machinery/suit_cycler{ req_access = null @@ -11431,7 +12724,7 @@ /area/maintenance/solars) "osx" = ( /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) "osD" = ( /obj/structure/table/steel, /obj/fiftyspawner/glass, @@ -11473,6 +12766,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"oug" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "ovz" = ( /turf/simulated/wall/r_wall, /area/main_map/Hangar_bay/deck1/a) @@ -11483,20 +12782,49 @@ /turf/simulated/floor/reinforced, /area/security/tactical) "owq" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) +"owN" = ( +/obj/machinery/door/airlock{ + name = "Internal Affairs"; + req_access = list(38) + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officea) +"owP" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "owQ" = ( /obj/structure/closet/lawcloset, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officea) -"oxz" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +"oxj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) +"oxY" = ( +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "oys" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11510,43 +12838,18 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck1/fore) -"ozJ" = ( -/obj/machinery/door/airlock/glass, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officecommon) -"ozZ" = ( -/obj/structure/catwalk, -/obj/structure/handrail, -/turf/simulated/floor/reinforced/airless, -/area/space) -"oAM" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"oBU" = ( -/obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"oDt" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) +"oDG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 + dir = 6 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/maintenance/security/upper) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "oEe" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -11559,21 +12862,32 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"oEF" = ( -/obj/structure/bed/chair/office/light{ - dir = 4 +"oEv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/security/briefingroom) -"oFr" = ( -/turf/simulated/floor/wood, -/area/space) -"oGk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/area/security/security_lockerroom) +"oEB" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) +"oER" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 9 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) +"oFJ" = ( +/obj/structure/catwalk, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "oGO" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, @@ -11585,6 +12899,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) +"oHh" = ( +/obj/machinery/power/apc/critical/east_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"oHN" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/bridge/hallway) "oIq" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -11597,6 +12922,9 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_4) +"oIP" = ( +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/delivery) "oIS" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/glasses/hud/security, @@ -11617,10 +12945,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/hydroponics) -"oJC" = ( -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) "oJX" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) @@ -11628,30 +12952,12 @@ /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, /area/space) -"oLz" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "mechbay"; - name = "Mech Bay" - }, -/obj/machinery/button/remote/blast_door{ - id = "mechbay"; - name = "Mech Bay"; - pixel_x = 27; - pixel_y = 6; - req_access = list(29,47); - req_one_access = list(47) - }, -/obj/machinery/button/remote/blast_door{ - id = "mechbay"; - name = "Mech Bay"; - pixel_x = 27; - pixel_y = -5; - req_access = list(29,47); - req_one_access = list(47) +"oKE" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/robotics/mechbay) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "oLZ" = ( /obj/machinery/door/airlock/glass/security{ name = "Light Armory"; @@ -11667,18 +12973,20 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"oMf" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/junction, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "oMm" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/holodeck_control) -"oMz" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "mechbay"; - name = "Mech Bay" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/robotics/mechbay) "oMB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -11703,6 +13011,10 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) +"oNp" = ( +/obj/structure/ladder, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck1) "oNv" = ( /obj/structure/sign/directions/bridge{ dir = 1 @@ -11738,6 +13050,20 @@ "oPo" = ( /turf/simulated/floor/glass/reinforced, /area/bridge/bunker) +"oPt" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/lab) "oPS" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -11751,21 +13077,6 @@ "oPU" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_one/aft/port) -"oQh" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24; - pixel_y = -5 - }, -/obj/structure/bed/chair/sofa/teal/left{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) "oQw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11778,19 +13089,16 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/captain) -"oQE" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24; - pixel_y = -5 +"oRI" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/structure/bed/chair/comfy/blue, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/disposal/wall{ + dir = 1 }, -/mob/living/simple_mob/humanoid/clown, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/bar) "oRS" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -11814,16 +13122,6 @@ }, /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/sleep/Dorm_7) -"oSj" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/reinforced/airless, -/area/space) -"oSp" = ( -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/aft/port) "oSq" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/meter, @@ -11852,26 +13150,39 @@ "oSK" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_2) -"oUt" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +"oUf" = ( +/obj/machinery/door/airlock/medical{ + name = "Chemistry"; + req_one_access = list(33) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/door/firedoor/glass{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/medical/chemistry) "oUS" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/hor) -"oVy" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, -/turf/simulated/floor/plating, -/area/space) +"oVB" = ( +/obj/machinery/smartfridge/food{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"oVF" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1/fore) "oVR" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -11904,6 +13215,16 @@ "oWs" = ( /turf/simulated/floor/plating, /area/medical/medbay) +"oZK" = ( +/obj/machinery/washing_machine, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) +"oZS" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "pad" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck" @@ -11932,7 +13253,7 @@ /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) "pat" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11978,18 +13299,16 @@ }, /turf/simulated/floor/carpet, /area/security/warden) -"pcR" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"pdh" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/bed/chair/sofa/black/left{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "pdn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -12024,10 +13343,29 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) -"peB" = ( -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/space) +"peD" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 6 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/medical{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "peJ" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/brigdoor/southright{ @@ -12105,6 +13443,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"pif" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) "piS" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/tiled/monotile, @@ -12121,12 +13466,32 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) +"pmi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "pnj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) +"pnl" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"pnO" = ( +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "pov" = ( /obj/machinery/door/window/brigdoor/southright{ req_access = list(55); @@ -12134,6 +13499,30 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"poA" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"poE" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "ppG" = ( /obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/wood, @@ -12145,6 +13534,12 @@ /obj/structure/railing, /turf/simulated/open, /area/rnd/xenobiology/xenoflora_storage) +"pqV" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "prA" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 6 @@ -12158,6 +13553,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"prO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "prS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ dir = 8 @@ -12173,36 +13577,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/mechbay) -"psK" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) -"psN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) -"puH" = ( -/obj/machinery/papershredder, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/tiled, -/area/medical/reception) -"pvd" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) "pvj" = ( /obj/structure/table/standard, /obj/item/paper{ @@ -12305,6 +13679,21 @@ }, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) +"pym" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "pyo" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -12317,25 +13706,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"pyu" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/aft/port) -"pyL" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "pzf" = ( /obj/structure/catwalk, /turf/simulated/open, @@ -12347,14 +13717,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"pzF" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 +"pAo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "pAI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -12388,6 +13762,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) +"pBW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "pCD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -12396,6 +13779,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 8 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "pCW" = ( @@ -12459,6 +13843,12 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/armoury) +"pGm" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/starboard) "pGq" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -12469,12 +13859,13 @@ /obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/tiled/white, /area/medical/reception) -"pHy" = ( -/obj/structure/railing{ - dir = 4 +"pGK" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_one/forward/starboard) "pIj" = ( /obj/landmark{ name = "lightsout" @@ -12498,6 +13889,9 @@ /obj/structure/flora/pottedplant/tall, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"pJd" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/rift/station/fighter_bay/hangar) "pKS" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/machinery/door/firedoor/multi_tile, @@ -12518,28 +13912,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"pOc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/forward/port) -"pOh" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/aft/starboard) -"pOo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "pPz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12565,11 +13937,7 @@ /obj/structure/table/reinforced, /obj/item/book/manual/legal/sop_vol2, /obj/item/book/manual/legal/sop_vol1, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) "pQm" = ( @@ -12581,18 +13949,27 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"pQn" = ( +/obj/structure/cable/green{ + icon_state = "32-2" + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/port) "pQv" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) -"pRy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"pRN" = ( +/obj/structure/railing{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/railing, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "pTe" = ( /obj/random/medical, /obj/random/medical, @@ -12611,24 +13988,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"pTE" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/window/brigdoor/southleft{ - dir = 8; - name = "Security Reception" +"pTi" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 }, -/obj/structure/table/steel, -/turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/security/lobby) -"pTU" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/reinforced/outdoors, /area/space) "pUf" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -12640,9 +14005,22 @@ /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/medical/reception) +"pUm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "pUp" = ( /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) +"pUN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "pWk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12651,32 +14029,12 @@ "pWr" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"pWL" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) -"pXE" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) "pYk" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/open, /area/maintenance/security/port) -"pYv" = ( -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/obj/structure/cable/heavyduty, -/turf/simulated/floor/reinforced/airless, -/area/space) "pYy" = ( /obj/structure/sink{ pixel_y = 22 @@ -12707,16 +14065,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"pZb" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"pZe" = ( +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -15 }, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/kitchen) "pZE" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -12724,12 +14079,41 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"pZZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) +"qaA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) +"qaC" = ( +/obj/machinery/computer/timeclock/premade/east, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "qaG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"qaJ" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/hallway/deck1/fore) "qaN" = ( /obj/structure/closet/walllocker/emerglocker/north, /obj/effect/floor_decal/corner/white/border{ @@ -12747,39 +14131,54 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"qcr" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/north, +"qbU" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) -"qcx" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) -"qcS" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/door/firedoor{ - dir = 2 +/area/main_map/maintenance/deck_one) +"qci" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"qdl" = ( -/obj/structure/railing{ +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) +"qcv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) +"qdl" = ( /obj/machinery/door/window/northleft, -/turf/simulated/floor/glass/reinforced, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) -"qdS" = ( -/obj/machinery/door/airlock/glass/security/polarized{ - id_tag = "detdoor"; - id_tint = "det_office"; - name = "Detective's Office"; - req_access = list(4) +"qdw" = ( +/obj/machinery/door/blast/regular{ + dir = 4 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/security/detectives_office) +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/Hangar_bay/deck1) +"qdT" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "qek" = ( /obj/structure/table/hardwoodtable, /obj/item/paper_bin, @@ -12804,13 +14203,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"qfC" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "qfM" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/main_map/hallway/deck1/fore) @@ -12847,12 +14239,26 @@ /obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"qjv" = ( +"qiH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"qju" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "qjL" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -12862,6 +14268,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"qkx" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "qkD" = ( /obj/machinery/atmospherics/portables_connector/fuel, /obj/machinery/portable_atmospherics/canister/phoron, @@ -12877,7 +14292,7 @@ /area/crew_quarters/sleep/Dorm_1) "qlB" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/heads/hos) "qlJ" = ( @@ -12889,16 +14304,12 @@ /obj/structure/flora/pottedplant/shoot, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/bar) -"qmY" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, -/turf/simulated/floor/plating, -/area/space) "qne" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/medbay_emt_bay) -"qof" = ( -/turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) +"qnA" = ( +/turf/simulated/wall, +/area/quartermaster/delivery) "qot" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/armoury) @@ -12923,6 +14334,15 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"qoN" = ( +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/main_map/maintenance/deck_one/aft/port) +"qoV" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "qpe" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -12933,48 +14353,16 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/chemistry) -"qqg" = ( -/obj/machinery/smartfridge, -/turf/simulated/wall, -/area/hydroponics) -"qqq" = ( -/obj/machinery/door/window/westright{ - dir = 4; - name = "Bar"; - req_access = list(25); - req_one_access = list(25) - }, -/obj/machinery/door/window/eastleft{ - dir = 8; - name = "Kitchen"; - req_one_access = list(28) - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +"qpu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"qqz" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "qqH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "qqI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel, @@ -12983,6 +14371,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/main_map/Hangar_bay/deck1/a) +"qrv" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "qsJ" = ( /obj/machinery/atmospherics/pipe/tank{ dir = 4 @@ -12995,6 +14387,15 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) +"qti" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/port) "quf" = ( /obj/structure/railing{ dir = 4 @@ -13010,6 +14411,12 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"quu" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "quX" = ( /obj/structure/sink{ dir = 8; @@ -13027,9 +14434,10 @@ /obj/random/bedsheet, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) -"qwr" = ( -/turf/simulated/floor/tiled/monotile, -/area/space) +"qvM" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "qws" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -13066,10 +14474,9 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"qye" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/medical/medbay) +"qzb" = ( +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "qAb" = ( /obj/structure/railing{ dir = 1 @@ -13079,6 +14486,20 @@ }, /turf/simulated/open, /area/maintenance/security/port) +"qAf" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/light/no_nightshift, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "qAk" = ( /obj/machinery/door/airlock/engineering{ name = "Hangar Substation" @@ -13089,6 +14510,18 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) +"qAC" = ( +/obj/structure/cable/green, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"qAV" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) +"qAZ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "qBt" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 1 @@ -13102,6 +14535,12 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"qBT" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "qCD" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/warden) @@ -13114,6 +14553,25 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"qDl" = ( +/obj/structure/sink{ + pixel_y = 22 + }, +/obj/structure/mirror{ + dir = 4; + pixel_y = 33 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) +"qDv" = ( +/turf/simulated/wall/prepainted/medical, +/area/main_map/hallway/deck1) "qDZ" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/industrial/outline/red, @@ -13121,12 +14579,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, /area/security/tactical) -"qEJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one) "qGh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 @@ -13150,31 +14602,17 @@ /obj/machinery/appliance/cooker/fryer, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"qHB" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/machinery/conveyor{ - dir = 4 - }, -/obj/map_helper/conveyor/belt{ - id_tag = "cargo_mailroom"; - name = "Cargo Mail belt" +"qGY" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Atmospherics"; + req_access = list(24) }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/aft/port) +"qHF" = ( +/obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) -"qHI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/area/quartermaster/delivery) "qHN" = ( /obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite{ @@ -13191,25 +14629,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"qJr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) -"qJL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "qKB" = ( /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) -"qKW" = ( -/turf/simulated/wall/r_wall, -/area/main_map/maintenance/atmospheric_substation/medical) "qLP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -13219,18 +14641,27 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"qLX" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/briefingroom) "qMn" = ( /obj/structure/bed/chair/comfy/teal{ dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) -"qMA" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +"qMJ" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "qMK" = ( /obj/fiftyspawner/glass, /obj/fiftyspawner/glass, @@ -13238,13 +14669,7 @@ /obj/structure/table/steel, /obj/item/tool/wrench, /turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) -"qMQ" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) +/area/space) "qNT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -13264,19 +14689,29 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"qPx" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) "qPG" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(30,47,77) }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) -"qPO" = ( -/obj/structure/marker_beacon/red, -/turf/simulated/floor/reinforced/airless, -/area/space) "qPR" = ( /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"qQe" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "qQh" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -13284,6 +14719,20 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) +"qQL" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"qQN" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "qRq" = ( /obj/structure/sign/directions/security{ dir = 1; @@ -13311,14 +14760,6 @@ }, /turf/simulated/floor/wood, /area/bridge/hallway) -"qRz" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "qSq" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -13347,6 +14788,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"qVc" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"qVQ" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/firedoor/multi_tile, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "qWs" = ( /obj/structure/table/marble, /obj/machinery/microwave, @@ -13358,12 +14812,53 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"qXI" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 +"qWW" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/machinery/light/no_nightshift{ + dir = 4 }, -/turf/simulated/floor/carpet, -/area/crew_quarters/heads/hop) +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"qWZ" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_one/aft/port) +"qXa" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/security/upper) +"qXB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/bar) "qYb" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -13379,15 +14874,36 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/main_map/Hangar_bay/deck1/a) -"qZW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"qYm" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) +"qYq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"qZw" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled, +/area/security/security_equiptment_storage) +"rat" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/main_map/Hangar_bay/deck1; + base_turf = /turf/simulated/floor/reinforced; + landmark_tag = "escape_station"; + name = "Escape Shuttle Euthenia" + }, +/turf/simulated/floor/reinforced, +/area/main_map/Hangar_bay/deck1) "raE" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -13416,21 +14932,15 @@ /obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"rdj" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) "rdI" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_one/starboard) -"rdN" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/holodeck_control) "rel" = ( /obj/structure/railing{ dir = 4 @@ -13444,19 +14954,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics) -"rez" = ( -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"reA" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock101"; - name = "Toilet 2" +"rfm" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/open, +/area/main_map/maintenance/deck_one) +"rfA" = ( +/obj/structure/closet/secure_closet/hos, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/heads/hos) "rgs" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -13465,12 +14972,10 @@ /obj/machinery/smartfridge/drinks, /turf/simulated/wall, /area/crew_quarters/bar_backroom) -"rhm" = ( -/obj/machinery/camera/network/medbay{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/medical/medbay) +"ric" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/lab) "riq" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck1/a) @@ -13485,7 +14990,7 @@ /turf/simulated/floor/airless, /area/space) "riy" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -13518,9 +15023,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) -"rkk" = ( -/turf/simulated/floor/tiled/white, -/area/space) +"rkp" = ( +/obj/item/chess/wqueen, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "rkK" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -13535,6 +15041,23 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"rkO" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) +"rlz" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/solar, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rlV" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "solar_dock"; @@ -13548,6 +15071,18 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/maintenance/solars) +"rlW" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/heads/hor) +"rmS" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "rnD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -13564,6 +15099,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "rpT" = ( @@ -13577,15 +15113,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"rqc" = ( -/obj/effect/floor_decal/techfloor{ - dir = 5 - }, -/obj/machinery/holoplant, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/high/north_bump, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/lab) "rqo" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -13600,29 +15127,13 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"rqS" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 5 - }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass{ - name = "Medbay Lobby" - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 +"rtf" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "rtx" = ( /obj/machinery/computer/robotics, /obj/effect/floor_decal/corner/purple{ @@ -13633,37 +15144,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"ruc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"ruS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) "ruW" = ( /obj/structure/table, /turf/simulated/floor/plating, /area/main_map/hallway/deck1/fore) -"rvm" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) -"rvu" = ( -/obj/landmark/spawnpoint/job/xenobotanist, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "rws" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -13704,6 +15188,18 @@ /obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled, /area/medical/surgery2) +"rwX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "rxc" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/floor_decal/industrial/outline/blue, @@ -13715,22 +15211,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"rxD" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/space) "rxT" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/door/firedoor{ @@ -13738,16 +15223,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"ryG" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 - }, -/turf/simulated/floor/tiled/white, -/area/space) +"ryY" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "rzB" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -13771,6 +15250,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) +"rAC" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mechbay"; + name = "Mech Bay" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/robotics/mechbay) "rBT" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -13794,22 +15281,24 @@ }, /obj/item/storage/firstaid/adv, /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"rBZ" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/security/upper) "rDl" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"rEi" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-8" +"rDD" = ( +/obj/structure/cable/green{ + icon_state = "0-2" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "rEB" = ( /obj/structure/table/rack/steel, /obj/structure/window/reinforced{ @@ -13837,29 +15326,12 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"rEI" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) -"rFO" = ( -/obj/machinery/holopad, -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) -"rGc" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 1 +"rFf" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/port) +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "rHa" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -13872,23 +15344,12 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) "rHt" = ( /obj/landmark/spawnpoint/job/chef, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"rIz" = ( -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/port) -"rJq" = ( -/obj/structure/bed/chair/comfy/orange{ - dir = 4 - }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) "rJs" = ( /obj/structure/grille, /obj/structure/girder/reinforced, @@ -13901,11 +15362,6 @@ }, /turf/simulated/floor/plating, /area/medical/medbay) -"rKf" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) "rKn" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -13937,14 +15393,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) -"rLF" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armorylight"; - name = "Light Armory Acccess" - }, -/turf/simulated/floor/reinforced, -/area/security/armoury) "rMT" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -13973,6 +15421,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"rNF" = ( +/obj/landmark/spawnpoint/overflow/station, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/Hangar_bay/deck1) "rOn" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14088,17 +15540,47 @@ "rWs" = ( /obj/machinery/light/small, /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) +"rWu" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/obj/machinery/camera/network/medbay, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "rWS" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"rXj" = ( +/obj/structure/bed/chair/comfy/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "rXs" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"rYF" = ( +/obj/structure/noticeboard{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "rZZ" = ( /obj/machinery/atmospherics/valve/open{ dir = 4; @@ -14117,12 +15599,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/forward/starboard) -"scw" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2-4-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "scJ" = ( /obj/structure/table/steel_reinforced, /obj/item/defib_kit/loaded{ @@ -14141,17 +15617,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"scS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"sde" = ( -/obj/machinery/cryopod/robot/door/shuttle, -/turf/simulated/floor/tiled/techmaint, -/area/space) "sdf" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -14175,6 +15640,13 @@ /obj/item/storage/box/beakers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"sdW" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "sft" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -14182,6 +15654,15 @@ /obj/landmark/spawnpoint/job/detective, /turf/simulated/floor/carpet, /area/security/detectives_office) +"sfx" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "siz" = ( /obj/machinery/deployable/barrier, /obj/effect/floor_decal/corner/blue/full{ @@ -14215,10 +15696,25 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/main_map/Hangar_bay/deck1/a) -"sll" = ( -/obj/structure/disposalpipe/sortjunction/untagged/flipped, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) +"skp" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"sks" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"sky" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "sly" = ( /obj/machinery/door/airlock/glass/research{ name = "Xenoflora Research"; @@ -14258,22 +15754,21 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"soC" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/beige{ - dir = 8 +"sob" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/wall, +/area/main_map/maintenance/deck_one/port) +"spj" = ( +/obj/structure/sink{ + pixel_y = 22 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"spg" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/mirror{ + dir = 4; + pixel_y = 33 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "spk" = ( /obj/structure/filingcabinet, /turf/simulated/floor/wood, @@ -14289,6 +15784,22 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/substation/command) +"sqt" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "sqC" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -14302,16 +15813,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"sqY" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) "sre" = ( /obj/structure/railing/grey{ dir = 8 @@ -14321,30 +15822,22 @@ }, /turf/simulated/floor/crystal, /area/space) -"srv" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) -"srO" = ( -/obj/structure/railing{ +"ssy" = ( +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/open, -/area/rnd/research/researchdivision) +/turf/simulated/floor/airless/ceiling, +/area/space) "ssY" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_4) +"stN" = ( +/obj/structure/table/marble, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) "swc" = ( /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/techfloor, @@ -14381,6 +15874,15 @@ /obj/machinery/botany/extractor, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"sxK" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "syo" = ( /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 4 @@ -14444,19 +15946,16 @@ "sCK" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/forward/port) -"sDo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"sCY" = ( +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) +"sDn" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "sEf" = ( /obj/structure/table/rack/steel, /obj/structure/window/reinforced, @@ -14485,6 +15984,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"sEn" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "sFq" = ( /obj/machinery/recharger/wallcharger{ pixel_x = -22 @@ -14515,14 +16018,6 @@ "sGy" = ( /turf/simulated/open, /area/tether/surfacebase/security/hallway) -"sGJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "sGW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -14530,6 +16025,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/warden) +"sIE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "sJc" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -14573,6 +16074,16 @@ /obj/machinery/appliance/cooker/oven, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"sKm" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "sMN" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/catwalk, @@ -14580,7 +16091,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/hallway/deck1) "sMU" = ( /obj/structure/flora/pottedplant/largebush, @@ -14605,6 +16116,16 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) +"sNR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "sOK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -14634,7 +16155,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) "sQu" = ( @@ -14645,12 +16166,20 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"sRa" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "sRV" = ( /obj/machinery/door/airlock/glass/security{ id_tag = "detdoor"; @@ -14665,24 +16194,29 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/security/forensics) -"sSs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"sSM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/lab) "sTr" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/solars) -"sUR" = ( -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/security/port) "sVe" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/riot_control) +"sVt" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "sVE" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -14696,12 +16230,43 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"sWj" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) "sWI" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -14711,12 +16276,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_one/port) -"sYi" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/space) "sYj" = ( /obj/machinery/door/airlock/glass/security{ name = "Observation"; @@ -14725,6 +16284,28 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/surfacebase/security/hallway) +"sYv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"sYA" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "sYI" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/main_map/hallway/deck1/fore) @@ -14754,10 +16335,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"sZd" = ( -/obj/structure/bed/chair/comfy/brown, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "sZh" = ( /obj/machinery/mech_recharger, /obj/machinery/camera/motion/security{ @@ -14765,10 +16342,6 @@ }, /turf/simulated/floor/reinforced, /area/security/tactical) -"sZJ" = ( -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white, -/area/space) "sZY" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -14786,9 +16359,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_4) -"tai" = ( -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/aft/port) "tay" = ( /obj/structure/table/steel_reinforced, /obj/item/stack/nanopaste{ @@ -14797,6 +16367,13 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/dark, /area/medical/medbay) +"taF" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1/fore) "taY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14810,12 +16387,6 @@ /obj/structure/bed/chair/sofa/blue/corner, /turf/simulated/floor/carpet/arcadecarpet, /area/main_map/maintenance/deck_one/port) -"tcC" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "tdp" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Solar Farm - SMES 1" @@ -14825,6 +16396,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) +"tdu" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) "tdE" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -14913,6 +16488,15 @@ /obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/Hangar_bay/deck1/a) +"thb" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "thD" = ( /obj/structure/table/woodentable, /obj/item/book/manual/standard_operating_procedure, @@ -14930,7 +16514,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "tim" = ( /turf/simulated/wall/r_wall, @@ -14987,6 +16571,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) +"tlO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "tmc" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -15022,6 +16612,12 @@ /obj/structure/window/basic, /turf/simulated/open, /area/crew_quarters/bar) +"tmB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "tnf" = ( /obj/structure/filingcabinet, /obj/machinery/light/no_nightshift{ @@ -15029,10 +16625,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officeb) -"tnz" = ( -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) "tnL" = ( /obj/structure/sign/directions/medical, /obj/structure/sign/directions/engineering{ @@ -15050,12 +16642,17 @@ /turf/simulated/floor/wood, /area/bridge/hallway) "toK" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) +"tpE" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/starboard) "tqf" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 1 @@ -15065,15 +16662,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"tqx" = ( -/obj/structure/sign/department/armory{ - pixel_y = 32 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +"tsi" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/turf/simulated/floor/tiled/red, -/area/space) +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "tti" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -15093,11 +16688,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"ttC" = ( -/obj/effect/floor_decal/corner/mauve/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor/grid, -/area/rnd/lab) "ttV" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -15120,12 +16710,22 @@ /obj/structure/railing{ dir = 1 }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, /turf/simulated/open, /area/crew_quarters/kitchen) -"tvI" = ( -/obj/structure/sign/greencross, -/turf/simulated/wall/prepainted/medical, -/area/medical/medbay) +"tvw" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck1) +"tvL" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "twi" = ( /obj/item/suit_cooling_unit{ pixel_y = -5 @@ -15169,6 +16769,15 @@ }, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) +"twy" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "txe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -15178,6 +16787,37 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"txV" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) +"tye" = ( +/obj/machinery/door/airlock/glass_external/public, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck1) +"tyw" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"tza" = ( +/obj/machinery/door/airlock/sandstone{ + name = "Command Showers" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/bridge/hallway) "tzW" = ( /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -15185,6 +16825,9 @@ /obj/structure/ladder, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/port) +"tAa" = ( +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "tAj" = ( /obj/structure/sign/deck1{ pixel_x = 32 @@ -15204,7 +16847,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet/tealcarpet, /area/crew_quarters/heads/cmo) "tBJ" = ( @@ -15231,6 +16874,13 @@ }, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) +"tCA" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "tCK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, @@ -15276,13 +16926,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"tFf" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, -/area/medical/reception) "tFr" = ( /obj/structure/table/hardwoodtable, /obj/item/flashlight/lamp{ @@ -15290,18 +16933,29 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) -"tGW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"tGS" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/disposaloutlet{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "tHh" = ( /turf/simulated/floor/wood, /area/crew_quarters/bar) +"tHw" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/security/detectives_office) "tHR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -15309,8 +16963,20 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"tIV" = ( +/obj/structure/bed/chair/wheelchair/dolly{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) +"tJe" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "tJt" = ( /turf/simulated/wall/r_wall, /area/security/warden) @@ -15330,12 +16996,76 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"tKY" = ( +/obj/machinery/door/airlock/glass/medical{ + id_tag = "MedbayFoyer"; + name = "Treatment Center" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "tLm" = ( /obj/machinery/camera/motion/security{ dir = 8 }, /turf/space, /area/space) +"tMe" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/bar) +"tMp" = ( +/obj/machinery/door/airlock/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/bar) +"tMv" = ( +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/lino, +/area/security/detectives_office) +"tMx" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) +"tMz" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "tMD" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -15367,6 +17097,10 @@ }, /turf/simulated/floor/crystal, /area/space) +"tPa" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "tPj" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, @@ -15474,10 +17208,6 @@ }, /turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) -"tSb" = ( -/obj/structure/closet/emcloset, -/turf/simulated/floor/plating, -/area/space) "tSd" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/map_helper/airlock/atmos/chamber_pump, @@ -15497,10 +17227,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"tSm" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) "tUH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -15510,6 +17236,23 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"tUX" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/obj/machinery/turnstile{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "tVx" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -15526,12 +17269,6 @@ "tVC" = ( /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) -"tVX" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "tWe" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -15545,6 +17282,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"tWF" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "tWN" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/surgery, @@ -15554,10 +17295,6 @@ /obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"tXs" = ( -/obj/machinery/vending/nifsoft_shop, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) "tYO" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -15575,20 +17312,32 @@ }, /turf/simulated/floor/tiled, /area/medical/reception) -"tZN" = ( -/obj/machinery/door/airlock/maintenance, -/obj/map_helper/network_builder/power_cable/green/auto, +"tZG" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/aft/port) -"uaP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/area/tether/surfacebase/security/hallway) +"tZK" = ( +/obj/structure/cable/green{ + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"uaF" = ( +/obj/machinery/conveyor{ + dir = 1 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" }, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/port) +/area/quartermaster/delivery) "uaR" = ( /obj/structure/sign/deck/first, /turf/simulated/wall/prepainted/civilian, @@ -15612,7 +17361,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "ubn" = ( @@ -15645,6 +17394,29 @@ "ucz" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_one/port) +"ucA" = ( +/obj/effect/floor_decal/corner/paleblue/bordercee{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"ucC" = ( +/obj/structure/filingcabinet/tall, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/security/lobby) "ucH" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, @@ -15660,6 +17432,24 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) +"uda" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "udq" = ( /obj/structure/table/rack/shelf/steel, /obj/item/gun/energy/taser, @@ -15673,10 +17463,15 @@ /obj/item/melee/baton/loaded, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"uei" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"udA" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Fighter Bay Maintenance"; + req_one_access = list(19,29,38,43,47,63,67) + }, /turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) +"udV" = ( +/turf/simulated/floor/reinforced/outdoors, /area/space) "ueD" = ( /turf/simulated/wall/prepainted/engineering, @@ -15688,6 +17483,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"ueW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "ufm" = ( /obj/machinery/computer/prisoner{ dir = 1 @@ -15761,6 +17565,13 @@ "uig" = ( /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/captain) +"uka" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "ukl" = ( /obj/machinery/ai_status_display{ pixel_y = 32 @@ -15796,21 +17607,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"ukO" = ( +/obj/machinery/holopad, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) +"ukP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officea) +"ulz" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole/right, +/obj/effect/floor_decal/techfloor/hole, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "umo" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"umz" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "umB" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officea) @@ -15883,6 +17703,31 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) +"uoU" = ( +/obj/machinery/door/window/brigdoor/southleft{ + dir = 8; + name = "Security Reception" + }, +/obj/structure/table/steel, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"upt" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "upV" = ( /obj/machinery/recharge_station, /obj/machinery/light/no_nightshift, @@ -15920,24 +17765,6 @@ /obj/structure/lattice, /turf/simulated/open, /area/crew_quarters/bar) -"usl" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/space) -"usz" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/shower{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/space) "usE" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -15959,6 +17786,30 @@ /obj/machinery/suit_storage_unit/medic, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"usR" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mechbay"; + name = "Mech Bay" + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = 6; + req_access = list(29,47); + req_one_access = list(47) + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = -5; + req_access = list(29,47); + req_one_access = list(47) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/robotics/mechbay) "utf" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -15969,19 +17820,8 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"uti" = ( -/obj/structure/table/marble, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) -"utj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "utn" = ( -/obj/machinery/power/apc/critical/south_bump, +/obj/machinery/power/apc/critical/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -16007,6 +17847,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"uwq" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/wall/prepainted/civilian, +/area/holodeck_control) "uxD" = ( /obj/machinery/vending/blood, /turf/simulated/floor/tiled/dark, @@ -16048,6 +17894,30 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/command) +"uAb" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/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/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) "uAq" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -16082,34 +17952,49 @@ "uBX" = ( /obj/structure/table/marble, /obj/item/retail_scanner/civilian, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "bar"; + name = "Bar counter shutters"; + pixel_x = -24; + pixel_y = 10 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "uCf" = ( /obj/machinery/vending/cola, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) -"uCs" = ( -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/space) "uCC" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/security/port) -"uDl" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +"uDw" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) +/obj/effect/floor_decal/spline/plain, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "uDy" = ( /obj/machinery/computer/ship/navigation{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"uDN" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "uDX" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_9) @@ -16132,16 +18017,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) -"uEQ" = ( -/obj/structure/bed/chair/comfy/red{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) "uFv" = ( /obj/structure/table/rack/shelf/steel, /obj/item/gun/energy/laser, @@ -16157,54 +18032,12 @@ /obj/item/retail_scanner/medical, /turf/simulated/floor/tiled, /area/medical/reception) -"uGa" = ( -/turf/simulated/floor/tiled/steel_grid, -/area/space) -"uGe" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"uGi" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) -"uGj" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/noticeboard{ - dir = 4; - pixel_x = -32 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) "uGn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) -"uHi" = ( -/obj/machinery/holopad, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) "uHB" = ( /obj/structure/railing{ dir = 4 @@ -16219,10 +18052,13 @@ /obj/structure/closet/crate/corporate/nanotrasen, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"uIm" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/forward/port) +"uIo" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "uIq" = ( /obj/structure/closet/wardrobe/red, /obj/effect/floor_decal/industrial/outline/yellow, @@ -16285,6 +18121,11 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"uKi" = ( +/obj/structure/table/woodentable, +/obj/item/paper_bin, +/turf/simulated/floor/lino, +/area/security/detectives_office) "uKM" = ( /obj/structure/ladder, /obj/structure/bookcase, @@ -16295,12 +18136,18 @@ icon_state = "1-2" }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/carpet, /area/security/warden) -"uMn" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/space) +"uMf" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "uNR" = ( /obj/machinery/computer/operating{ dir = 4 @@ -16313,8 +18160,7 @@ /area/main_map/maintenance/deck_one/port) "uQj" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/defib_kit/loaded, @@ -16343,6 +18189,12 @@ }, /turf/simulated/floor/plating, /area/medical/reception) +"uRc" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "uRi" = ( /obj/structure/sign/directions/medical{ dir = 4; @@ -16383,6 +18235,15 @@ /obj/structure/sign/warning/caution, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora_storage) +"uTa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "uTg" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/hor) @@ -16459,35 +18320,20 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"vbQ" = ( +/obj/structure/table/marble, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/chemical_dispenser/catering/bar_soft, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) "vbU" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"vcD" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 1 - }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/space) -"vdj" = ( -/obj/structure/closet/crate/bin{ - desc = "A large bin for medical and other personnel that deals with bio-grade waste."; - icon_closed = "biohazard"; - icon_opened = "biohazardopen"; - icon_state = "biohazard"; - name = "biohazard bin" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/medical/surgery2) "vdr" = ( /obj/machinery/optable, /obj/machinery/oxygen_pump/anesthetic{ @@ -16533,12 +18379,16 @@ }, /area/holodeck_control) "vfz" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) +"vfS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "vgc" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) @@ -16586,21 +18436,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"vhG" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) -"vhU" = ( -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_one/aft/port) "viM" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -16637,6 +18472,11 @@ /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_one/starboard) +"vjr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "vjE" = ( /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, @@ -16652,32 +18492,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) -"vkf" = ( -/obj/machinery/door/airlock/glass/medical{ - id_tag = "MedbayFoyer"; - name = "Treatment Center" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) -"vkl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"vkG" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1) +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "vkV" = ( /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/chemistry) @@ -16708,6 +18529,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora) +"vmt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) "vmy" = ( /obj/structure/railing{ dir = 8 @@ -16717,6 +18551,13 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"vmT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "vns" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16727,22 +18568,28 @@ }, /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) -"vnT" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, +"voh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"von" = ( -/obj/structure/cable/green, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"voS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "voW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -16750,7 +18597,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "vpq" = ( /obj/structure/cable/heavyduty{ @@ -16761,6 +18608,26 @@ }, /turf/simulated/floor/reinforced, /area/space) +"vpH" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"vpO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science"; + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/lab) "vqk" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/masks{ @@ -16786,12 +18653,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay) "vql" = ( -/obj/machinery/power/apc/direction_bump/north, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "2-8" }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/security/upper) @@ -16825,39 +18691,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"vsX" = ( -/obj/structure/catwalk, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "vsZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) -"vtd" = ( -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 5 - }, -/obj/machinery/door/airlock/glass{ - name = "Medbay Lobby" +"vtk" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "vtL" = ( /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law, @@ -16913,6 +18757,21 @@ }, /turf/simulated/floor/tiled, /area/medical/reception) +"vvk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "vvO" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/tiled, @@ -16933,6 +18792,11 @@ /obj/landmark/spawnpoint/job/head_nurse, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) +"vwZ" = ( +/obj/structure/railing, +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/glass/reinforced, +/area/hydroponics) "vxh" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -16960,12 +18824,29 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) -"vze" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +"vzn" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"vzt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/aft/port) +/area/main_map/hallway/deck1/fore) +"vzz" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "vzP" = ( /obj/structure/closet/walllocker/emerglocker/north, /obj/effect/floor_decal/corner/white/border{ @@ -16977,11 +18858,10 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) -"vBA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +"vBd" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/delivery) "vCf" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/landmark{ @@ -17007,12 +18887,30 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"vEd" = ( +/obj/machinery/smartfridge{ + dir = 8 + }, +/turf/simulated/wall, +/area/hydroponics) +"vEK" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "vEL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"vEM" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "vEY" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -17025,16 +18923,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"vFe" = ( -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy{ - dir = 1 +"vFn" = ( +/obj/structure/railing{ + dir = 4 }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/space) +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "vFR" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/meter, @@ -17050,29 +18944,9 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"vIq" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "armoryriot"; - name = "Emergency Armory Access" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/security/riot_control) -"vIA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/west, -/turf/simulated/floor/reinforced, -/area/security/tactical) +"vGQ" = ( +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) "vJd" = ( /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -17083,25 +18957,23 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"vJe" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armoryriot"; + name = "Emergency Armory Access" + }, +/turf/simulated/floor/reinforced, +/area/security/riot_control) "vJv" = ( /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) -"vJy" = ( +"vJA" = ( +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/solar, -/turf/simulated/floor/reinforced/airless, -/area/space) -"vJO" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/floor/tiled/techfloor, /area/crew_quarters/bar) "vKi" = ( /obj/structure/cable{ @@ -17157,8 +19029,7 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -17173,7 +19044,7 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/maintenance/solars) -"vNv" = ( +"vNm" = ( /obj/structure/railing{ dir = 1 }, @@ -17181,7 +19052,7 @@ dir = 1 }, /turf/simulated/open, -/area/space) +/area/tether/surfacebase/security/lobby) "vNx" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -17197,41 +19068,23 @@ /obj/random/bedsheet/double, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) -"vPf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) +"vOO" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_one/aft/port) "vPi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"vPy" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/bar) -"vPC" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/window/westright{ - name = "Bar"; - req_access = list(25); - req_one_access = list(25) +"vPu" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock100"; + name = "Toilet 1" }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "vPE" = ( /turf/simulated/floor/glass/reinforced, /area/tether/surfacebase/security/hallway) @@ -17244,6 +19097,26 @@ icon_state = "techmaint" }, /area/holodeck_control) +"vPY" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/hallway) +"vQe" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"vQI" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "vQP" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -17268,6 +19141,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"vRw" = ( +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24; + pixel_y = -5 + }, +/obj/structure/bed/chair/comfy/blue, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) "vRx" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -17295,27 +19180,12 @@ }, /turf/simulated/floor/glass/reinforced, /area/bridge/bunker) -"vSw" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -22 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) "vTl" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) -"vTH" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "vUe" = ( /obj/machinery/atmospherics/pipe/zpipe/down/supply{ dir = 1 @@ -17359,6 +19229,19 @@ /obj/machinery/microscope, /turf/simulated/floor/tiled/white, /area/security/forensics) +"vUJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"vUL" = ( +/obj/structure/railing, +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "vUX" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officecommon) @@ -17398,7 +19281,7 @@ name = "Bridge Lockdown"; opacity = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/bridge/bunker) "vXp" = ( /obj/effect/floor_decal/borderfloor{ @@ -17415,17 +19298,9 @@ "vXI" = ( /turf/simulated/wall/prepainted/medical, /area/medical/reception) -"vYy" = ( -/turf/simulated/floor/plating, -/area/space) -"vYK" = ( -/obj/machinery/door/airlock/glass/security{ - name = "Warden's Office"; - req_access = list(3) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, -/area/security/warden) +"vZd" = ( +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "vZf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/effect/floor_decal/techfloor/corner{ @@ -17443,20 +19318,6 @@ }, /turf/simulated/open, /area/bridge/bunker) -"vZt" = ( -/obj/machinery/door/airlock{ - name = "Internal Affairs"; - req_access = list(38) - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officeb) -"vZK" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) "was" = ( /obj/structure/catwalk, /obj/structure/ladder, @@ -17493,6 +19354,19 @@ "wbY" = ( /turf/simulated/floor/glass/reinforced, /area/medical/medbay) +"wcc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"wch" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "wdu" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/railing{ @@ -17520,6 +19394,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) +"weS" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "wfe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -17530,14 +19410,21 @@ /obj/effect/floor_decal/corner/blue{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"wgP" = ( +/obj/machinery/button/remote/airlock{ + id = "bathroomlock101"; + name = "Bathroom Lock"; + pixel_x = -20; + pixel_y = -20; + specialfunctions = 4 + }, +/obj/structure/toilet, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "whe" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/portables_connector, @@ -17607,6 +19494,12 @@ name = "Holodeck Projector Floor" }, /area/holodeck/alphadeck) +"wiR" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/heads/hos) "wjk" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -17620,15 +19513,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"wjA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/space) "wjN" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -17643,27 +19527,10 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"wkY" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/dark, -/area/security/warden) -"wlo" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"wmf" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/lattice, -/obj/structure/sign/deck1{ - pixel_y = -32 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_one/forward/port) +"wlt" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "wmo" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -17673,6 +19540,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"wmA" = ( +/turf/simulated/open, +/area/main_map/Hangar_bay/deck1) "wmH" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, @@ -17686,16 +19556,18 @@ "wnD" = ( /turf/simulated/wall/prepainted/medical, /area/medical/medbay_emt_bay) -"wnS" = ( -/obj/structure/ladder, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/forward/port) "wor" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_x = -32 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) +"wou" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "woI" = ( /obj/structure/bookcase/legal/corpreg, /obj/item/book/manual/legal/cr_vol1, @@ -17723,7 +19595,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) "wpA" = ( @@ -17776,10 +19648,30 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"wtb" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wtd" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/forward/port) +"wtR" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "armorytactical"; + name = "Tactical Armory Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/security/tactical) "wtT" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 @@ -17794,38 +19686,38 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"wun" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/turnstile{ - dir = 8 +"wvm" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/security/lobby) +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wvu" = ( /obj/structure/sign/greencross, /turf/simulated/wall/prepainted/medical, /area/medical/reception) -"wwz" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"wwI" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) +"wwS" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"wxg" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "wxQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -17838,18 +19730,6 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"wyb" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) "wyj" = ( /obj/machinery/atmospherics/component/unary/freezer{ icon_state = "freezer" @@ -17865,16 +19745,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"wyq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "wyy" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/aft/port) @@ -17931,6 +19801,22 @@ "wCD" = ( /turf/simulated/wall, /area/crew_quarters/recreation_area) +"wCF" = ( +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/obj/structure/cable/heavyduty{ + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"wCG" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "wCI" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -17944,20 +19830,6 @@ /obj/landmark/spawnpoint/job/detective, /turf/simulated/floor/carpet, /area/security/detectives_office) -"wCM" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/obj/structure/table/standard, -/obj/random/soap, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/space) -"wDN" = ( -/turf/simulated/floor/tiled, -/area/medical/medbay) "wEc" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -17970,6 +19842,13 @@ "wEl" = ( /turf/simulated/floor/wood, /area/bridge/hallway) +"wES" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/obj/machinery/media/jukebox, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wFy" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -17979,6 +19858,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/forensics) +"wHl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "wHz" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17992,33 +19880,41 @@ }, /turf/simulated/floor/carpet, /area/security/warden) -"wIf" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/beige{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +"wHU" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "wIk" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) -"wJj" = ( -/obj/machinery/door/firedoor{ - dir = 2 +"wJp" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1/fore) +"wJO" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"wJm" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/space) +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced, +/area/security/tactical) "wKw" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/meter, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"wKE" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "wKM" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -18052,45 +19948,103 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/surgery) +"wLg" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) "wLA" = ( /obj/structure/railing{ dir = 1 }, /turf/space, /area/space) -"wLS" = ( -/obj/machinery/button/remote/airlock{ - id = "bathroomlock101"; - name = "Bathroom Lock"; - pixel_x = -20; - pixel_y = -20; - specialfunctions = 4 +"wLJ" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/machinery/shower{ + dir = 4 }, -/obj/structure/toilet, /turf/simulated/floor/tiled/white, -/area/space) +/area/bridge/hallway) +"wMn" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "wMA" = ( /turf/simulated/wall{ can_open = 1 }, /area/main_map/maintenance/deck_one) +"wMF" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"wMH" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"wMW" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/briefingroom) +"wNe" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "wNm" = ( /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"wNJ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"wOY" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "wPj" = ( /obj/structure/table/steel, /obj/item/folder/red, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"wPm" = ( -/obj/structure/table/marble, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) "wPB" = ( /turf/simulated/open, /area/main_map/maintenance/deck_one/port) @@ -18098,6 +20052,22 @@ /obj/item/stool/padded, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/bar) +"wQf" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "wQG" = ( /turf/space/basic, /area/space) @@ -18123,13 +20093,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"wRC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"wRV" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/bed/chair/comfy/black{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wSp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18164,8 +20134,12 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/hallway/deck1/fore) +"wST" = ( +/obj/structure/marker_beacon/red, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "wTD" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -18181,6 +20155,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) +"wUy" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) +"wUA" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "wUW" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, @@ -18198,6 +20185,12 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) +"wXR" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "wYi" = ( /obj/effect/floor_decal/corner/white/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18213,17 +20206,36 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) -"wZd" = ( -/obj/structure/table/marble, -/obj/structure/table/marble, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) -"xaj" = ( +"wZo" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) +"wZw" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"wZM" = ( +/obj/structure/railing{ + dir = 1 + }, /obj/structure/railing{ dir = 4 }, -/turf/simulated/open, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"xan" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/bar) "xbv" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -18284,6 +20296,11 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_5) +"xdn" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/lino, +/area/security/detectives_office) "xdy" = ( /obj/machinery/door/firedoor/glass, /obj/structure/table/reinforced, @@ -18326,6 +20343,41 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"xhM" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + id = "MedbayFoyer"; + name = "Door Switch"; + pixel_x = 27; + pixel_y = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"xid" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armoryriot"; + name = "Emergency Armory Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/security/riot_control) "xiN" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -18358,21 +20410,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"xjP" = ( -/obj/machinery/door/airlock/glass/medical{ - id_tag = "MedbayEmergency"; - name = "Medbay Emergency Access" - }, -/obj/machinery/door/blast/shutters{ - density = 0; +"xkQ" = ( +/obj/machinery/atmospherics/component/binary/pump{ dir = 4; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 + name = "Port to Isolation" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/medical/medbay) +/area/rnd/xenobiology/xenoflora_storage) +"xmr" = ( +/obj/machinery/light/small, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "xmP" = ( /obj/structure/bed/padded, /obj/random/bedsheet, @@ -18395,6 +20450,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"xnq" = ( +/obj/structure/catwalk, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/open, +/area/maintenance/security/port) +"xnC" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2-4-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xnP" = ( /obj/structure/railing{ dir = 1 @@ -18421,9 +20489,6 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) -"xpK" = ( -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/port) "xpN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18441,13 +20506,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/medical/medbay) -"xpV" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/space) "xqQ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -18470,22 +20528,6 @@ }, /turf/simulated/open, /area/rnd/robotics) -"xsW" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) "xuq" = ( /obj/structure/railing, /turf/simulated/floor/reinforced, @@ -18500,21 +20542,28 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/security/forensics) +"xvp" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xvs" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"xvS" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) +"xvO" = ( +/obj/machinery/door/airlock/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/security/detectives_office) "xwj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -18575,6 +20624,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) +"xyT" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "xzy" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, @@ -18584,13 +20637,6 @@ /obj/structure/sign/deck/first, /turf/simulated/wall, /area/main_map/hallway/deck1) -"xAO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/dark, -/area/security/warden) "xBc" = ( /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -18604,12 +20650,18 @@ /area/rnd/lab) "xBq" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "xBY" = ( /obj/structure/flora/pottedplant/shoot, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) +"xCO" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "xCP" = ( /obj/structure/closet{ desc = "Dents and old flaky paint blanket this old storage unit."; @@ -18619,11 +20671,10 @@ /obj/random/plushielarge, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) -"xCR" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +"xCV" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "xDi" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -18637,11 +20688,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery) -"xDX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "xFr" = ( /obj/structure/railing/grey{ dir = 8 @@ -18658,6 +20704,15 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/white, /area/medical/reception) +"xFM" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "xFO" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -18678,6 +20733,12 @@ "xGQ" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/hallway) +"xHN" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "xHO" = ( /obj/spawner/window/low_wall/borosillicate/full/firelocks, /turf/simulated/floor/plating, @@ -18702,9 +20763,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/reinforced, /area/security/riot_control) -"xKi" = ( -/turf/simulated/floor/tiled/techmaint, -/area/space) +"xJY" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "xKq" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -18745,6 +20809,9 @@ }, /turf/simulated/floor/tiled, /area/medical/surgery) +"xLk" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "xLH" = ( /obj/structure/table/reinforced, /obj/item/folder/red_hos, @@ -18764,22 +20831,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"xLV" = ( +/obj/structure/sign/department/armory{ + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) "xMN" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/crystal, /area/space) -"xMX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "xNd" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor/hole, @@ -18846,13 +20912,31 @@ /obj/structure/railing, /turf/space, /area/space) -"xVu" = ( -/obj/machinery/door/airlock/security{ - name = "Equipment Storage"; - req_access = list() +"xTr" = ( +/obj/machinery/conveyor{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/security_equiptment_storage) +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"xTE" = ( +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/aft/port) +"xTN" = ( +/obj/effect/floor_decal/corner/mauve/full, +/obj/structure/window/reinforced, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rnd/lab) "xWv" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -18868,21 +20952,28 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"xWG" = ( +/obj/structure/railing, +/obj/structure/window/reinforced, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/open, +/area/medical/medbay) "xWT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "xWZ" = ( /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"xXe" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/crew_quarters/recreation_area) "xXn" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -18926,9 +21017,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/lino, @@ -18937,10 +21026,26 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) -"xZI" = ( -/obj/machinery/computer/timeclock/premade/east, -/turf/simulated/floor/tiled, -/area/space) +"xZD" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "xZX" = ( /turf/simulated/floor/glass/reinforced, /area/crew_quarters/bar) @@ -18994,6 +21099,20 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) +"ycm" = ( +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24; + pixel_y = -5 + }, +/obj/structure/bed/chair/sofa/teal/left{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_3) "ycp" = ( /obj/effect/floor_decal/corner/white/border, /obj/machinery/light/small, @@ -19002,32 +21121,13 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) -"ycs" = ( +"yed" = ( +/obj/machinery/door/airlock/maintenance/cargo, /obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/space) -"ycJ" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) -"ycS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + icon_state = "4-8" }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) -"ydq" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/delivery) "yek" = ( /obj/structure/window/reinforced{ dir = 1 @@ -19099,6 +21199,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"yjd" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "ykB" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) @@ -21717,7 +23823,7 @@ wQG bmU bmU bmU -qPO +wST bmU bmU bmU @@ -21807,7 +23913,7 @@ wQG bmU bmU bmU -qPO +wST bmU bmU wQG @@ -21911,7 +24017,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22001,7 +24107,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22105,7 +24211,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22195,7 +24301,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22299,7 +24405,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22389,7 +24495,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22493,7 +24599,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22531,21 +24637,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -22583,7 +24689,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22687,7 +24793,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22722,27 +24828,27 @@ wQG wQG bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV fgk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -22777,7 +24883,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22881,7 +24987,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22913,33 +25019,33 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV aBR aBR -gry -gry -gry -gry -gry -iaT -gry -gry -gry -gry -gry +fyh +fyh +fyh +fyh +fyh +hNc +fyh +fyh +fyh +fyh +fyh aBR aBR -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV bmU tLm bmU @@ -22971,7 +25077,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -23074,9 +25180,9 @@ wQG wQG bmU bmU -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -23108,31 +25214,31 @@ oPU oPU oPU oPU -lLO -lLO +udV +udV oPU oPU oPU oPU -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV nyN -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV cBZ cBZ cBZ wUW -lLO -lLO +udV +udV cZP cZP cZP @@ -23164,9 +25270,9 @@ wQG wQG bmU bmU -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -23268,9 +25374,9 @@ wQG wQG bmU bmU -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -23308,22 +25414,22 @@ oPU uYz uYz oPU -lLO -lLO -lLO +udV +udV +udV knG -lLO -vJy +udV +rlz hXH -von -lLO +qAC +udV knG -lLO -lLO -lLO +udV +udV +udV cBZ -hHj -vSw +lmG +kfo cBZ cBZ cBZ @@ -23358,9 +25464,9 @@ wQG wQG bmU bmU -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -23461,11 +25567,11 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -23502,19 +25608,19 @@ uYz uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ rEB vVr @@ -23551,11 +25657,11 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -23653,15 +25759,15 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -23692,31 +25798,31 @@ uYz wyy uYz uYz -uYz +rkp uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ fxW vVr rnD ogG tPj -bBN -vIA +gFh +wJO sZh iKd iKd @@ -23743,15 +25849,15 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -23846,17 +25952,17 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -23888,37 +25994,37 @@ uYz uYz uYz uYz -uYz +orw oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ yek vVr xOm okA xJV -fWp -nwG +wtR +bgq jnc vLX iKd -cZP -cZP -cZP -cZP -cZP +iKd +iKd +iKd +iKd +iKd mqS mqS aBR @@ -23936,17 +26042,17 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -24038,21 +26144,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -24084,19 +26190,19 @@ uYz uYz uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ eDR tgB @@ -24108,11 +26214,11 @@ hdz jnc fSM iKd -oeC -oeC -oeC -oeC -cZP +jxs +jxs +jxs +jxs +iKd aBR aBR aBR @@ -24128,21 +26234,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -24230,28 +26336,28 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz ovz -iZI -iZI -iZI -iZI -iZI -iZI -iZI +cqI +cqI +cqI +cqI +cqI +cqI +cqI ovz ovz rJs @@ -24275,70 +26381,70 @@ wyy uYz uYz uYz -uYz +juY uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ sVe -lLS -vIq +vJe +xid jtz sVe uFv kai jnc mpj -cZP -oeC -oeC -oeC -oeC +aav +jxs +jxs +jxs +jxs iKd -uMn -uMn -uMn -uMn -uMn -uMn -mqS -mqS -aBR -aBR -aBR -aBR -aBR -aBR -aBR -aBR -aBR -aBR -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +xGQ +xGQ +xGQ +xGQ +xGQ +xGQ +laz +laz +cWt +cWt +cWt +cWt +cWt +cWt +cWt +cWt +cWt +cWt +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -24422,21 +26528,21 @@ bmU bmU bmU bmU -lLO -gry -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +fyh +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -24466,25 +26572,25 @@ uYz uYz uYz wyy -uYz +cCn uYz uYz uYz uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -vJy +aCm +rlz apD -jch -lLO -lLO +aCm +udV +udV rPq hoS tWe @@ -24495,46 +26601,46 @@ tDi ovX jnc mpj -cZP -oeC -oeC -oeC -oeC +aav +jxs +jxs +jxs +jxs iKd -dpB -dpB -dpB -dpB -dpB -uMn -uMn -uMn -uMn -uMn -oFr -oFr -oFr -oFr -uGa -uGa -uGa -uGa -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -gry -lLO +eks +eks +eks +eks +eks +xGQ +xGQ +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +gjE +sEn +sEn +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +fyh +udV bmU bmU bmU @@ -24616,21 +26722,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -24666,19 +26772,19 @@ uYz uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -jch -vJy +aCm +rlz apD -jch -lLO -lLO +aCm +udV +udV rPq kuK tJW @@ -24690,45 +26796,45 @@ vQP eYC bTt iKd -oeC -oeC -oeC -oeC +jxs +jxs +jxs +jxs iKd -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -uGa -uGa -uGa -uGa -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +eks +eks +eks +eks +eks +eks +eks +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +lHx +cPn +uIo +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -24810,21 +26916,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -24848,31 +26954,31 @@ wyy wyy wyy wyy -wyy -wyy -wyy -wyy -wyy -wyy -wyy -wyy -wyy +vdN +qoN +qoN +qoN +qoN +qoN +qoN +qoN +qoN uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -von -oeA +qAC +kpK apD -von -lLO -lLO +qAC +udV +udV rPq una tJW @@ -24880,8 +26986,8 @@ sOK udq qot iKd -nzi -nzi +mqZ +mqZ iKd iKd iKd @@ -24889,40 +26995,40 @@ iKd iKd iKd iKd -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -aBR -bCn -bCn -bCn -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +eks +eks +eks +eks +eks +eks +eks +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +cWt +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -25004,21 +27110,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -25041,82 +27147,82 @@ pwO pwO pwO pwO +pwO +pwO +qoN uYz uYz -wyy uYz uYz uYz uYz -uYz -uYz -wyy +qoN uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -oeA +qAC +kpK hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV rPq -hlb -fLR +fuO +cyF sOK jXb qot -oxz -dRw -esd -jew -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -mTt -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +vPY +mfP +pZZ +igz +xGQ +eks +eks +eks +eks +xGQ +eks +eks +eks +eks +eks +eks +eks +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +lHx +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -25196,23 +27302,23 @@ bmU bmU bmU bmU -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -25237,82 +27343,82 @@ uYz pwO uYz uYz -wyy +qoN uYz uYz uYz uYz uYz uYz -wyy +qoN uYz uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -jch -lLO -lLO +aCm +udV +udV rPq sqC tJW sOK glV pGe -dpB -dpB -gCL -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -mTt -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO +fgg +fgg +sJp +fgg +xGQ +eks +eks +eks +eks +xGQ +eks +eks +eks +eks +xGQ +xGQ +xGQ +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +lHx +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV bmU bmU bmU @@ -25388,25 +27494,25 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -25431,84 +27537,84 @@ uYz pwO uYz uYz -wyy +qoN +ekO uYz uYz uYz uYz -uYz -uYz -wyy +wHU +qoN uYz uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -vJy +aCm +rlz apD -jch -lLO -lLO +aCm +udV +udV rPq fox tJW sOK aZQ pGe -dpB -dpB -gCL -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -mTt -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO +fgg +fgg +sJp +fgg +xGQ +eks +eks +eks +eks +xGQ +eks +eks +eks +eks +xGQ +vJv +vJv +wwI +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +lHx +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV bmU bmU bmU @@ -25581,26 +27687,26 @@ bmU bmU bmU bmU -lLO -lLO -gry -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +fyh +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -25625,29 +27731,29 @@ uYz pwO uYz uYz -wyy +qoN uYz uYz uYz uYz uYz uYz +qoN wyy -wyy -wyy +vdN oPU oPU -lLO -vJy +udV +rlz apD -von -oeA +qAC +kpK hXH -jch -vJy +aCm +rlz apD -jch -lLO +aCm +udV jny rPq fox @@ -25655,55 +27761,55 @@ tJW sOK osD rPq -tqx -gCL -gCL -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -uGa -aBR -mTt -mTt -aBR -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -gry -lLO -lLO +xLV +sJp +sJp +fgg +xGQ +eks +eks +eks +eks +xGQ +eks +eks +eks +eks +eks +vJv +lQr +myV +gqS +vGQ +vGQ +cWt +lHx +lHx +cWt +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +fyh +udV +udV bmU bmU bmU @@ -25775,26 +27881,26 @@ bmU bmU bmU bmU -lLO -vTH +udV +eZR lMW -dBY -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +mjM +udV +eZR +pnO +mjM +udV +udV +mrH +qdw +qdw +qdw +qdw +qdw +qdw +qdw +qdw +qdw ovz bJT bJT @@ -25819,85 +27925,85 @@ wyy vdN wyy wyy -wyy -uYz +qoN uYz uYz uYz uYz uYz -wyy -uYz uYz +qoN uYz +pwO +pwO oPU -lLO -vJy +udV +rlz apD -jch -oeA +aCm +kpK hXH -jch -vJy +aCm +rlz apD -jch -lLO +aCm +udV jny gdi fvI tJW riS vDb -rLF -nSu -xKi -xKi -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -nxk -dpB -dpB -dpB -uMn -uGa -lMW -lMW -lMW -lMW -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -vTH +lGU +oDt +vJv +vJv +fgg +xGQ +xGQ +vJv +xGQ +xGQ +xGQ +fgg +fgg +fgg +fgg +fgg +vJv +lQr +pJd +cdY +vGQ +vGQ +qzb +qzb +qzb +qzb +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +eZR lMW -dBY -lLO +mjM +udV bmU bmU bmU @@ -25969,26 +28075,26 @@ bmU bmU bmU bmU -lLO -vTH +udV +eZR lMW -dBY -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +mjM +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26013,36 +28119,36 @@ uYz pwO uYz uYz -wyy +qoN uYz uYz uYz uYz uYz uYz -wyy +qoN uYz uYz -uYz -pyu -lLO -vJy +pwO +vOO +udV +rlz apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -von -lLO +qAC +udV jny siz tEC tDT wfe dcS -nzG +bYV jGp lQr vJv @@ -26059,39 +28165,39 @@ vJv vJv vJv vJv -vJv -fgg -fgg -uMn -uGa -jUd -lMW -lMW -lMW -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -vTH +lQr +pJd +pJd +pJd +gjE +bkY +qzb +qzb +qzb +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +eZR lMW -dBY -lLO +mjM +udV bmU bmU bmU @@ -26163,26 +28269,26 @@ bmU bmU bmU bmU -lLO -vTH -peB -avn -gry -jCH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +eZR +pnO +kUD +fyh +kiR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26207,29 +28313,29 @@ uYz pwO uYz uYz -wyy +qoN uYz uYz uYz uYz uYz uYz -wyy +qoN uYz uYz -uYz -pyu -lLO -vJy +pwO +vOO +udV +rlz apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -von -lLO +qAC +udV tJt qCD qCD @@ -26239,53 +28345,53 @@ eby qCD vJv lQr -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr fgg fgg -uMn -uGa -sYi -lMW -lMW -lMW -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -umz -gry -jCH -lLO -dBY -lLO +pJd +gjE +eQf +vEM +vEM +vEM +vEM +tCA +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +wZM +fyh +kiR +udV +mjM +udV bmU bmU bmU @@ -26357,26 +28463,26 @@ bmU bmU bmU bmU -lLO -vTH -peB -peB -peB -peB -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +eZR +pnO +pnO +pnO +pnO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26401,29 +28507,29 @@ uYz pwO uYz uYz -wyy -wyy -wyy -wyy -wyy -joZ -joZ -joZ -joZ -joZ +qoN +ekO +uYz +uYz +uYz +uYz +wHU +qoN uYz -pyu -lLO -vJy +uYz +pwO +vOO +udV +rlz apD -von -oeA +qAC +kpK hXH -von -oeA +qAC +kpK apD -von -lLO +qAC +udV tJt sQG bAe @@ -26434,15 +28540,15 @@ iac vJv lQr ogl +ivI +ivI ogl +jxY +qLX ogl -ogl -idb -idb -ogl -ogl -ogl -ogl +ivI +ivI +ivI ogl cQb gxY @@ -26450,36 +28556,36 @@ gxY gxY dxU fgg -uMn -uGa -sYi -lMW -lMW -lMW -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -lLO -lLO -lLO -lLO -dBY -lLO +pJd +gjE +sEn +sEn +sEn +sEn +sEn +sEn +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +udV +udV +udV +udV +mjM +udV bmU bmU bmU @@ -26552,25 +28658,25 @@ bmU bmU bmU bmU -lLO -tcC -tcC -tcC -qfC -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +aYP +aYP +aYP +gSE +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26595,29 +28701,29 @@ uYz pwO uYz uYz -wyy +qoN +uYz +uYz uYz uYz uYz -pwO -fQI -tAj -mEw -mEw -joZ uYz -pyu -lLO -vJy +qoN +wyy +wyy +vdN +oPU +udV +rlz apD -von -oeA +qAC +kpK hXH -jch -oeA +aCm +kpK apD -jch -lLO +aCm +udV tJt cyQ jtU @@ -26627,7 +28733,7 @@ ohL hMD lQr lQr -ogl +ivI rXs rXs dgp @@ -26637,42 +28743,42 @@ rUU khH khH dsB -ogl +ivI vJv sJp xGQ sYj xGQ cxT -uMn -cjx -btn -btn -btn -btn -jBk -jBk -jBk -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -bMX -tcC -tcC -tcC -lLO +pJd +dlQ +dlQ +dlQ +udA +dlQ +dlQ +dlQ +dlQ +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +xvp +aYP +aYP +aYP +udV bmU bmU bmU @@ -26748,23 +28854,23 @@ bmU bmU bmU bmU -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26789,29 +28895,29 @@ uYz pwO uYz uYz -wyy -uYz -uYz -uYz +qoN pwO +pwO +tAj +mEw +mEw joZ -joZ -joZ -joZ -joZ +qoN +uYz uYz -pyu -lLO -oeA +pwO +vOO +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -jch -lLO +aCm +udV tJt dPZ cNI @@ -26821,7 +28927,7 @@ jkh qCD vJv lQr -ogl +ivI rXs dVH dft @@ -26831,40 +28937,40 @@ alY wPj wPj bGk -ogl +ivI vJv sJp xGQ sGy wbO -nOl -nOl -nOl -kRe kij kij kij -jBk -srO -gXp -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO +kij +kij +kij +kij +dlQ +oaW +lCI +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV bmU bmU bmU @@ -26944,21 +29050,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26983,29 +29089,29 @@ uYz pwO uYz uYz -wyy -uYz +qoN +qGY +qoN +qoN +qoN +qoN +qoN +qoN uYz uYz pwO -wyy -uYz -uYz -uYz -wyy -kOz -oPU -lLO -oeA +vOO +udV +kpK apD -jch -vJy +aCm +rlz hXH -jch -oeA +aCm +kpK apD -jch -lLO +aCm +udV tJt isN sGW @@ -27015,7 +29121,7 @@ pcu cUx vJv lQr -ogl +ivI lbc dft dft @@ -27025,38 +29131,38 @@ tQB bdd bdd rOA -ogl +ivI vJv sQu xGQ sGy wbO -nOl kij kij -kRe kij kij kij -jBk -srO -gXp -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +kij +kij +dlQ +fcC +lCI +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -27138,21 +29244,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -27188,21 +29294,21 @@ kyq kyq kyq kyq -oPU -lLO -oeA +vOO +udV +kpK apD -jch -vJy +aCm +rlz hXH -von -oeA +qAC +kpK apD -von -lLO +qAC +udV tJt cSh -xAO +gDS unR tjI ufm @@ -27225,32 +29331,32 @@ sJp xGQ sGy wbO -nOl kij kij -kRe kij kij kij -jBk -oih -oih -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +kij +kij +dlQ +lSP +lSP +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -27333,20 +29439,20 @@ bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -27361,8 +29467,8 @@ bJT riq riq tim -nGm -nGm +lhu +ukP umB pcd umB @@ -27372,31 +29478,31 @@ kyq uYz uYz wyy -uYz -uYz -uYz -uYz -wyy -uYz -uYz -uYz -uYz +qWZ +qWZ +qWZ +qWZ +qWZ +qWZ +qWZ +qWZ +qWZ kyq oPU -lLO -oeA +udV +kpK apD -von -vJy +qAC +rlz hXH -von -vJy +qAC +rlz apD -von -lLO +qAC +udV tJt pxs -wkY +omZ uKN wHz jzJ @@ -27414,8 +29520,8 @@ dft dft aZm ogl -eMT -tnz +vJv +hEZ xGQ xGQ wbO @@ -27423,27 +29529,27 @@ ftC kRe kRe kRe -kij -kij -kij -jBk -alN -alN -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +kRe +kRe +kRe +dlQ +aZi +ohi +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -27527,20 +29633,20 @@ bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT mmw @@ -27556,20 +29662,20 @@ riq riq tim nBE -nGm +ukP umB umB umB egZ -wyy -tZN -wyy -wyy -wyy -wyy -wyy -wyy -wyy +heZ +hJO +heZ +loW +loW +loW +loW +loW +loW wyy uYz wyy @@ -27577,19 +29683,19 @@ wyy uYz kyq oPU -lLO -vJy +udV +rlz apD -von -vJy +qAC +rlz hXH -von -vJy +qAC +rlz apD -von -lLO +qAC +udV tJt -vYK +qCD qCD qCD qCD @@ -27599,45 +29705,45 @@ eMT dDn ogl rXs -oEF +gfX dft jxY nUG utf wmH -wmH -fzx +etO +cnV ogl vJv sJp xGQ kij kij -nOl kij kRe kij kij kij kij +kij nwB pal pQm boy -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -27721,20 +29827,20 @@ bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -27750,20 +29856,20 @@ hky gJU tim egZ -beR +owN khr khr egZ egZ -tai -jxN -tai -wyy -bdb -jLH -tSm -tSm -wyy +mbE +dzd +jwH +loW +tJe +eNZ +koG +nXm +loW uYz uYz uYz @@ -27771,17 +29877,17 @@ wyy uYz kyq oPU -lLO -vJy +udV +rlz apD -von -oeA +qAC +kpK hXH -von -vJy +qAC +rlz apD -jch -lLO +aCm +udV jny noW noW @@ -27807,31 +29913,31 @@ sJp xGQ kij kij -nOl kij kRe -kRe -kRe -pOh -kRe +kij +kij +kij +kij +kij nwB kWi eRN rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -27903,32 +30009,32 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -27937,60 +30043,60 @@ bJT bJT bJT cbf -lMW -lMW +wmA +wmA cbf riq pDr lNy dRQ -gyO +nwT eTp eTp vUX kTs -tai -jxN -vze -pyu -ndV -fxL -tSm -bNz -wyy +jwH +dzd +iUP +tHw +wzR +tMv +nXm +eDE +loW uYz uYz uYz wyy uYz -kyq +ijP oPU -lLO -vJy +udV +rlz apD -von -oeA +qAC +kpK hXH -von -vJy +qAC +rlz apD -jch -lLO +aCm +udV jny noW noW noW noW -sUR -cxT +noW +mgA vJv lQr ogl +ivI +ivI ogl -ogl -ogl -idb -lnR +jxY +wMW ogl ogl ogl @@ -28001,31 +30107,31 @@ sJp xGQ kij kij -nOl kij kRe kij kij kij kij +kij nwB whm pgT rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -28097,32 +30203,32 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -28131,63 +30237,63 @@ bJT bJT bJT cbf -lMW -lMW +wmA +wmA cbf riq pDr lNy woI -gyO -gyO -gyO -gyO -ozJ -jxN -jxN -jxN -gmr -ndV -uHi -tSm -dpc -wyy +nwT +lZM +iuI +ncf +lTE +dzd +vjr +vjr +xvO +gqK +erB +uKi +wzR +loW uYz tzX uYz wyy -uYz -kyq +eVK +lqe oPU -lLO -vJy +udV +rlz apD -jch -vJy +aCm +rlz hXH -von -oeA +qAC +kpK apD -jch -lLO +aCm +udV jny noW noW noW noW -sUR +noW xGQ vJv -lQr -vJv +qju vJv vJv vJv +bNE vJv lQr vJv vJv -eMT +fZS vJv vJv vJv @@ -28195,31 +30301,31 @@ sQu xGQ kij kij -nOl kij kRe kij kij kij kij +kij nwB -kWi +acq eRN rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -28291,32 +30397,32 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -wJm -wJm -wJm -wJm -wJm -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz ovz ovz @@ -28325,55 +30431,55 @@ cbf cbf ovz nMe -hMl -hMl +mND +tvw mZp vqN -bBH +eSY lNy tQp -gyO +nwT fjn fjn -vUX +lCX kTs -tai -tai -vze -pyu -ndV -dpc -dpc -dpc -wyy +pnj +jwH +tMx +tHw +hCZ +wzR +wzR +wzR +loW uYz uYz uYz wyy uYz -kyq +ijP oPU -lLO -vJy +udV +rlz apD -jch -vJy +aCm +rlz hXH -von -oeA +qAC +kpK apD -von -lLO +qAC +udV jny noW noW noW noW -sUR +noW xGQ -vJv -lQr -lQr +nIK +tZG +qQe lQr lQr lQr @@ -28381,39 +30487,39 @@ lQr lQr lQr vJv -eMT +vJv vJv vJv vJv whV cxT -nOl -nOl -nOl -nOl -ftC -nOl -nOl -nOl -nOl -pLJ +kij +kij +kij +kRe +kRe +kRe +kRe +kRe +kRe +nwB kWi eRN rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -28485,192 +30591,6 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -aBR -dpB -dpB -dpB -dpB -dpB -dpB -dpB -qwr -qwr -des -qwr -utj -nLu -nLu -vZt -qSq -qSq -nLu -nLu -oSp -tai -iUL -iUL -qdS -iUL -iUL -iUL -xNk -xNk -xNk -xNk -xNk -uYz -kyq -oPU -lLO -vJy -apD -jch -vJy -hXH -von -oeA -apD -von -lLO -jny -noW -noW -noW -noW -sUR -xGQ -xGQ -vJv -vJv -sJp -vJv -vJv -sJp -nIe -kGt -nIe -nIe -nIe -nIe -vJv -whV -xGQ -kij -iAT -nOl -kij -kRe -kij -kij -kij -kij -nwB -tQs -bZY -rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -wLA -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -"} -(50,1,1) = {" -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG wQG wQG wQG @@ -28682,6 +30602,125 @@ wQG bmU bmU bmU +xRY +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +orZ +orZ +orZ +orZ +orZ +orZ +orZ +lTm +lTm +qVQ +lTm +qBT +nLu +nLu +oqF +qSq +qSq +nLu +nLu +nHK +jwH +iUL +iUL +bHe +iUL +iUL +iUL +xNk +xNk +xNk +xNk +xNk +uYz +kyq +oPU +udV +rlz +apD +aCm +rlz +hXH +qAC +kpK +apD +qAC +udV +jny +noW +noW +noW +noW +noW +xGQ +xGQ +vJv +vJv +xGQ +jHV +mCJ +xGQ +nIe +kGt +nIe +nIe +nIe +nIe +vJv +whV +xGQ +kij +iAT +kij +kij +ftC +kij +kij +kij +kij +pLJ +tQs +bZY +rgs +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +wLA +bmU +bmU +bmU +bmU +bmU +bmU bmU bmU bmU @@ -28690,46 +30729,113 @@ bmU bmU bmU bmU +bmU +bmU +bmU +bmU +bmU +"} +(50,1,1) = {" +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +bmU +bmU +bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -qcx -dpB -dpB -dpB -dpB -dpB -dpB -dpB -qwr -qjv -lBm -lBm -aVt +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +moV +orZ +orZ +orZ +orZ +orZ +orZ +orZ +lTm +gNX +esp +esp +mzs nLu ghU -ceY +mrp oWl oWl oWl nLu -tai -tai +pnj +jwH iUL aqK -jML +bPh amv lZc thD @@ -28741,43 +30847,43 @@ xNk uYz kyq oPU -lLO -vJy +udV +rlz apD -von -vJy +qAC +rlz hXH -von -vJy +qAC +rlz apD -jch -lLO +aCm +udV jny noW noW noW noW -sUR +noW noW xGQ vJv vJv -sJp +xGQ vJv vJv -sJp -nIe +xGQ +tYS iTv syo tYS -tYS +rBZ nIe ocX vVg xGQ -kRe -kRe -nOl +kij +kij +kij kij kRe kij @@ -28788,20 +30894,20 @@ nwB jHs wRf boy -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -28873,57 +30979,57 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -qcx -dpB -dpB -dpB -dpB -dpB -dpB -dpB -qwr -utj -aBR -qwr -qwr +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +moV +orZ +orZ +orZ +orZ +orZ +orZ +orZ +lTm +vkG +mrH +rmS +lTm nLu -ceY -ceY +iYM +mrp oWl dUW oWl nLu -tai -tai +pnj +wlt iUL ksA -gqK +rkO fZn sft hqk @@ -28935,32 +31041,32 @@ xNk xNk kyq oPU -lLO -vJy +udV +rlz apD -von -vJy +qAC +rlz hXH -von -vJy +qAC +rlz apD -jch -lLO +aCm +udV fsW edq edq edq edq -sUR +noW noW xGQ vJv vJv -sJp -vJv -vJv -sJp -nIe +xGQ +ocP +ocP +xGQ +dYv vql szT tYS @@ -28970,8 +31076,8 @@ vJv whV xGQ kij -nOl -nOl +kij +kij kij kRe kij @@ -28982,20 +31088,20 @@ nwB fxM eMv boy -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -29067,45 +31173,45 @@ wQG wQG wQG wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -aOe -dpB -dpB -dpB -dpB -aOe -wJm -aBR -mTt -mTt -cZI -kkJ -dpB -acO -fHf -qwr -utj -mTt -qwr -qwr +eZR +pnO +mjM +kGv +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +eMO +eMO +mrH +mtV +orZ +wxg +tlO +lTm +qBT +eMO +lTm +lTm nLu tnf oWl @@ -29113,11 +31219,11 @@ tFr avO gvh nLu -tai -tai +pnj +jwH iUL nLj -gqK +glF dhu dhu dqF @@ -29129,8 +31235,8 @@ jlB xNk kyq oPU -lLO -lLO +udV +udV ewo mFI mFI @@ -29138,25 +31244,25 @@ dYM mFI mFI rit -lLO -lLO +udV +udV fsW iUN hmK osi edq -sUR +noW noW xGQ +cRj vJv -vJv -ayA -ocP -ocP -ayA -nIe +xGQ +xGQ +xGQ +xGQ tYS -iNp +tYS +hhN fFi tYS nIe @@ -29164,7 +31270,7 @@ uoP aeQ xGQ kij -nOl +kij kij hRN hRN @@ -29173,24 +31279,24 @@ hRN hRN hRN hRN -fBA -ggJ +prO +cmQ boy -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -29261,45 +31367,45 @@ wQG wQG wQG wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -gBp -sde -dcp -dcp -mKV -auW -qwr -qwr -nHZ -qwr -utj -mTt -qwr -qwr +eZR +pnO +mjM +bkH +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +crH +bvZ +bvZ +tye +iCg +lTm +lTm +tmB +lTm +qBT +eMO +lTm +lTm nLu emJ oWl @@ -29307,14 +31413,14 @@ nqz keY qKB nLu -tai -tai +pnj +jwH iUL xYN -gqK -oqR -gqK -gqK +cnb +boO +xdn +xdn sRV ggi aiT @@ -29323,42 +31429,42 @@ cnv xNk kyq oPU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV giU -lLO -lLO +udV +udV sWI gSb hmK hmK aAL -sUR +noW noW xGQ vJv vJv -ayA -ayA -ayA -ayA +xGQ +xGQ +xGQ +xGQ nIe nIe -oBU +qXa nIe nIe nIe -eMT -vPf +vJv +iFJ xGQ kij -nOl +kij kij hRN boG @@ -29366,25 +31472,25 @@ hlQ qDc iiE qjL -gnB +cSk leK ukn rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -29442,58 +31548,58 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -gBp -sde -dcp -dcp -mKV -auW -qwr -qwr -nHZ -qwr -utj -mTt -eZw -eZw +eZR +pnO +mjM +maf +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +crH +bvZ +bvZ +tye +iCg +lTm +lTm +tmB +lTm +qBT +eMO +cbZ +cbZ nLu aTE nEv @@ -29501,8 +31607,8 @@ qKB oNl aWt nLu -tai -tai +pnj +jwH iUL gTl wzR @@ -29517,34 +31623,34 @@ wFy xNk jLN oPU -lLO -lLO -lLO -lLO -gry -gry -gry -lLO +udV +udV +udV +udV +fyh +fyh +fyh +udV giU -lLO -lLO +udV +udV sWI cBe hmK hmK edq -sUR +noW noW xGQ vJv vJv vJv vPE -vPE +bel vPE vJv vJv -ceP +qaA vJv vJv vJv @@ -29552,7 +31658,7 @@ vJv whV xGQ kij -nOl +kij kij hRN kDw @@ -29560,25 +31666,25 @@ sJi ciy ukF xcD -ruS +itm iJo eMv rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -29636,58 +31742,58 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -aOe -aBR -oco -oco -aBR -aPE -dpB -iKu -mMO -qwr -utj -aBR -nxk -nxk +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +rat +kOR +kOR +kOR +mrH +rNF +rNF +mrH +qMJ +orZ +qvM +aNE +lTm +qBT +aLc +heZ +heZ nLu nLu nLu @@ -29695,8 +31801,8 @@ nLu nLu nLu nLu -tai -tai +pnj +jwH iUL ksA wzR @@ -29711,23 +31817,23 @@ xNk xNk kyq oPU -lLO -lLO -lLO -vTH +udV +udV +udV +eZR lMW lMW lMW -dBY +mjM giU -lLO -lLO +udV +udV fsW bNd hmK wYy edq -sUR +noW noW xGQ vJv @@ -29738,7 +31844,7 @@ vPE vPE vPE vJv -mHM +qcv gxY gxY gxY @@ -29746,11 +31852,11 @@ gxY eqB xGQ kij -nOl kij +cvu hRN -gnB -cnu +xLk +anl nbK pxD pxD @@ -29758,21 +31864,21 @@ hRN oih oih hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -29830,67 +31936,67 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -aOe -aBR -oco -oco -aBR -kkJ -dpB -iKu -wRC -qwr -utj -rKf -qwr -qwr -tai -tai -tai -tai -tai -tai -tai -tai -tai +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +rNF +rNF +mrH +vFn +orZ +qvM +vmT +lTm +qBT +jvh +jwH +mbE +jwH +jwH +mbE +oDG +faE +faE +faE +dux +jwH iUL uRF wzR @@ -29905,17 +32011,17 @@ xNk uYz kyq oPU -lLO -lLO -lLO -vTH +udV +udV +udV +eZR lMW lMW lMW -dBY +mjM giU -lLO -lLO +udV +udV fsW edq mmM @@ -29932,7 +32038,7 @@ vPE vPE vPE vJv -wwz +kUO nxa nxa nxa @@ -29940,33 +32046,33 @@ nxa nxa fXo kij -nOl kij +eBW hRN nRO mXs -srO +gQw rQY rQY pxD erm erm hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -30024,67 +32130,67 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -gBp -sde -dcp -dcp -mKV -auW -qwr -qwr -fDC -qwr -utj -rKf -qwr -qwr -tai -tai -tai -tai -tai -tai -tai -tai -tai +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +crH +bvZ +bvZ +tye +iCg +lTm +lTm +pBW +lTm +qBT +fUl +jwH +jwH +jwH +jwH +jwH +pnj +jwH +jwH +qoV +jwH +jwH iUL iUL lRN @@ -30099,17 +32205,17 @@ xNk uYz kyq oPU -iXB -iXB -lLO -lLO -lLO -lLO -lLO -lLO +pTi +pTi +udV +udV +udV +udV +udV +udV giU -lLO -lLO +udV +udV sWI acd sBQ @@ -30126,7 +32232,7 @@ vPE vPE vPE vJv -wyb +ofT nxa npj pyj @@ -30134,33 +32240,33 @@ ckx bGr fXo kij -nOl kij +iTi hRN nJF jQV -srO +gQw rQY rQY hRN pxD pxD hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -30218,63 +32324,63 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -gBp -sde -dcp -dcp -mKV -auW -qwr -qwr -fDC -qwr -utj -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +crH +bvZ +bvZ +tye +iCg +lTm +lTm +pBW +lTm +qBT +aLc +heZ +heZ +heZ +heZ +jwH +pnj +heZ wyy wyy wyy @@ -30286,24 +32392,24 @@ uYz uYz uYz uYz -uYz -uYz +wyy +ege kyq kyq kyq kyq oPU -pzF -pzF -lLO -lLO -lLO -lLO -lLO -lLO +bLP +bLP +udV +udV +udV +udV +udV +udV ewo -eDU -eDU +nQB +nQB fIK apn kSv @@ -30320,7 +32426,7 @@ vPE vPE vPE vJv -mHM +qcv fwY vsZ mPX @@ -30328,33 +32434,33 @@ mwK cEi fXo kij -nOl kij +iTi hRN dwN xgU -rvm -rvm +jNK +rQY rQY rQY rQY rQY rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -30412,84 +32518,84 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -aOe -dpB -dpB -dpB -dpB -wJm -aOe -aBR -mTt -mTt -cZI -aPE -dpB -acO -oGk -qwr -utj -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy -uYz -uYz +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +eMO +eMO +mrH +uMf +orZ +wxg +dwU +lTm +vkG +aLc +jwH +jwH +jwH +heZ +jwH +pnj +heZ uYz uYz uYz uYz +wyy uYz uYz uYz uYz uYz uYz +wyy uYz kyq uYz uYz -uYz +pwO oPU -fsW -edq -edq +aBR +nxk +nxk iDV nae osx @@ -30513,8 +32619,8 @@ ccE ccE ccE ayA -gIA -xsW +yjd +uAb nxa iEd iRG @@ -30522,33 +32628,33 @@ jqy ybO fXo kij -nOl kij +eBW hRN fgQ vgu -gFU -gFU +nfd +rQY rQY rQY rQY rQY rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -30606,85 +32712,85 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -qcx -dpB -dpB -dpB -dpB -dpB -dpB -feG -qwr -utj -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +moV +orZ +orZ +orZ +orZ +orZ +orZ +lPc +lTm +qBT +aLc +jwH +jwH +jwH +heZ +jwH +pnj +aCV +pwO +pwO +pwO +pwO +vdN +pwO +pwO +pwO +pwO +pwO +pwO +vdN +pwO kyq uYz ueD -iDv +xTE ueD -fsW -iOF +aBR +ssy dVR -edq +nxk nTJ osx osx @@ -30697,18 +32803,18 @@ qQh rAs sBQ edq -ari +xnq lAy aZH pYk bdQ -lMW -lMW -lMW -lMW -axd +tAa +tAa +tAa +tAa +fYm nZH -srv +pym nxa gsh iRG @@ -30716,33 +32822,33 @@ jqy oIS fXo kij -nOl -myy -eZK +kij +epn +eky kqA xNd -srO +gQw rQY rQY rQY rQY rQY hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -30823,62 +32929,62 @@ bmU bmU bmU bmU -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -qcx -dpB -lTD -ycs -ycs -ycs -ycs -mvR -lBm -aVt -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy -uYz -uYz +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +moV +orZ +ePS +mCD +mCD +mCD +mCD +cSD +esp +mzs +aLc +jwH +jwH +jwH +jwH +jwH +pnj +heZ uYz uYz uYz uYz +wyy uYz uYz uYz uYz uYz uYz +wyy uYz kyq iAC ueD uYz -uYz -fsW -qof -qof -qof +kTu +aBR +byk +byk +byk osx osx lOT @@ -30896,13 +33002,13 @@ qAb ibZ ibZ bdQ -lMW -lMW -lMW -lMW -axd +tAa +tAa +tAa +tAa +fYm nZH -dho +aeH nxa tml lJV @@ -30911,33 +33017,33 @@ ihS fXo cVp ioD -eBY +jQD hRN dPY clr -srO +gQw rQY rQY rQY rQY rQY hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV bmU bmU bmU @@ -31016,64 +33122,64 @@ bmU bmU bmU bmU -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -aOe -wJm -wJm -wJm -wJm -aOe -lLO -aBR -dpB -eBr -daD -xZI -gRF -dpB -wjA -tGW -qwr -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy -uYz -uYz +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +orZ +twy +oHh +qaC +jMX +orZ +hbt +oxj +lTm +aLc +jwH +jwH +jwH +heZ +jwH +pnj +heZ uYz uYz uYz uYz +wyy uYz uYz uYz uYz uYz uYz +wyy uYz kyq ltc ueD uYz tzX -fsW +aBR qMK cAp -edq -osx +nxk +nTJ osx nTJ fsW @@ -31090,15 +33196,15 @@ ari ari kTQ bdQ -lMW -lMW -lMW -lMW -axd +tAa +tAa +tAa +tAa +fYm nZH -srv +pym nxa -jqy +qZw hVr bia vMp @@ -31107,8 +33213,8 @@ gwD gwD gwD gwD -hYb -iPA +ric +vpO pbB waR waR @@ -31116,23 +33222,23 @@ waR waR pbB gwD -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV bmU bmU bmU @@ -31209,24 +33315,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -aEl -lLO -lLO -aEl -lLO +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf abf uYR @@ -31235,15 +33341,15 @@ aLc xDi xDi xDi -jCL -sac +sKm +qYm jPP heZ heZ heZ aNY -vjE -vjE +cQj +iLb heZ heZ heZ @@ -31284,15 +33390,15 @@ fWj bdQ bdQ bdQ -mzA -lMW -lMW -lMW -ejG +lyo +tAa +tAa +tAa +pRN nZH -srv +pym nxa -xVu +lqo hgy hgy fXo @@ -31310,24 +33416,24 @@ mJY vJd bXm gwD -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV bmU bmU wQG @@ -31402,25 +33508,25 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf clX ijT @@ -31429,7 +33535,7 @@ jUJ xPR jwH jwH -vkl +dvN xPR hBs xPR @@ -31437,9 +33543,9 @@ xPR sac xPR xPR +nID xPR xPR -fKH xPR xPR hBs @@ -31472,21 +33578,21 @@ fKH fKH xPR heZ +eri noW -sUR noW bdQ fYz eyX kNq -vNv -lMW -axd +vNm +tAa +fYm eNu tCK -psK +qAf jhN -rnV +oEv gMs rkL vbU @@ -31494,7 +33600,7 @@ aKB nBL wEc lnG -ttC +xTN vCY uzc phT @@ -31504,25 +33610,25 @@ lHC eWM eja wbF -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -31596,25 +33702,25 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf nzv ijT @@ -31623,17 +33729,17 @@ ivd xPR jwH jwH -hPH -bFU -fhS -wpV -wpV -iHS -wpV -wpV -wpV -wpV -wpV +ojk +aJv +ktz +gef +gef +tJO +gef +gef +jSV +gef +gef dKa gef ika @@ -31672,15 +33778,15 @@ xBq bVx gss gyF -ecf -vNv -lMW -axd +ucC +vNm +tAa +fYm nOk tNF -sqY +kil jhN -bNS +dAO oow adI iwo @@ -31698,25 +33804,25 @@ ksg xvs csa wbF -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -31790,38 +33896,38 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf oJX ijT oJX heZ xPR -jwH +qoV jwH xPR xPR qWt xPR -xPR +oZS sac xPR xPR @@ -31830,20 +33936,20 @@ xPR xPR lFP xPR -qWt -xPR +oiy xPR xPR xPR xPR xPR xPR +oZS xPR qWt xPR xPR vjE -xPR +oZS xPR qWt xPR @@ -31854,7 +33960,7 @@ pIj xwj xPR xPR -xPR +oZS qWt xPR xPR @@ -31862,19 +33968,19 @@ xPR heZ uCC isr -sUR +noW bdQ bph pPz vqV -vNv -lMW -axd +vNm +tAa +fYm hBh nZH -vhG -iAt -fmV +giZ +aHo +nEd fnl aHl leZ @@ -31892,25 +33998,25 @@ tPS nIE lWV wbF -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -31984,26 +34090,26 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -abf +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +ryY oJX ijT oJX @@ -32023,7 +34129,7 @@ xPR uaR fsn gWg -dQt +fUK fsn xDi xDi @@ -32034,7 +34140,7 @@ heZ heZ heZ heZ -aCV +pgW heZ heZ heZ @@ -32056,7 +34162,7 @@ xPR heZ noW noW -sUR +noW bdQ tRj pPz @@ -32066,7 +34172,7 @@ qIk jXY nWO nZH -fCM +eUT jhN ekw dhe @@ -32077,7 +34183,7 @@ nBL eAA csM hSk -obR +oPt ksU uuZ tKE @@ -32086,25 +34192,25 @@ gJV bRU rqo wbF -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -rez -rez -lLO -rez -vTH -peB -dBY -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +uRc +uRc +udV +uRc +eZR +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32178,27 +34284,27 @@ bmU bmU bmU bmU -lLO -lLO -lLO -vsX -peB -peB +udV +udV +udV +oFJ +pnO +pnO abf -oJC +nBi abf abf abf abf -lLO -lLO -lLO -lLO -lLO -lLO -lLO +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf -oJX +aRW ijT oJX lFl @@ -32212,23 +34318,23 @@ ucz oJX oJX heZ -vjE -vjE +cQj +qYm fsn hEo pgu tVC -hEo +bmI hEo hEo hEo hEo jKW lXs -sAV -eYq lXs -oaB +lXs +lXs +lXs lXs niL akX @@ -32241,8 +34347,8 @@ sac sac ktG heZ -tSb -vYy +eYq +dxb heZ xPR xPR @@ -32250,7 +34356,7 @@ xPR heZ noW noW -sUR +noW bdQ mZY pPz @@ -32260,7 +34366,7 @@ nZH mdn nZH nZH -srv +pym jhN iGH eWL @@ -32271,7 +34377,7 @@ akc tdT ePK gwD -rqc +nXT bXS pbB qBt @@ -32280,25 +34386,25 @@ bmX jUb xXy gwD -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV uSR gnD gnD dCH gnD uSR -peB -dBY -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32372,12 +34478,12 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +eZR +pnO abf oJX oJX @@ -32409,7 +34515,7 @@ heZ xPR xPR xDi -nsj +nxh qLP ijW axh @@ -32417,9 +34523,9 @@ hEo hEo hEo hEo -aXw -oaB -oaB +kYZ +lXs +lXs kOT eJj cWf @@ -32431,12 +34537,12 @@ cWf gnV lXs heZ +oKE xPR -xPR -lFP +jwg heZ -jAA -vYy +sAV +lXs heZ sac sac @@ -32454,7 +34560,7 @@ aiR amC epg epg -lPW +uda jhN bke gMs @@ -32465,8 +34571,8 @@ gwD gwD gwD gwD -hYb -iPA +sSM +vpO xXS xdy wjN @@ -32487,12 +34593,12 @@ vRh jyh rZZ qTg -ozZ -dBY -lLO -lLO -lLO -lLO +nch +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32566,12 +34672,12 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +eZR +pnO abf oJX oJX @@ -32583,7 +34689,7 @@ oJX oJX oJX oJX -oJX +lFl oJX oJX oJX @@ -32600,28 +34706,28 @@ ucz oJX oJX heZ -hzX +aFP hzX xDi sdK tUH sAh oml -sZd +evz sdK -nMa +bgf hEo jKW +faG lXs -oaB tSh lwU -lXs -lXs +mis +sAV niL tSh lXs -lXs +quu voW cWf cfT @@ -32629,8 +34735,8 @@ gef gef qNT cfT -uei -fCh +heq +gnV heZ jwH dsx @@ -32640,15 +34746,15 @@ aZH urI ari bdQ -dDE -pTE -kBW -kiK -kiK -wun -kBW -iyd -cBJ +txV +uoU +txV +chC +chC +tUX +txV +vzn +sWj aKB auP gsu @@ -32663,8 +34769,8 @@ hpV aHZ xXS gbT -dDz -dDz +lFK +lFK dQq lvJ tNx @@ -32681,12 +34787,12 @@ jyG hvt tjJ qTg -peB -dBY -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32760,14 +34866,14 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +eZR +pnO abf -oJC +ghd abf abf oJX @@ -32777,8 +34883,8 @@ oJX oJX oJX xCP -oJX -oJX +lFl +aRW oJX oJX ijT @@ -32810,21 +34916,21 @@ niL bLI niL niL -jWJ -jWJ -jWJ -jWJ -kuH -jWJ -jWJ +dhS +dhS +dhS +dhS +fCG +dhS +dhS sAV heZ hzX hzX hzX heZ -oVy -scS +wcc +jzc heZ dsx dsx @@ -32842,7 +34948,7 @@ dAw iSe dre ylO -ycS +vmt aKB fQp wTD @@ -32875,12 +34981,12 @@ iMf kLM pez qTg -ozZ -dBY -lLO -lLO -lLO -lLO +nch +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32954,14 +35060,14 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +eZR +pnO abf -oJX +ucz oJX oJX oJX @@ -32971,7 +35077,7 @@ oJX oJX oJX fkA -oJX +lFl oJX oJX oJX @@ -32991,7 +35097,7 @@ heZ hzX hzX fsn -hEo +meL cZW gAl lKP @@ -33001,26 +35107,26 @@ xxI sMU lKP lXs -oaB lXs lXs -jWJ -aMO -kMt -ydq -nlf -sZJ -jWJ +lXs +dhS +mpC +vPu +qrv +fsi +vzz +dhS wMA heZ hzX hzX hzX heZ -qmY -jou +qAZ +mpd heZ -dsx +hml dsx dsx xDi @@ -33069,12 +35175,12 @@ bom rLE xKT qTg -peB -dBY -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -33149,28 +35255,28 @@ bmU bmU bmU bmU -lLO -lLO -lLO -vTH -peB +udV +udV +udV +eZR +pnO abf -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX +ucz +ucz +ucz +ucz +ucz +ucz +ucz +ucz +ucz +ucz +bvW +ucz +ucz +ucz ijT -oJX +oEB lFl oJX oJX @@ -33194,25 +35300,25 @@ wQM xcH rbW lKP -oaB -oaB lXs lXs -jWJ -kaB -kaB -ryG -sSs -fKV -jWJ +lXs +tPa +dhS +jGu +jGu +spj +sIE +oZK +dhS uKM heZ hzX hzX hzX heZ -vYy -pOo +lXs +ueW heZ dsx dsx @@ -33241,12 +35347,12 @@ wqv pCS pbO gwD -hYb -iPA +ric +vpO xXS gbT gbT -nGd +pif gul eel eel @@ -33263,11 +35369,11 @@ tti gzy rcl qTg -ozZ -dBY -lLO -lLO -lLO +nch +mjM +udV +udV +udV bmU bmU wQG @@ -33344,10 +35450,10 @@ bmU bmU bmU bmU -lLO -lLO -vTH -peB +udV +udV +eZR +pnO abf abf abf @@ -33359,11 +35465,11 @@ oJX oJX oJX oJX +lFl oJX oJX oJX -oJX -ijT +lWs lFl lFl kvj @@ -33386,27 +35492,27 @@ ufA tYO wdB xfr -bgk +kxQ lKP -oaB lXs lXs lXs -jWJ -wLS -reA -pTU -oir -fKV -jWJ +hYL +dhS +wgP +gWj +eHz +eaF +oZK +dhS niL heZ heZ heZ heZ heZ -vYy -pOo +dxb +ueW heZ hMF dsx @@ -33434,7 +35540,7 @@ aKB heZ pgW kXJ -gbT +wLg ncr guH phO @@ -33457,10 +35563,10 @@ pqg qTg qTg qTg -peB -dBY -lLO -lLO +pnO +mjM +udV +udV bmU bmU bmU @@ -33539,17 +35645,17 @@ bmU bmU bmU bmU -lLO -vTH -peB -coX -bkx +udV +eZR +pnO +thb +clv abf abf abf abf -oJX -oJX +lFl +lFl lFl lFl lFl @@ -33573,7 +35679,7 @@ orj hEo hEo hEo -eYG +hEo cZW gAl lKP @@ -33582,14 +35688,14 @@ cPo cPo iEZ lKP -oaB +lXs lXs kPF kPF kPF hmh hmh -hmh +jGu tdZ jGu gUS @@ -33598,9 +35704,9 @@ gUS gUS gUS gUS -nxk -vYy -pOo +niL +lXs +ueW heZ pnj xPR @@ -33649,11 +35755,11 @@ mqQ lzL hYD qTg -gNQ -lLO -peB -dBY -lLO +akR +udV +pnO +mjM +udV bmU bmU bmU @@ -33734,10 +35840,10 @@ bmU bmU bmU bmU -lLO -tcC -tcC -tcC +udV +aYP +aYP +aYP abf oJX oJX @@ -33745,12 +35851,12 @@ abf oJX oJX abf -hMx +pQn fzo qAk fzo -fzo -fzo +wXR +wXR qYb uRl vAd @@ -33776,11 +35882,11 @@ mxc mxc mxc mxc -oaB +lXs lXs kPF nHL -nHL +moz nHL qxh hmh @@ -33788,13 +35894,13 @@ wpZ sJv pbI gbt +wiR ntn -ntn -ntn +rfA gUS -vYy -vYy -qZW +lXs +lXs +voW cfT ijo jum @@ -33829,7 +35935,7 @@ ncr vCf gbT onU -oMz +rAC jGR aOO gul @@ -33840,13 +35946,13 @@ kjj eCl rpT gdf -fzY -xCR +xkQ +wKE qTg -tcC -tcC -tcC -lLO +aYP +aYP +aYP +udV bmU bmU bmU @@ -33929,9 +36035,9 @@ bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV abf oJX oJX @@ -33942,14 +36048,14 @@ abf lFl lFl lFl -oJX -oJX -oJX -oJX +lFl +gnq +lFl +lFl lFl alH alH -alH +qti alH wPB rVb @@ -33963,14 +36069,14 @@ xZj riy rVb cZW -gAl +nGw mxc vse nvx jta -rJq +brn mxc -oaB +lXs lXs kPF tBe @@ -33986,16 +36092,16 @@ pvV pvV qlB gUS -vYy -vYy -xKi +dxb +lXs +dxb heZ jwH xPR pbZ wep dsx -dsx +nXR dsx jwH sac @@ -34004,14 +36110,14 @@ uSC dzd jwH ePj -uSC +mVD jwH jwH sac xPR xPR xPR -qWt +oiy xPR fKH xPR @@ -34021,9 +36127,9 @@ jBS dOS gbT ncr -eSr -onU -oLz +njl +wUy +usR psH uhO gul @@ -34037,9 +36143,9 @@ axb ftD wCI qTg -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -34125,7 +36231,7 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX @@ -34135,10 +36241,10 @@ oJX oJX oJX oJX +lFl oJX -oJX -oJX -oJX +ucz +igq oJX lFl lFl @@ -34164,7 +36270,7 @@ pvU iuK eFc mxc -oaB +lXs lXs kPF eRO @@ -34180,13 +36286,13 @@ ntn ntn ieg gUS -vYy -nxk -wJj -heZ -heZ -heZ +lXs +niL +lDo heZ +xDi +xDi +xDi heZ heZ heZ @@ -34210,7 +36316,7 @@ heZ slE heZ kXJ -gbT +wLg gbT gbT gbT @@ -34319,7 +36425,7 @@ bmU bmU bmU bmU -lLO +udV abf abf abf @@ -34329,9 +36435,9 @@ oJX oJX oJX oJX +lFl oJX -oJX -oJX +ucz oJX oJX oJX @@ -34344,7 +36450,7 @@ rVb bBy abO rVb -uEQ +rXj wtT ofv cQx @@ -34358,15 +36464,15 @@ hwv cOV nJA mxc -oaB -lXs +pzf +kQJ kPF hmh hmh hmh hmh hmh -hKm +cJK wSp pbI pbI @@ -34374,34 +36480,34 @@ pbI pbI pbI gUS -jWJ -jWJ -xKi -vYy -sYi -xaj -xaj -xaj -xaj -xaj -xaj -xaj +dhS +dhS +xCO +bSb +rfm +rFf +rFf +qkx +rFf +rFf +rFf +rFf heZ -nzJ -dzd +qci +uDN dzd heZ -pQv +qAV pQv pQv pQv jVi -hzX +aFP hzX nxk uVV gDQ -lJR +jSR nxk jOg aEg @@ -34513,19 +36619,19 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV abf oJX oJX oJX oJX +lFl oJX -oJX -oJX +ucz oJX oJX oJX @@ -34552,42 +36658,42 @@ wIk wIk xBY mxc -oaB -lXs +pzf +xmr uTg fBj -fBj +rlW fBj oEe oUS wEl qRu gBz -kaB -wCM -usz -ktt -vFe -uCs -jWJ -xKi -vYy -cNl -apA -apA -apA -apA -apA -apA -apA -ivd +jGu +brX +agF +wLJ +dmV +ckq +dhS +sks +xCV +rtf +pzf +pzf +pzf +pzf +pzf +pzf +pzf +cab jwH jwH jwH -ivd -jdS -jdS -jdS +cab +pQv +pQv +pQv pQv jVi hzX @@ -34595,10 +36701,10 @@ hzX nxk sre tOq -kPH +lYx nxk pQv -jdS +pQv nRV eAb oVR @@ -34614,11 +36720,11 @@ pPC nRV pQv rdI -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -34711,15 +36817,15 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX -oJX -oJX -oJX +sob +ucz +ucz oJX fWS oJX @@ -34746,8 +36852,8 @@ nUD nUD nUD nUD -oaB -lXs +pzf +rfm uTg sPX qte @@ -34757,31 +36863,31 @@ byq gnZ gcs qxv -kaB -mKx -rkk -jrb -vcD -mlU -jWJ -xKi -vYy -cNl -apA -kKP -bCn -bCn -bCn -bCn -bCn +jGu +qDl +lQP +ulz +aSr +axU +dhS +wMn +xCV +rtf +pzf +kQJ +xHN +xHN +xHN +xHN +xHN heZ jwH jwH jwH heZ +qdT pQv pQv -jdS pQv jVi hzX @@ -34792,7 +36898,7 @@ cmR xMN nxk pQv -jdS +sDn nRV vmk gXq @@ -34808,8 +36914,8 @@ cPr oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -34905,15 +37011,15 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX +lFl oJX -oJX -oJX +ucz oJX oJX oJX @@ -34927,7 +37033,7 @@ bvn gNG oSK clq -ngh +mhf vRx kLp wnn @@ -34937,11 +37043,11 @@ gAl nUD qvi nsF -cqQ +euS aax nUD -oaB -lXs +pzf +rfm uTg jJP fBj @@ -34951,19 +37057,19 @@ oUS wEl mOW rQh -omH -pZb -gyH -xpV -vFe -uCs -jWJ -xKi -vYy -cNl -apA -sYi -lMW +tza +oER +wch +sYA +dmV +ckq +dhS +sks +xCV +rtf +pzf +rfm +fOY hzX hzX heZ @@ -34971,11 +37077,11 @@ heZ oNv jwH jwH -jwH +wlt heZ sVE pQv -jdS +pQv pQv jVi jVi @@ -34986,7 +37092,7 @@ lpN ofJ nxk pQv -jdS +pQv nRV nRV nRV @@ -35002,8 +37108,8 @@ qws oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -35099,15 +37205,15 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX +lFl oJX -oJX -oJX +ucz oJX oJX uyJ @@ -35134,15 +37240,15 @@ oSi dNL sPs nUD -oaB -lXs +pzf +rfm uTg oUS oUS oUS oUS oUS -wEl +oHN ewE hDc hDc @@ -35152,16 +37258,16 @@ hDc hDc hDc hDc -xKi -vYy -cNl -apA -sYi -lMW +sks +xCV +rtf +pzf +rfm +fOY hzX hzX xPR -sac +iXQ xPR xPR xPR @@ -35169,7 +37275,7 @@ xPR heZ gaL pQv -jdS +pQv pQv pQv pQv @@ -35180,7 +37286,7 @@ nxk nxk nxk pQv -jdS +pQv pQv pQv pQv @@ -35196,8 +37302,8 @@ qws oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -35293,23 +37399,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX +lFl oJX -oJX -oJX -oJX -oJX -oJX -sll -oJX -oJX -oJX -oJX +ucz +ucz +ucz +ucz +fcR +ucz +ucz +ucz +ucz oSK pYy tjp @@ -35328,11 +37434,11 @@ eTH hzV uXb nUD -oaB -lXs +pzf +rfm dsN gqX -qXI +iUY fLu aig ocr @@ -35340,22 +37446,22 @@ wEl qRu hDc dLJ -uig +dZj uig uig uig uig hDc -xKi -vYy -cNl -apA -sYi -lMW +sks +xCV +rtf +pzf +rfm +fOY hzX hzX xPR -sac +cQj xPR xPR xPR @@ -35363,21 +37469,21 @@ xPR heZ pQv pQv -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS +pQv +pQv +pQv +pQv +pQv +nov +pQv +pQv +pQv +pQv +pQv +pQv +pQv +pQv +pQv pQv nRV oOj @@ -35390,8 +37496,8 @@ nIb nRV pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -35487,23 +37593,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX +lFl oJX +sCY oJX -lFl -lFl -lFl -lFl -aKS -lFl -lFl -lFl oJX +qnA +adB +qnA +oJX +oJX +ucz oSK viM coC @@ -35522,8 +37628,8 @@ vgc vgc ppG nUD -oaB -lXs +pzf +rfm dsN nUE hBb @@ -35540,24 +37646,24 @@ oQw sGj iDo hDc -xKi -vYy -iAi -apA -usl -xaj -pHy -nxk -nxk -nxk -nxk -nxk -wDN -wDN -afM -afM -afM -afM +poE +xCV +iYZ +pzf +sxK +rFf +tyw +niL +niL +niL +niL +niL +xPR +xPR +heZ +heZ +heZ +heZ hSM hSM gTv @@ -35571,7 +37677,7 @@ jwS jwS jwS jwS -jdS +pQv pQv nRV kGP @@ -35584,8 +37690,8 @@ mbb oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -35681,23 +37787,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX -oJX -oJX -lFl lFl -lFl -kvj -qHB -kvj -lFl -lFl -oJX +qnA +qnA +kao +qnA +lTf +tGS +lTf +qnA +qnA +ucz oSK oSK oSK @@ -35708,7 +37814,7 @@ oSK oSK oSK oSK -qLP +mKt hpH odi odi @@ -35716,8 +37822,8 @@ odi odi odi odi -oaB -lXs +pzf +rfm dsN eUu fLu @@ -35732,40 +37838,40 @@ uig uig oMB uig -uig +mQo hDc -xKi -xKi -apA -apA -apA -apA -vYy -vYy -vYy -jAA -tSb -nxk -wDN -wDN -wDN -ocd -wDN -wDN +sks +xCV +pzf +pzf +pzf +pzf +xCO +sfx +skp +qbU +lHp +niL +xPR +xPR +xPR +vEK +xPR +xPR hSM -hjv +bRr tzW vdr quX umN jwS -vdj +emI bLT bjV waD fin jwS -jdS +pQv pQv nRV dxK @@ -35778,8 +37884,8 @@ itg oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -35875,28 +37981,28 @@ bmU bmU bmU bmU -lLO +udV abf oJX -leG -dHn -dHn -dHn -leG -xpK -xpK -rIz +kFg +cXs +cXs +cXs +kFg +oxY +oxY +vQe +cpB +xTr +uaF +bYo +qnA ucz -gSx -ucz -rGc -lFl -oJX jvs faD cpF jvs -oQh +ycm cvX ykB bUx @@ -35910,16 +38016,16 @@ toK aTd peW odi -oaB -lXs +pzf +rfm dsN ocr ocr ocr ocr ocr -fKr -aRn +oHN +qRu dhS dhS dhS @@ -35928,24 +38034,24 @@ oMB uig uig hDc -xKi -xKi -apA -apA -apA -apA -xKi -xKi -xKi -xKi -xKi -nbN -wDN -wDN -wDN -wDN -wDN -rhm +vpH +oaB +pzf +pzf +pzf +pzf +vpH +dJz +ivs +ivs +oaB +kub +xPR +xPR +xPR +xPR +uTa +fGz hSM tWN tzW @@ -35959,11 +38065,11 @@ uNR bLT lZk jwS -jdS +pQv pQv nRV aRD -rvu +nsv atn nhh rHa @@ -35972,8 +38078,8 @@ swy oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -36069,23 +38175,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX -dHn -wPB -wPB -wPB -dHn -xpK -xpK -rIz -ucz -gSx +cXs +npe +npe +npe +cXs +oxY +oxY +qHF +cpB +xTr +uaF +bYo +lTf ucz -rGc -lFl -oJX jvs eXA qoC @@ -36104,11 +38210,11 @@ ttV mYB vTl odi -iQA -lXs +pzf +rfm bqC pUp -pUp +egH pUp wUb vqH @@ -36124,9 +38230,9 @@ mES mES mES mES -jWJ -wlo -nxk +kob +ixc +niL afM afM hsS @@ -36134,12 +38240,12 @@ hsS iuY hsS hsS -hsS -qye -hsS -wDN -wDN -wDN +qDv +pgW +qDv +xPR +uTa +xPR hSM xLj fCJ @@ -36153,11 +38259,11 @@ nxn xnn jAs jwS -gRZ +iLB jVi nRV jjL -lOo +cVt elt ubn dmf @@ -36166,8 +38272,8 @@ fUW nRV pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -36263,23 +38369,23 @@ bmU bmU bmU bmU -lLO +udV abf -oJX -dHn -wPB -wPB -wPB -xpK -xpK -xpK -rIz -ucz -gSx -ucz -rGc lFl -oJX +cXs +npe +npe +npe +vBd +oxY +oxY +qHF +cpB +xTr +uaF +bYo +lTf +ucz jvs aGN tmn @@ -36298,8 +38404,8 @@ nnM adb cal odi -iQA -lXs +kub +niL bqC nsR sBy @@ -36319,8 +38425,8 @@ lkm fhX mES mES -xKi -vYy +xCO +bSb hsS hsS lIw @@ -36328,11 +38434,11 @@ uxD iyQ dpu tay -hsS -iWI -tvI -xjP -xjP +qDv +oNp +kkd +nLr +bMn hsS hSM jZX @@ -36347,7 +38453,7 @@ hNa umD lRX jwS -jdS +pQv pQv nRV nRV @@ -36360,8 +38466,8 @@ nRV nRV deI rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -36457,23 +38563,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX -dHn -wPB -wPB -wPB -xpK -xpK -xpK -rIz -ucz -gSx +cXs +npe +npe +npe +vBd +oxY +oxY +qHF +oIP +xTr +oIP +bYo +lTf ucz -rGc -lFl -oJX jvs bKp mTw @@ -36489,10 +38595,10 @@ gAl odi fRE iBF -bvw +hOp tBJ odi -iQA +lXs lXs bqC uzi @@ -36513,8 +38619,8 @@ uDy iRS xWZ mES -xKi -vYy +wMn +xCV hsS enF vsV @@ -36522,12 +38628,12 @@ vsV vsV vsV qeW -hsS -hsS -hsS +qDv +qDv +qDv fwZ gDe -azc +gfn hSM hSM hSM @@ -36541,21 +38647,21 @@ nJl cjB nJl jwS -jdS pQv -qKW +sDn +aNW cFD kKe -qKW +aNW +pQv pQv -jdS pQv pQv pQv pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -36651,23 +38757,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX -dHn -wPB -wPB -wPB -dHn -xpK -xpK -rIz -ieA -gSx +cXs +npe +npe +npe +cXs +oxY +oxY +qHF +cko +xTr +oIP +bYo +lTf ucz -rGc -lFl -oJX jvs jvs jvs @@ -36686,7 +38792,7 @@ uDX uDX uDX uDX -iQA +lXs lXs bqC bqC @@ -36707,10 +38813,10 @@ oPo oPo gir mES -xKi -vYy +sks +xCV hsS -noo +gtn lyW tdU frw @@ -36735,21 +38841,21 @@ fdk wxQ vwI ano -jdS pQv -qKW +pQv +aNW cFD cFD -qKW +aNW +pQv pQv -jdS pQv pQv pQv pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -36845,28 +38951,28 @@ bmU bmU bmU bmU -lLO +udV abf oJX -leG -dHn -dHn -dHn -leG -xpK -xpK -rIz -ucz -gSx +kFg +cXs +cXs +cXs +kFg +oxY +oxY +qHF +oIP +xTr +oIP +bYo +lTf ucz -rGc -lFl -oJX hKl mTA kNp hKl -oQE +vRw uRw eqb chW @@ -36880,14 +38986,14 @@ pat hrP ekp uDX -iQA -oaB +lXs +lXs bTF ktR rVu ktR wNm -oaB +lXs hvC pkl fLP @@ -36901,8 +39007,8 @@ oPo pyf hqQ mES -xKi -vYy +sks +xCV hsS scJ dtR @@ -36934,16 +39040,16 @@ bxu isn lNA cFD -qKW -pQv -jdS -pQv -pQv +aNW pQv pQv +jVi +jVi +jVi +jVi rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -37039,23 +39145,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -xpK -xpK -oJX +qnA +tZK +xJY +qWW +oIP +lsF +oIP +bYo +qnA +ucz hKl vzP ycp @@ -37072,16 +39178,16 @@ hdr dRI xyl jwl -rEI +nIH uDX -dQg -lXs +cPk +qQL niL ktR ktR ktR niL -oaB +lXs hvC uzR hvC @@ -37095,8 +39201,8 @@ oPo pyf snQ mES -xKi -vYy +sks +xCV hsS rxc pGd @@ -37108,36 +39214,36 @@ wbY wbY wbY oVV -bPn -avz -iXz -fdk -ajY -aeM -nks -fdk -fdk -kzO -gMZ -pvd -nks -fdk +elf +uDw +sky +wZo +iey +kTW +iYL +wZo +wZo +sNR +lfz +bAg +iYL +vQI ano icH pQv -qKW +aNW iOk vUe -qKW -pQv -jdS -pQv -pQv -pQv +aNW pQv +sDn +jVi +bjM +bjM +tIV rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -37233,23 +39339,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX +qnA +qnA +yed +qnA +qnA +adB +qnA +qnA +qnA +ucz hKl iIt wYi @@ -37275,9 +39381,9 @@ gEp gEp gEp emW -oaB -oaB -oaB +wZw +lXs +lXs hvC hvC mES @@ -37289,8 +39395,8 @@ oPo oPo msK mES -xKi -vYy +sks +xCV hsS bbh xjA @@ -37302,7 +39408,7 @@ wbY wbY wbY oVV -qqz +wQf fRG ifZ pWk @@ -37319,19 +39425,19 @@ ano ano icH kYl -qKW -qKW -qKW -qKW -kYl -jdS -kYl +aNW +aNW +aNW +aNW kYl pQv +jVi +jLV pQv +jLV rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -37427,23 +39533,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX +lFl oJX +ijT oJX oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX +pUm +ucz +ucz +ucz +ucz hKl kQy agy @@ -37455,23 +39561,23 @@ aQa cOt hKl cZW -gAl +nGw uDX ixM dSS dSS dSS uDX -dQg -lXs +wHl +nCv emW ftR ftR ftR emW -oaB lXs -oaB +lXs +lXs lXs lXs mES @@ -37483,8 +39589,8 @@ oPo oPo xJO mES -xKi -rxD +sks +wNe hsS vqk pGd @@ -37496,7 +39602,7 @@ wbY wbY wbY pyo -kPZ +blY fEO gBi qxm @@ -37518,14 +39624,14 @@ pQv pQv jVi pQv -jdS -pQv pQv +tpE pQv +jLV pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -37621,23 +39727,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX +sob oJX +ijT oJX oJX +ucz oJX -oJX -oJX -oJX -igr -igr -igr +lFl +lFl +lFl hKl hKl hKl @@ -37656,16 +39762,16 @@ uDX uDX uDX uDX -dQg +kuJ lXs emW +gKt ftR -ftR -ftR +mry emW -oaB lXs -oaB +lXs +lXs lXs lXs mES @@ -37677,20 +39783,20 @@ oPo oPo kJX mES -xKi -cNl +sks +rtf hsS -mGL +ejn dtR kFJ fVL nEF pZE -cGd -djK -mxr +wAu +nPU +byb oud -uGe +lxm wkU hjR xpP @@ -37712,13 +39818,13 @@ bPc vjf jVi pQv -jdS -pQv -pQv -pQv pQv +jVi +ajP +jLV +jVx rdI -lLO +udV bmU bmU bmU @@ -37815,33 +39921,33 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX +lFl oJX +ijT oJX oJX +ucz oJX +lFl +clX oJX oJX -oJX -igr -qbd -sCK -sCK -wnS -wmf +gPj +aRg wCD hEo bYD eof eof tVC -bak +tVC xWA rjo qlJ @@ -37859,7 +39965,7 @@ hso emW kRJ lXs -oaB +lXs lXs lXs mES @@ -37871,8 +39977,8 @@ oPo oPo mRl mES -xKi -xKi +kHm +xCV hsS xXt lyW @@ -37880,13 +39986,13 @@ sJG frw sJG pZE -wAu -nPU -byb +iHo +lGR +xWG oud -uGe +lxm wkU -rVt +lZd nPU nPU nPU @@ -37899,20 +40005,20 @@ qne mNL tCg qne -icH +sVt pQv pQv pQv pQv jVi pQv -jdS -pQv -pQv pQv +jVi +nfJ pQv +tdu rdI -lLO +udV bmU bmU bmU @@ -38009,26 +40115,26 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX +lFl oJX +ijT oJX oJX +ucz oJX -oJX -oJX -oJX -igr -wtd -sCK -sCK -sCK -mbz +lFl +nzv +wou +fzo +fzo +fLd wCD hEo kjl @@ -38044,16 +40150,16 @@ hEo hEo hEo niL -oaB -oaB -dwD +lXs +lXs +lZx hso hso hso emW itl lXs -oaB +lXs lXs lXs mES @@ -38065,8 +40171,8 @@ eHd eHd mES mES -xKi -vYy +vpH +oaB hsS bOP ifB @@ -38078,7 +40184,7 @@ vsV vsV vsV neO -vnT +poA bIO rVt nPU @@ -38093,20 +40199,20 @@ qne mGl qne qne -ciA -jdS -jdS -jdS -jdS -gRZ -jdS -jdS pQv pQv pQv pQv +pQv +gRZ +pQv +pQv +jVi +his +jLV +eQj rdI -lLO +udV bmU bmU bmU @@ -38210,19 +40316,19 @@ abf abf abf oJX +lFl oJX +mqr +wXR +wXR +wXR +wXR +wUA +wXR +bts oJX oJX -oJX -oJX -oJX -ucz -cPY -riK -sCK -sCK -sCK -pOc +ipY wCD hEo hEo @@ -38247,7 +40353,7 @@ ozC nHo eYq lXs -oaB +lXs lXs mES mES @@ -38259,7 +40365,7 @@ mES mES mES mES -dwD +opN emW hsS hsS @@ -38267,14 +40373,14 @@ hsS rKv vGz vGz -eNJ -gru -dDa -qRz -kwb -mXv +atW +chG +sdW +gvY +sqt +ucA nww -rVt +xpP nPU nPU nPU @@ -38284,14 +40390,14 @@ jHC vEL usE qne -lLO +udV rdI -jdS -jdS +qdT pQv pQv pQv pQv +sDn jVi pQv pQv @@ -38398,35 +40504,35 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV abf abf abf abf abf oJX +sCY oJX oJX -oJX -igr -riK -riK -riK -riK -uaP -xXe -vBA -vBA -mUN -psN -iDB -qJr -kDy -pch -rdN +lFl +ucz +ucz +rDD +wXR +voS +gfK +eip +eip +kUm +daB +owP +mfw +mSq +uwq +hhH bwN hLw pxE @@ -38440,8 +40546,8 @@ hso hso emW sAV -oaB -oaB +lXs +lXs lXs mES bqt @@ -38451,7 +40557,7 @@ eHd qfM hso vLQ -hso +ocY oEo hso hso @@ -38461,7 +40567,7 @@ hsS cnD vGz vGz -pcR +gKZ lXK gHd dJT @@ -38478,22 +40584,22 @@ uqB qxy buO kss -lLO +udV rdI -jdS pQv pQv pQv pQv pQv +qAV rdI rdI rdI rdI -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -38592,28 +40698,28 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV abf abf abf abf abf -vtV -mYx -vtV -vtV -vtV -vtV +abf +uRl +abf +abf +abf +abf oly hEo -hEo +wOY dUF tVC nVP @@ -38633,10 +40739,10 @@ hXO hso hso emW -lXs -oaB +wZw lXs lXs +faG mES cuX bmy @@ -38644,18 +40750,18 @@ jUE eHd qfM uBh -uBh -uBh -uBh -uBh -hso -hso +aAR +vfS +vzt +hJF +akH +cOg hso hsS yhU vGz vGz -pcR +gKZ lXK xbY dJT @@ -38672,7 +40778,7 @@ jHC jHC buO kss -lLO +udV rdI cHK rdI @@ -38681,13 +40787,13 @@ rdI rdI rdI rdI -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -38786,31 +40892,31 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV abf abf -vtV -riK -vtV -oSj -oSj -vtV +abf +ucz +abf +gjO +gjO +abf oly oly oly oly -cnj -eQJ +kIO +jZH pch pch pch @@ -38824,11 +40930,11 @@ pch pch pch pam -gpm +kLy ibx emW lXs -oaB +lXs niL niL mES @@ -38838,19 +40944,19 @@ mES vWz qfM oMV -oMV +taF piS oMV -oMV +taF piS mMY -hso +tWF hsS pxq vuU vuU -pyL -ezf +iKe +xhM xXn pTe vxh @@ -38866,22 +40972,22 @@ xjg fQC wzi qne -lLO +udV rdI -jdS +pQv rdI rdI rdI -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -38980,24 +41086,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vtV -riK -vtV -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +abf +tvL +abf +udV +udV aBR byk byk @@ -39018,7 +41124,7 @@ wif wif pch gLE -cam +tMz dsv cGO hhb @@ -39029,8 +41135,8 @@ lXs lXs niL lXs -oaB -emW +lXs +ajH uBh uBh lMo @@ -39043,7 +41149,7 @@ vXI vXI fFj dkJ -vkf +tKY vXI vXI vXI @@ -39060,22 +41166,22 @@ qne kss qne qne -lLO +udV rdI -jdS +pQv rdI -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -39175,23 +41281,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vtV -riK -vtV -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +abf +ucz +abf +udV +udV aBR byk byk @@ -39212,18 +41318,18 @@ wif wif pch uBh -bFy -pWL +ncc +crA emW lXs -qEJ +oaM niL lXs lXs lXs niL lXs -oaB +lXs emW uBh uBh @@ -39237,10 +41343,10 @@ uAq xNZ eym eym -uGi +fhg xNz -dkJ -puH +vXI +hwV eKy bat mnb @@ -39251,24 +41357,24 @@ hUY qHN uhv phl -lLO -lLO -lLO -lLO +udV +udV +udV +udV oGO -jdS +pQv oGO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -39371,25 +41477,25 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -uIm -riK -uIm -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +iyD +ucz +iyD +udV +udV +udV +udV +udV +udV xFO hso hti @@ -39406,18 +41512,18 @@ wif wif pch uBh -bFy +ncc dwV emW lXs -qEJ +oaM niL lXs lXs lXs niL lXs -oaB +lXs emW syC syC @@ -39431,7 +41537,7 @@ vXI eyW iIu iIu -hRq +jYI lsP dkJ aHx @@ -39440,27 +41546,27 @@ cwJ uFA vXI whN -jqj +jaq rWS drX cvm phl -lLO -lLO -lLO -lLO +udV +udV +udV +udV oGO -jdS +pQv oGO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -39567,23 +41673,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -uIm -riK -uIm -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +iyD +ucz +iyD +udV +udV +udV +udV +udV +udV xFO erM hRb @@ -39600,18 +41706,18 @@ wif wif pch hso -bFy +ncc hXO emW -lXs -qEJ +lph +xFM niL lXs lXs lXs niL lXs -oaB +lXs emW emW emW @@ -39621,11 +41727,11 @@ mSC emW mMY hso -jYU +chn tqf iIu qwH -iFS +gRV xLM dkJ lbG @@ -39634,25 +41740,25 @@ vvi bqB vXI phn -kQx +hfn mna ljR sdR oiY -lLO -lLO -vTH -lLO +udV +udV +eZR +udV oGO -jdS +pQv oGO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -39764,22 +41870,22 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -uIm -riK -uIm -lLO -lLO -lLO -vTH +udV +udV +udV +udV +udV +iyD +ucz +iyD +udV +udV +udV +eZR lMW lMW sYI -hso +wMH nbZ pch wif @@ -39797,29 +41903,29 @@ xrX eHE kAx emW -lXs -qEJ niL +gii niL -kcG +niL +iFo niL niL lXs -oaB lXs lXs +oug lXs lXs lXs lXs emW -mMY -hso -vtd -gvf -iIu -tFf -gMF +mEL +xyT +eqV +mVg +qQN +jNO +anf xLM dkJ mDV @@ -39828,23 +41934,23 @@ tPB xGy vXI dvm -fzJ +hAg rqp drX cHm oiY cKt -lLO -vTH -bCq +udV +eZR +mSl rdI -jdS +pQv rdI -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -39959,17 +42065,17 @@ wQG wQG bmU bmU -lLO -lLO -lLO -lLO -vtV -riK -vtV -lLO -lLO -lLO -vTH +udV +udV +udV +udV +abf +ucz +abf +udV +udV +udV +eZR lMW lMW sYI @@ -39988,29 +42094,29 @@ wif wif pch hso -vPi +nkZ hXO emW lXs -qEJ -oaB -xWT -xWT +oaM +lXs +mEB +jms xWT xWT xWT mfl -cWf -cWf +vUJ +enK cWf cWf gnV -lXs +niL emW -mMY +pAo hso vXI -orW +rWu iIu iIu hRq @@ -40022,7 +42128,7 @@ fSs dkJ vXI uIR -mna +fGn laC xob prA @@ -40034,10 +42140,10 @@ rdI rdI cHK rdI -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -40153,19 +42259,19 @@ wQG wQG bmU bmU -lLO -lLO -lLO -lLO -vtV -mYx -vtV -vtV -vtV -vtV -vtV -vtV -vtV +udV +udV +udV +udV +abf +uRl +abf +abf +abf +abf +abf +abf +abf sYI hso hso @@ -40182,14 +42288,14 @@ wif wif pch ozC -iMj +oVF aSR emW lXs oaM lXs lXs -oaB +lXs mmy mmy mmy @@ -40197,12 +42303,12 @@ jzA mmy mmy lXs -lXs -aBe -lXs -emW -mMY +qAZ +qYq +niL hso +pAo +tWF vXI iAH iIu @@ -40216,22 +42322,22 @@ eym gqE vXI kxm -gXK +oUf qpe vkV vkV phl -xFO -bzo -eBM +oGO +rdI +knI +pQv pQv pQv -jdS rdI -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -40347,19 +42453,19 @@ wQG wQG bmU bmU -lLO -lLO -lLO -lLO -vtV -riK -sCK -sCK -sCK -igr -sCK -sCK -sCK +udV +udV +udV +udV +abf +ucz +oJX +igq +oJX +lFl +oJX +oJX +oJX emW hso hso @@ -40376,14 +42482,14 @@ wif wif pch hso -vPi +nkZ hXO emW pzf mvn lXs lXs -oaB +lXs mmy oJp hoO @@ -40393,9 +42499,9 @@ mmy lXs lXs aBe -lXs -emW -mMY +niL +eow +eIE hso vXI ykH @@ -40410,22 +42516,22 @@ pDj mJE vXI iaK +iwG hso hso -hso -hso -hso -hso -emW -eBM +jVi +pQv +pQv pQv +knI pQv -jdS +pQv +sDn rdI -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -40542,18 +42648,18 @@ wQG bmU bmU bmU -lLO -lLO -lLO -vtV -riK -sCK -sCK -qbd -igr -sCK -sCK -sCK +udV +udV +udV +abf +ucz +oJX +oJX +clX +lFl +oJX +oJX +oJX cyg hso hso @@ -40570,26 +42676,26 @@ wif wif pch hso -vPi -hXO +nkZ +eOb emW pzf cZb lXs lXs -oaB +lXs mmy edA edA ldC nxm mmy -lXs -lXs -aBe eYq +lXs +gov +niL emW -mMY +pAo hso vXI xFE @@ -40604,21 +42710,21 @@ erU ucH vXI tMD +iwG hso -hso -hso -hso -hso -hso -emW +oEo +jVi +pQv +pQv +pQv +pQv pQv pQv pQv -jdS rdI -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -40736,18 +42842,18 @@ wQG bmU bmU bmU -lLO -lLO -lLO -vtV -riK -sCK -sCK -wtd -igr -sCK -sCK -sCK +udV +udV +udV +abf +ucz +oJX +oJX +nzv +lFl +oJX +oJX +oJX ruW hso hso @@ -40764,26 +42870,26 @@ wif wif pch hso -bFy +ncc hXO emW lXs lXs lXs lXs -oaB +lXs mmy edA -edA -ldC +ddp +vwZ nxm mmy -lXs +sAV lXs aBe -sAV +lXs emW -mMY +pAo hso vXI qGO @@ -40798,21 +42904,21 @@ fat jHD vXI hso +iwG hso -hso -hso -hso -hso -hso -dwD -jdS -jdS -jdS -jdS +qpu +jVi +qdT +pQv +pQv +pQv +pQv +pQv +pQv rdI -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -40930,21 +43036,21 @@ wQG bmU bmU bmU -lLO -lLO -lLO -vtV -riK -sCK -sCK -sCK +udV +udV +udV +abf +ucz +oJX +oJX +oJX emW emW emW emW emW -cXP -cXP +anX +nSq pch pch pch @@ -40958,7 +43064,7 @@ pch pch pch hso -bFy +ncc hXO tnL emW @@ -40969,7 +43075,7 @@ kPV mmy kMU hCC -qqg +vEd mmy mmy emW @@ -40977,36 +43083,36 @@ emW wSO emW emW -pRy -uBh +pAo +hso vXI wvu uQP uQP vXI -rqS -kNS +xZD +peD vXI uQP uQP wvu dFP hso +iwG hso -hso -hso -hso -hso -hso -emW -sVE +qpu +jVi +pQv +pQv +pQv +pQv pQv pQv pQv rdI -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -41125,22 +43231,22 @@ bmU bmU bmU bmU -lLO -lLO -vtV -riK -riK -riK -riK +udV +udV +abf +ucz +ucz +ucz +ucz dwD hso vLQ +ocY hso -qMQ hso hso -qMQ hso +ocY hso hso hso @@ -41149,29 +43255,29 @@ hso ozC hso vLQ +ocY hso -qMQ uBh -bFy +ncc dwV -qMQ hso +ocY vLQ hso ozC hso -qMQ +hso uBh tOi uBh -uGj +rYF hso ozC hso uot -vLQ -qMQ -mMY +pnl +hso +pAo hso hso hso @@ -41186,20 +43292,20 @@ hso ozC hso hso +iwG hso -hso -hso -hso -hso -hso -emW +qpu +jVi +pQv +pQv +sVE gaL pQv pQv pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -41319,10 +43425,10 @@ bmU bmU bmU bmU -lLO -lLO -vtV -sCK +udV +udV +abf +oJX emW emW emW @@ -41346,7 +43452,7 @@ koc nPp nPp nPp -sDo +igS mpQ rSP nPp @@ -41365,7 +43471,7 @@ hBV gHy koc hBV -bve +ivv cLa cLa cLa @@ -41374,26 +43480,26 @@ cLa cLa cLa cLa -hso -hso -hso -ozC -hso -hso -hso -hso -hso -hso -hso -hso -emW -emW -emW -emW +mAY +cLa +cLa +wJp +cLa +cLa +dlF +cLa +gzI +jVi +ePF +jVi +jVi +jVi +jVi +jVi pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -41513,10 +43619,10 @@ bmU bmU bmU bmU -lLO -lLO -vtV -vtV +udV +udV +abf +abf bzo ftR ftR @@ -41525,14 +43631,14 @@ hso hso muM hso +lZv hso hso hso hso hso hso -ycJ -muM +sRa hso ozC hso @@ -41544,7 +43650,7 @@ uBh woZ afq hso -spg +ncO hso ozC hso @@ -41559,24 +43665,24 @@ hso uot muM afq -lZv -hso -hso -hso +cex hso hso hso +pqV hso hso hso hso +muM hso +pqV ozC hso hso +iwG hso -hso -hso +vPi hso hso hso @@ -41586,8 +43692,8 @@ ftR bzo rdI rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -41708,9 +43814,9 @@ bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV bzo ftR ftR @@ -41718,19 +43824,19 @@ emW hso hso emW -emW -dwD -emW -emW -emW -emW -emW -emW +igr +anp +igr +igr +igr +igr +igr +igr ast ast ast -cNQ -cNQ +lnA +aDs ast ast itJ @@ -41738,39 +43844,39 @@ ast ast nmI rDl -hBO +tMp rDl ort -nPJ +upt fgF fgF fgF fgF fgF -vZK +ihC ort rDl hZr rDl nmI -mIH -emW -emW -emW -emW -emW -emW -emW -emW -emW -emW -emW -emW -nHo -hso -hso +gWt +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +jLk hso +iwG hso +vPi hso hso hso @@ -41778,9 +43884,9 @@ emW ftR ftR bzo -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -41902,9 +44008,9 @@ bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV bzo ftR ftR @@ -41912,17 +44018,17 @@ nHo hso hso emW -tSb -xKi -vYy -vYy -vYy -vYy -gfx -vYy +qbd +kUQ +sCK +sCK +sCK +sCK +jzh +sCK ast otO -dIr +pZe ayu qWs tuS @@ -41932,39 +44038,39 @@ alC mGJ bbX eol -oUt -cIK +cuD +tsi ort -dKt -uDl -uDl -uDl -uDl -uDl -jhy +kmY +lxZ +nbe +lxZ +nbe +nbe +pdh ort -biS +fdu vEY -cIK +iLN nmI -kuG -pjR +hyj pjR +eiY pjR pNn saW pjR pjR -pjR +wwS jDS pjR -pjR +eiY pjR pNn hso +iwG hso -hso -hso +vPi hso hso hso @@ -41972,9 +44078,9 @@ emW ftR ftR bzo -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -42096,24 +44202,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -bzo +udV +udV +udV +qaJ hso hso pKS hso hso emW -jAA -xKi -vYy -vYy -vYy -vYy -gfx -vYy +wtd +hBJ +sCK +sCK +sCK +sCK +jzh +sCK ast fcj qPR @@ -42126,8 +44232,8 @@ eKU iup wPI lYl -jUI -fIh +exf +qVc uYU vmy umM @@ -42137,28 +44243,28 @@ vmy umM vmy rTZ -ntf +lJb cjI fJC nmI -kuG +hyj pjR pjR pjR pNn kxq pjR -pjR -pjR +kMQ +gue jDS pjR -cGb -cGb -xvS -hso -hso -hso +pmi +mjs +pGm +xyT +gDV hso +keX hso hso hso @@ -42166,9 +44272,9 @@ hso hso hso bzo -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -42291,23 +44397,23 @@ bmU bmU bmU bmU -lLO -lLO -bzo -hso +udV +udV +qaJ +pqV hso anX hso hso emW -vYy -xKi -xKi -xKi -xKi -xKi -xKi -vYy +sCK +lsH +riK +riK +riK +riK +riK +sCK ast gfV qPR @@ -42315,12 +44421,12 @@ pWr pWr pWr pWr -pWr +mlH eKU iup wPI lYl -ruc +cyz kQI xnP gxn @@ -42333,24 +44439,24 @@ gxn mLa aQe vhx -fJC +wMF nmI -kuG +hyj pjR pjR pjR pNn kxq pjR -cGb -cGb -cGb -cGb -cGb +oaw +dNX +mjs +mjs +pGK pEp ilP hso -hso +vtk oHd uCf hso @@ -42360,8 +44466,8 @@ hso hso hso bzo -lLO -lLO +udV +udV bmU bmU bmU @@ -42485,23 +44591,23 @@ bmU bmU bmU bmU -lLO -lLO -bzo +udV +udV bzo bzo bzo bzo +qaJ +qaJ bzo -bzo -aBR -aBR -aBR -aBR -aBR -vYy -vYy -vYy +vtV +vtV +vtV +vtV +vtV +sCK +sCK +sCK ast gjj rHt @@ -42514,8 +44620,8 @@ pNK iup wPI lYl -jUI -izi +exf +wRV xnP fEt bTz @@ -42525,18 +44631,18 @@ wql qlX jXW mLa -soC +wtb cjI fJC nmI -kuG -pjR +hyj +kMQ pjR pjR pNn pNn pjR -cGb +nQs pjR jDS pjR @@ -42554,8 +44660,8 @@ bzo bzo bzo bzo -lLO -lLO +udV +udV bmU bmU bmU @@ -42679,36 +44785,36 @@ bmU bmU bmU bmU -lLO -lLO -lLO -aBR -aBR -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -aBR -aBR +udV +udV +udV aBR aBR +udV +udV +udV +udV +udV +udV +udV +udV +vtV +vtV +vtV +vtV kJp eiv tAU gQF vVq qGT -dDU -obN +ocC +qPR eKU tCa -nfj +wPI lYl -jUI +exf fJC aeO vge @@ -42723,33 +44829,33 @@ lYl cjI fJC nmI -wyq -qJL -cee -fNz -hHn -fNz -fNz -sGJ -pjR +blP +fgs +iuu +pUN +kKN +pUN +pUN +vvk +lVy ilP ilP ilP ilP ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV aBR aBR -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -42873,23 +44979,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV aBR aBR -lLO -lLO -lLO -lLO -bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +bmU +udV +udV +udV +udV +udV +udV +udV kJp kJp xHO @@ -42897,27 +45003,27 @@ xHO xHO kJp ast -ast -qqq +oVB +bmu nmI -rFO -lYl -jUI -qcS +mLP +dFw +brK +fJC qdl -xZX -xZX -xZX -xZX -xZX -xZX -xZX +vZd +vZd +vZd +ukO +vZd +vZd +vZd gkF -nSy -cjI -fJC +lYl +qiH +oRI nmI -gyD +sYv pjR orT pjR @@ -42927,23 +45033,23 @@ ilP ilP ilP ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +bmU +udV +udV +udV +udV aBR aBR -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -43067,77 +45173,77 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV pNz uBX -iZQ +lQn aeT rha -nfj +wPI lYl -jUI -qcS +exf +fJC fSj -xZX -xZX -xZX -xZX -xZX -xZX -xZX +vZd +vZd +vZd +vZd +vZd +vZd +vZd nfl -nSy -cjI +lYl +rwX fJC nmI -xMX -pjR +hgD +lVy pjR pjR ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -43263,34 +45369,34 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV vsN -uti +dYu noS qgB rxT wPI lYl -jUI +exf fJC qoE nuS @@ -43302,34 +45408,34 @@ xZX jjf wAO lYl -cjI +rwX fJC nmI -gyD +sYv ilP ilP dgT ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -43457,10 +45563,10 @@ bmU bmU bmU bmU -lLO +udV aBR aBR -lLO +udV bmU bmU bmU @@ -43468,24 +45574,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV vsN -wPm +vbQ ogK kzy rxT wPI lYl -jUI -fIh +exf +qVc xnP fEt xcE @@ -43495,24 +45601,24 @@ wql fFc jXW mLa -ntf -cjI +aOJ +rwX fJC nmI -gyD +sYv ilP pjR pjR ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -43520,10 +45626,10 @@ bmU bmU bmU bmU -lLO +udV aBR aBR -lLO +udV bmU bmU bmU @@ -43651,10 +45757,10 @@ bmU bmU bmU bmU -lLO +udV aBR aBR -lLO +udV bmU bmU bmU @@ -43662,23 +45768,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV pNz -wZd -bkw +qPx +lQn lQn rxT wPI lYl -dHC +gjG lPz xnP gxn @@ -43690,23 +45796,23 @@ dty gxn mLa njr -lMH -fJC +voh +wMF nmI -gyD +sYv ilP pjR pjR ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -43714,10 +45820,10 @@ bmU bmU bmU bmU -lLO +udV aBR aBR -lLO +udV bmU bmU bmU @@ -43845,10 +45951,10 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -43856,24 +45962,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -pNz -pNz +udV +udV +udV +udV +udV +udV +udV +udV +udV pNz +haP lQn -iWj -nfj +lQn +rxT +wPI lYl -jUI -izi +exf +wRV quf uHB jqt @@ -43883,24 +45989,24 @@ uHB jqt uHB xwu -soC -cjI +wtb +rwX fJC nmI -lPP +hpI dMw ilP dgT ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -43908,10 +46014,10 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -44039,10 +46145,10 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -44051,23 +46157,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV pNz -vPC -ght -pXE +rdj +lQn +lQn +rxT +nfj lYl -jUI -jYg +exf +wES pIK rKn ufL @@ -44078,22 +46184,22 @@ ufL vds cmC qbk -cjI +rwX fJC boB -cFn +cyI mjw -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -44102,10 +46208,10 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -44234,8 +46340,8 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV bmU bmU bmU @@ -44245,49 +46351,49 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV pNz uzr -ght -iTX +stN +lQn +rxT +nfj lYl -fuV -xDX -vJO -kRv -kRv -kRv -nyv -kRv -kRv -kRv -vPy -xDX -qHI -qMA -ogt -gLZ +ejM +dAH +xan +fec +fec +fec +tMe +fec +fec +fec +hhP +dAH +oMf +uka +azw +qXB mjw -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -44297,8 +46403,8 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV bmU bmU bmU @@ -44428,8 +46534,8 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV bmU bmU bmU @@ -44439,21 +46545,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV pNz uzr -ght -qcr -eDV +stN +lQn +iWj +nfj +lYl jYE tHh raE @@ -44471,17 +46577,17 @@ nWH jIs mjw mjw -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -44491,8 +46597,8 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV bmU bmU bmU @@ -44622,8 +46728,8 @@ bmU bmU bmU bmU -lLO -qPO +udV +wST bmU bmU bmU @@ -44634,21 +46740,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV pNz pNz +vsN +vsN pNz -tXs -lYl -tHh +vJA +hrb +jYE tHh rWd kZq @@ -44665,16 +46771,16 @@ bdp mVZ mjw mjw -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -44685,8 +46791,8 @@ bmU bmU bmU bmU -qPO -lLO +wST +udV bmU bmU bmU @@ -44828,47 +46934,47 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -bmU -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV mjw -nfj -tVX +iTX +wNJ wRi -aBL +wvm kZy -wIf -wRi -aBL +oda +bOl +wvm iBE -wIf -wRi -aBL +oda +bOl +wvm kZy -wIf +oda wRi iqc dtS mjw -lLO -vTH +udV +eZR uEb -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO +mjM +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -45022,17 +47128,17 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -bmU -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV mjw mjw mjw @@ -45052,17 +47158,17 @@ qPe mjw mjw mjw -lLO -vTH +udV +eZR uEb -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO +mjM +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -45216,47 +47322,47 @@ bmU bmU bmU bmU -lLO -gry -gry -gry -gry -gry -gry -gry +udV +fyh +fyh +fyh +fyh +fyh +fyh +fyh kAb kAb -gry -gry -gry -isf -peB -peB -peB -peB -peB -peB -peB -peB -peB -peB -peB -peB -eDy -gry -gry -gry -gry +fyh +fyh +fyh +cgX +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +vUL +fyh +fyh +fyh +fyh koY uEb -avn -gry -gry -gry -gry -gry -gry -lLO +kUD +fyh +fyh +fyh +fyh +fyh +fyh +udV bmU bmU bmU @@ -45410,21 +47516,21 @@ bmU bmU bmU bmU -vTH +eZR lMW lMW -peB -peB -peB -peB -peB +pnO +pnO +pnO +pnO +pnO uEb uEb -peB -peB -peB -peB -peB +pnO +pnO +pnO +pnO +pnO jWJ jWJ jWJ @@ -45436,21 +47542,21 @@ jWJ jWJ jWJ jWJ -peB -peB -peB -peB -peB +pnO +pnO +pnO +pnO +pnO uEb uEb -peB -peB -peB -peB -peB +pnO +pnO +pnO +pnO +pnO lMW lMW -dBY +mjM bmU bmU bmU @@ -45604,21 +47710,21 @@ bmU bmU bmU bmU -lLO -tcC -tcC -tcC -tcC -tcC -tcC -tcC +udV +aYP +aYP +aYP +aYP +aYP +aYP +aYP kAC kAC -tcC -tcC -tcC -tcC -tcC +aYP +aYP +aYP +aYP +aYP jWJ eEc eEc @@ -45630,21 +47736,21 @@ jWJ jSb jSb jWJ -tcC -tcC -tcC -tcC -tcC +aYP +aYP +aYP +aYP +aYP kAC kAC -tcC -tcC -tcC -tcC -tcC -tcC -tcC -lLO +aYP +aYP +aYP +aYP +aYP +aYP +aYP +udV bmU bmU bmU @@ -45799,20 +47905,20 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV jWJ eEc eEc @@ -45824,20 +47930,20 @@ jWJ ubb ubb jWJ -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -45993,20 +48099,20 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV jWJ jWJ jWJ @@ -46018,20 +48124,20 @@ jWJ ubb ubb jWJ -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -46187,20 +48293,20 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV jWJ lMW lMW @@ -46208,24 +48314,24 @@ ubb ubb ubb ubb -ubb +erP ubb ubb jWJ -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -46382,18 +48488,18 @@ bmU bmU bmU bmU -qPO -lLO -lLO +wST +udV +udV bmU bmU bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV jWJ jWJ lMW @@ -46402,23 +48508,23 @@ ubb ubb ubb ubb -ubb +erP ubb ubb jWJ jWJ -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU bmU bmU bmU -lLO -lLO -qPO +udV +udV +wST bmU bmU bmU @@ -46585,9 +48691,9 @@ bmU bmU bmU bmU -bLa -eDU -fRZ +wCF +nQB +lrl pby eEc wdu @@ -46601,9 +48707,9 @@ gzH lMW lDx pby -eyk -eDU -pYv +noA +nQB +mpc bmU bmU bmU @@ -46781,7 +48887,7 @@ bmU bmU bmU bmU -oAM +weS jWJ rVE mer @@ -46795,7 +48901,7 @@ xuq lMW ojb jWJ -oAM +weS bmU bmU bmU @@ -46975,21 +49081,21 @@ bmU bmU bmU bmU -oAM +weS jWJ jWJ jWJ jWJ jWJ jWJ -dNV +wCG jWJ jWJ jWJ jWJ jWJ jWJ -oAM +weS bmU bmU bmU @@ -47169,21 +49275,21 @@ bmU bmU bmU bmU -rEi -eDU -eDU -eDU -eDU -eDU -eDU -scw -eDU -eDU -eDU -eDU -eDU -eDU -hkO +dDF +nQB +nQB +nQB +nQB +nQB +nQB +xnC +nQB +nQB +nQB +nQB +nQB +nQB +dTl bmU bmU bmU @@ -47363,21 +49469,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV aBR -lLO -lLO -oAM -lLO -lLO +udV +udV +weS +udV +udV aBR -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -47559,17 +49665,17 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV aBR aBR -lLO -oAM -lLO +udV +weS +udV aBR aBR -lLO -lLO +udV +udV bmU bmU bmU @@ -47753,17 +49859,17 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -oAM -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +weS +udV +udV +udV +udV +udV bmU bmU bmU @@ -47949,12 +50055,12 @@ bmU bmU bmU bmU -lLO -lLO -lLO -oAM -lLO -lLO +udV +udV +udV +weS +udV +udV bmU bmU bmU @@ -48144,10 +50250,10 @@ bmU bmU bmU bmU -lLO -lLO -oAM -lLO +udV +udV +weS +udV bmU bmU bmU @@ -48338,10 +50444,10 @@ bmU bmU bmU bmU -lLO -lLO -oAM -lLO +udV +udV +weS +udV bmU bmU bmU @@ -48532,10 +50638,10 @@ bmU bmU bmU bmU -lLO -lLO -oAM -lLO +udV +udV +weS +udV bmU bmU bmU @@ -48726,10 +50832,10 @@ bmU bmU bmU bmU -lLO -lLO -oAM -lLO +udV +udV +weS +udV bmU bmU bmU @@ -48921,8 +51027,8 @@ bmU bmU bmU bmU -lLO -oAM +udV +weS bmU bmU bmU @@ -49115,8 +51221,8 @@ bmU bmU bmU bmU -lLO -oAM +udV +weS bmU bmU bmU @@ -49309,8 +51415,8 @@ bmU bmU bmU bmU -qPO -chI +wST +hJi bmU bmU bmU diff --git a/maps/euthenia/levels/deck2.dmm b/maps/euthenia/levels/deck2.dmm index c6321dbf49..3d348c4ca2 100644 --- a/maps/euthenia/levels/deck2.dmm +++ b/maps/euthenia/levels/deck2.dmm @@ -28,13 +28,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/research) -"abD" = ( -/obj/machinery/atmospherics/component/binary/pump, -/obj/machinery/door/firedoor/glass, -/obj/effect/floor_decal/industrial/danger, -/obj/machinery/door/airlock/glass/atmos, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/atmos) "abL" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, /obj/effect/floor_decal/corner_techfloor_grid{ @@ -55,6 +48,21 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"adg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "adh" = ( /turf/simulated/floor/tiled, /area/rnd/rdoffice) @@ -73,6 +81,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"adq" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "adF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -80,15 +95,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"aem" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "aey" = ( /obj/structure/railing{ dir = 4 @@ -110,6 +116,18 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"afH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "afW" = ( /obj/machinery/atmospherics/component/trinary/filter{ filtering = "n2o" @@ -172,6 +190,17 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) +"agS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "agU" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 4 @@ -194,7 +223,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_d) "ahy" = ( @@ -232,11 +261,6 @@ "ajb" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/cargo) -"ajf" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "ajq" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 8 @@ -244,6 +268,29 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"ajv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/light/small, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"ajA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "ajJ" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, @@ -256,7 +303,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) "aks" = ( @@ -285,6 +332,22 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/transport_tunnel) +"akV" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "alh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -304,14 +367,9 @@ /obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/rust, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) -"aln" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "alw" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -326,7 +384,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, @@ -377,6 +435,10 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/maintenance/deck_two) +"aoz" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "aoA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -389,15 +451,22 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/engineering/engine_eva) +"aoB" = ( +/obj/structure/ladder, +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "aoH" = ( /turf/simulated/wall/prepainted/medical, /area/medical/patient_wing) -"apO" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/atmos, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/atmos) +"apQ" = ( +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -12 + }, +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/tiled, +/area/hydroponics) "aqc" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass{ @@ -420,7 +489,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/critical/east_bump, +/obj/machinery/power/apc/critical/east_mount, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) @@ -454,16 +523,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"arg" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"arp" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/steel, -/area/space) "arH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -512,6 +571,17 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) +"asH" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"atk" = ( +/obj/structure/catwalk, +/obj/machinery/camera/network/outside{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "atO" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -524,9 +594,27 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"atT" = ( +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "auf" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/gas_storage) +"auy" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"auF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/space) "avr" = ( /obj/structure/cable{ icon_state = "2-4" @@ -590,12 +678,41 @@ "awY" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/storage) +"axi" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"axq" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "AI Upload Access"; + req_access = list(16); + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/ai/foyer) "axC" = ( /obj/structure/cable/green{ icon_state = "2-8" }, /turf/simulated/floor/plating, /area/maintenance/substation/security) +"axF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "axH" = ( /obj/structure/railing{ dir = 1 @@ -639,6 +756,12 @@ /obj/item/deck/cards, /turf/simulated/floor/carpet, /area/medical/patient_wing) +"ayP" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "ayZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red, /obj/structure/cable/green{ @@ -647,9 +770,22 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"azv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "azx" = ( /obj/structure/railing{ dir = 8 @@ -667,22 +803,17 @@ }, /turf/simulated/floor/tiled/techmaint, /area/space) -"aAa" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +"azL" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "aAi" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) -"aAo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "aAN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -709,24 +840,6 @@ "aCf" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/server) -"aCp" = ( -/obj/effect/floor_decal/techfloor/orange/corner{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-10" - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) -"aCC" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "aDN" = ( /obj/structure/railing, /obj/structure/railing{ @@ -734,23 +847,9 @@ }, /turf/simulated/open, /area/quartermaster/hallway) -"aDW" = ( -/obj/structure/table/hardwoodtable, -/obj/item/stamp/qm{ - pixel_x = -6 - }, -/obj/item/stamp/denied{ - pixel_x = 7 - }, -/obj/item/stamp/cargo, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "aDY" = ( /obj/structure/cable, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -759,12 +858,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"aEr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/space) "aEw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/reinforced, /obj/random/tech_supply, /obj/random/tech_supply, @@ -772,12 +871,25 @@ /obj/machinery/recharger, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"aEx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "aEF" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"aEL" = ( +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "aFc" = ( /obj/effect/floor_decal/corner/yellow{ dir = 10 @@ -787,6 +899,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"aFO" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "aFW" = ( /obj/structure/cable/green{ icon_state = "16-0" @@ -795,6 +913,15 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/starboard) +"aGn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "aGz" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -802,21 +929,6 @@ /obj/structure/flora/pottedplant/dead, /turf/simulated/floor/tiled/techfloor, /area/server) -"aGV" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/grass_edge/corner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research/researchdivision) "aHa" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4 @@ -828,14 +940,57 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"aHc" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"aHm" = ( +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"aHu" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) +"aHC" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"aHG" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "aIb" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/civilian) +"aIh" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 1 + }, +/obj/machinery/camera/network/engine, +/turf/simulated/floor/tiled/techfloor, +/area/space) "aIl" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) "aIF" = ( @@ -886,7 +1041,7 @@ icon_state = "1-2" }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/substation/research) "aJB" = ( @@ -924,6 +1079,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"aKi" = ( +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "aKv" = ( /obj/item/radio/intercom{ dir = 4; @@ -945,16 +1106,16 @@ /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) +"aLf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) "aLu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/wall/r_wall, /area/main_map/maintenance/atmospheric_substation/ai) -"aLS" = ( -/obj/structure/closet/l3closet/janitor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "aMb" = ( /obj/structure/bed/chair/sofa/black/left, /obj/effect/floor_decal/spline/fancy/wood{ @@ -962,6 +1123,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"aMn" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "aMv" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -974,14 +1141,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"aMD" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/space) "aMU" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -1028,10 +1187,20 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"aNn" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "aNs" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/wood, @@ -1119,13 +1288,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"aPO" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 +"aQv" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "aQy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -1144,6 +1318,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/fitness) +"aQM" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "aQU" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -1153,10 +1340,6 @@ }, /turf/simulated/floor/reinforced, /area/space) -"aRq" = ( -/obj/structure/wall_frame, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "aRM" = ( /obj/machinery/door/airlock/command{ id_tag = "RDdoor"; @@ -1175,6 +1358,16 @@ /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"aSD" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "aTr" = ( /obj/structure/railing{ dir = 4 @@ -1239,7 +1432,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "hanger1b"; - layer = 3.3; name = "Hanger 1 B Shutters" }, /turf/simulated/floor/reinforced, @@ -1276,6 +1468,36 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) +"aUX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"aVu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"aVx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "aWs" = ( /obj/structure/table/standard, /obj/structure/bedsheetbin, @@ -1285,6 +1507,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"aWF" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "aWG" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -1320,10 +1554,14 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck2) -"aYx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +"aZe" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "aZm" = ( /obj/machinery/door/airlock{ name = "Restroom" @@ -1352,10 +1590,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"aZv" = ( -/obj/machinery/atmospherics/portables_connector, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "aZw" = ( /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 4 @@ -1419,15 +1653,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"baW" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"baF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"baO" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + pressure_resistance = 750; + target_pressure = 750; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"baX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) +/area/space) "bbw" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -1450,21 +1697,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"bbG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "bbH" = ( /obj/machinery/door/airlock/hatch{ name = "Main Fuel Storage" @@ -1475,17 +1707,6 @@ "bbR" = ( /turf/simulated/wall, /area/maintenance/cargo) -"bcv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/access_button/airlock_interior{ - master_tag = "engineering_main"; - pixel_x = 24 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"bcI" = ( -/turf/space, -/area/main_map/hallway/deck2/stairs) "bcK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -1514,30 +1735,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"bcZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +"bdk" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"bda" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/port) +/area/main_map/maintenance/deck_two/starboard) "bez" = ( /obj/machinery/atmospherics/component/trinary/filter/mirrored{ dir = 1; @@ -1545,34 +1747,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"beG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +"bfD" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "bfJ" = ( /obj/machinery/door/firedoor, /obj/structure/catwalk, /obj/machinery/door/window/brigdoor/eastleft, /turf/simulated/floor/plating, /area/security/brig) -"bfO" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"bfR" = ( -/obj/machinery/door/airlock/glass/engineering, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) "bga" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1587,6 +1773,18 @@ /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall, /area/engineering/atmos/processing) +"bgi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "bgs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -1594,11 +1792,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/hallway) -"bgx" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/engine_gas) "bgG" = ( /turf/simulated/wall/r_wall, /area/security/brig) @@ -1633,6 +1826,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"bjf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"bjg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "bjD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1650,12 +1868,6 @@ /obj/machinery/mech_recharger, /turf/simulated/floor/reinforced, /area/space) -"bko" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "bkO" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 1 @@ -1689,16 +1901,34 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) +"bly" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "bmj" = ( /obj/structure/railing, /turf/simulated/open, /area/crew_quarters/bar) +"bmn" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/landmark{ + name = "morphspawn" + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "bmr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_b) "bnA" = ( @@ -1711,7 +1941,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/substation/security) "bnI" = ( @@ -1748,30 +1978,11 @@ /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"boQ" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/monotile, -/area/space) -"boW" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2/stairs) "boX" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/forward/starboard) "bpe" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/stairs) "bpg" = ( @@ -1780,28 +1991,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) -"bqw" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"bqz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "bqH" = ( /obj/item/storage/toolbox/emergency, /obj/item/storage/toolbox/emergency, @@ -1881,14 +2070,31 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"bsV" = ( -/obj/structure/sign/deck/second, -/turf/simulated/wall/r_wall/prepainted/security, -/area/space) -"btP" = ( -/obj/structure/sign/deck/second, -/turf/simulated/wall/r_wall, -/area/space) +"btA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"btR" = ( +/obj/effect/floor_decal/grass_edge/corner, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/rnd/research/researchdivision) "btX" = ( /obj/structure/mopbucket, /obj/item/reagent_containers/glass/bucket, @@ -1913,6 +2119,15 @@ "bvd" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/station/fighter_bay/hangar) +"bvi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "bvp" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -1924,12 +2139,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"bvR" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "bvX" = ( /obj/structure/sign/deck/second{ pixel_x = -32 @@ -1939,15 +2148,6 @@ "bvZ" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/main_map/maintenance/deck_two/forward) -"bwl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) "bwo" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -1972,21 +2172,18 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"bwO" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"bwE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 10 }, /obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/air_alarm{ + pixel_y = 24 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/research) "bxa" = ( /obj/machinery/door/airlock/maintenance/sec, /obj/machinery/door/blast/regular{ @@ -1998,16 +2195,30 @@ }, /turf/simulated/floor/tiled/techmaint, /area/security/brig) +"bxe" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"bxj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "bxl" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/hallway) "bxr" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_smes) -"bxt" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "bxu" = ( /obj/structure/cable/green{ icon_state = "32-8" @@ -2045,10 +2256,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"bxZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "bye" = ( /obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) +"bym" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "byt" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2124,33 +2353,54 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/showers) +"bzq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"bAt" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"bAM" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"bBn" = ( +/obj/machinery/door/firedoor, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck2) "bBv" = ( /obj/machinery/light_switch{ pixel_y = -25 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"bBB" = ( -/obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/space) "bCc" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/bar_backroom) +"bCf" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "bCi" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 @@ -2160,6 +2410,40 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"bCj" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/closet{ + desc = "Dents and old flaky paint blanket this old storage unit."; + name = "old locker" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"bCs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"bCQ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "bDm" = ( /obj/structure/fitness/weightlifter, /obj/effect/floor_decal/corner/lightgrey/border{ @@ -2167,14 +2451,34 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) -"bDD" = ( +"bDR" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/atmos) +"bDW" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "bEn" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -2185,26 +2489,15 @@ "bEC" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) -"bEU" = ( -/obj/structure/ladder, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "bFb" = ( /obj/machinery/door/blast/shutters{ dir = 2; id = "hanger1a"; - layer = 3.3; name = "Hanger 1 A Shutters" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/a) -"bFh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "bFx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2217,10 +2510,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/station/fighter_bay/maintenance) -"bFQ" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) "bGg" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2228,64 +2517,41 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two) -"bGD" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"bHo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) -"bHV" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access = list(16); - req_one_access = list() - }, -/obj/structure/cable{ - icon_state = "1-2" +"bHf" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/lobby) +"bHH" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"bHI" = ( +/obj/machinery/light/small{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/ai) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "bId" = ( /turf/simulated/open, /area/main_map/hallway/deck2/starboard_fore) +"bIg" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "bIt" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_d) -"bJc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) -"bJG" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) "bJL" = ( /obj/machinery/door/airlock/engineering{ name = "Hangar Substation" @@ -2295,20 +2561,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/substation/flight_deck) -"bKa" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/shield_gen) "bKo" = ( /obj/machinery/door/airlock/maintenance/cargo, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, /area/quartermaster/foyer) -"bKr" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/main_map/maintenance/deck_two/forward/starboard) "bKM" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -2318,22 +2575,44 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/b) -"bKZ" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +"bLg" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "bLr" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"bMm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) +"bMq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "bMO" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass{ @@ -2349,6 +2628,31 @@ "bNf" = ( /turf/simulated/floor/plating, /area/main_map/hallway/deck2/starboard_fore) +"bNv" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/aux{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"bNB" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "bOC" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -2356,9 +2660,12 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techfloor, /area/server) +"bPe" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/maintenance/engineering/upper) "bPl" = ( /obj/structure/railing{ dir = 4 @@ -2395,15 +2702,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"bRv" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "bRB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -2411,6 +2709,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"bRJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "bRO" = ( /turf/simulated/open, /area/space) @@ -2419,6 +2732,18 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_two) +"bSN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "bSU" = ( /obj/machinery/door/airlock/research{ name = "Toxins Storage"; @@ -2437,12 +2762,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/rnd/robotics/mechbay) -"bTl" = ( -/obj/machinery/camera/network/command{ - dir = 1 - }, +"bTi" = ( +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/rnd/robotics) "bTC" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) @@ -2456,17 +2779,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/a) -"bUR" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 - }, -/obj/random/trash_pile, -/turf/space/basic, -/area/space) "bVM" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple, /obj/machinery/meter, @@ -2475,15 +2787,32 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"bWe" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "bWt" = ( /obj/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"bWv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/machinery/camera/network/engineering{ + dir = 8 + }, +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/techfloor, +/area/space) "bWx" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -2504,18 +2833,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2/stairs) -"bXU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) "bYA" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_eva) @@ -2536,8 +2853,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -2562,6 +2878,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"bYZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) "bZc" = ( /obj/machinery/door/airlock/glass/engineeringatmos{ name = "Damage Control Storage" @@ -2575,6 +2898,25 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/hallway) +"bZe" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Fighter Bay Maintenance"; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) +"bZB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "bZI" = ( /obj/structure/cable{ icon_state = "2-4" @@ -2596,6 +2938,13 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"cag" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "cal" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -2609,18 +2958,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cao" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "caB" = ( /obj/structure/grille, /obj/structure/lattice, @@ -2632,22 +2969,13 @@ /obj/item/mop, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"cbd" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"cbf" = ( +/obj/machinery/door/airlock/maintenance/engi, +/obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/structure/catwalk, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/engineering/engine_smes) "cbF" = ( /obj/structure/cable{ icon_state = "32-2" @@ -2669,22 +2997,39 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck2) -"cbU" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ +"cbT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"ccc" = ( -/obj{ - name = "---Merge conflict marker---" +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/air_alarm{ - pixel_y = 22 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"ccp" = ( +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/machinery/camera/network/civilian, -/obj/structure/flora/pottedplant/smalltree, -/turf/space/basic, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"ccq" = ( +/obj/structure/cable/heavyduty, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "ccM" = ( /turf/simulated/floor/tiled/white, @@ -2730,43 +3075,25 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"cdB" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/crew_quarters/fitness) -"cdR" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/space) -"cea" = ( -/turf/simulated/open, -/area/rnd/rdoffice) -"cef" = ( +"cdw" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) -"cel" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"cem" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two) +"cdB" = ( +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/crew_quarters/fitness) +"cea" = ( +/turf/simulated/open, +/area/rnd/rdoffice) "cex" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2775,6 +3102,15 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_smes) +"ceE" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/port) "ceK" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/tiled/techfloor/grid, @@ -2789,17 +3125,34 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"cfF" = ( -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) -"cfP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"cfx" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for shutters."; + id = "hop_office_desk"; + name = "Desk Privacy Shutter"; + pixel_x = 6; + pixel_y = -29 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"cfB" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) +"cfF" = ( /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/area/maintenance/cargo) "chl" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -2812,10 +3165,6 @@ }, /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) -"cil" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/reinforced/airless, -/area/space) "cis" = ( /turf/simulated/wall/prepainted/medical, /area/medical/patient_a) @@ -2829,6 +3178,24 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"ciF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "ciH" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -2845,24 +3212,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"cjl" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"cjs" = ( -/obj/structure/closet/firecloset, +"cjM" = ( +/obj/machinery/pipedispenser/disposal, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"cjy" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, -/obj/effect/floor_decal/industrial/danger{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/engineering/atmos) "ckt" = ( /obj/machinery/door/airlock{ name = "Hydroponics"; @@ -2876,10 +3229,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/hydroponics) -"ckX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "clm" = ( /obj/structure/cable{ icon_state = "0-8" @@ -2893,43 +3242,35 @@ }, /turf/simulated/floor/airless/ceiling, /area/engineering/engine_smes) -"clr" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/space/basic, -/area/space) "clx" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled, /area/hydroponics) -"clM" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hangar_pad"; - name = "Hangar Bay Blast Door" - }, -/obj/machinery/atmospheric_field_generator/perma, -/turf/simulated/floor/reinforced, -/area/space) "cms" = ( /obj/machinery/camera/network/engine{ dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"cmB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"cnC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "cnF" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -2953,6 +3294,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"cnQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"cnR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "coC" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 @@ -2962,7 +3318,7 @@ /area/medical/medbay2) "coG" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/bridge/meeting_room) "coN" = ( @@ -2994,20 +3350,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/cargo) -"cpo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"cqf" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +"cpq" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) +/area/main_map/maintenance/deck_two/forward/starboard) "cqS" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Forward Point Defense Subgrid"; @@ -3043,10 +3391,33 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"crA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "crM" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"csx" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" + }, +/turf/simulated/floor/plating, +/area/bridge/hop_office) "csV" = ( /obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/fancy/wood{ @@ -3063,19 +3434,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/research) -"ctg" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "ctG" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass, @@ -3089,16 +3447,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) -"cuj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "cuq" = ( /obj/structure/table/rack, /obj/random/mre, @@ -3141,18 +3489,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"cxb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "cxc" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3186,6 +3522,17 @@ /obj/structure/sign/deck2, /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_eva) +"cyN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/landmark/spawnpoint/job/research_director, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "cyO" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 6 @@ -3193,6 +3540,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"czC" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "czE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3200,6 +3556,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/starboard) +"czI" = ( +/obj/machinery/disposal, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"czO" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "czQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -3213,33 +3580,10 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"cAj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"cAo" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) +"cAp" = ( +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "cBv" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/pool/changing_room) @@ -3275,6 +3619,25 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) +"cCP" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Fighter Bay Maintenance"; + req_one_access = list(19,29,38,43,47,63,67) + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) +"cCQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "cCV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3288,6 +3651,12 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) +"cDs" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "cDN" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 9 @@ -3297,11 +3666,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"cDO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "cFL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -3314,6 +3678,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) +"cGt" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "cGQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3337,26 +3707,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"cGZ" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 - }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) "cHo" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3388,17 +3738,43 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) +"cHI" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "cIf" = ( /obj/machinery/door/firedoor/glass, /obj/effect/spider/stickyweb/dark, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) -"cIh" = ( +"cIS" = ( +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/obj/structure/lattice, /obj/structure/railing{ - dir = 8 + dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/engineering/deck2/power_line) +"cIV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "cJP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -3411,7 +3787,7 @@ /area/rnd/robotics) "cJY" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/monotile, /area/security/observation) "cKi" = ( @@ -3429,12 +3805,6 @@ /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"cKL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "cKP" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -3453,15 +3823,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"cLo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "cLB" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -3473,10 +3834,18 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/medical/medbay2) -"cMd" = ( -/obj/machinery/atmospherics/component/binary/pump, +"cLR" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"cLW" = ( +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two) "cMn" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(30,47,77) @@ -3487,6 +3856,18 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/rnd/xenobiology/xenoflora_storage) +"cMO" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "cMZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -3496,24 +3877,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"cNa" = ( -/obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"cNF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 1 +"cNB" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft) +/area/main_map/maintenance/deck_two) "cOp" = ( /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"cPe" = ( +/obj/structure/sign/deck/second, +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/lobby) "cPC" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall, @@ -3543,6 +3921,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"cQp" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "cQw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3580,15 +3964,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"cSw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"cSC" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) +"cTP" = ( +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "cUs" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3617,6 +4008,23 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"cUW" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"cUX" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "cVc" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3633,14 +4041,18 @@ "cVE" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"cWD" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 +"cWu" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/holofloor/tiled/dark, +/area/medical/medbay2) +"cWx" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 }, -/obj/structure/railing, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/area/main_map/maintenance/deck_two/aft/starboard) "cWH" = ( /obj/machinery/door/airlock/glass{ name = "Recreation Area" @@ -3675,15 +4087,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) -"cXm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +"cXA" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "cXJ" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/spray/cleaner, @@ -3701,26 +4108,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_smes) -"cXM" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ +"cYd" = ( +/obj/machinery/power/terminal{ dir = 1 }, -/obj/structure/window/phoronreinforced, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) -"cYe" = ( -/obj/machinery/atmospherics/valve/digital, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/engineering/shield_gen) "cYp" = ( /obj/machinery/door/airlock/engineering{ name = "Security Substation"; @@ -3732,16 +4132,16 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"cYP" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/Hangar_bay/deck2) "cZg" = ( /obj/structure/closet/secure_closet/guncabinet/robotics, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) +"cZw" = ( +/obj/machinery/door/airlock/maintenance/command{ + name = "Command Atmospheric Substation" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/command) "cZF" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3770,6 +4170,21 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/observation) +"dak" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) +"daq" = ( +/obj/structure/table/steel, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "daw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3779,6 +4194,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) +"daV" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) +"dbe" = ( +/obj/structure/closet/crate/biohazard, +/obj/item/nif/bad, +/obj/item/nif/bad, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "dbf" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -3786,9 +4213,12 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"dbv" = ( +"dbE" = ( +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) +/area/main_map/maintenance/deck_two/forward/starboard) "dcQ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/steeldecal/steel_decals6, @@ -3804,6 +4234,21 @@ /obj/effect/debris/cleanable/blood/oil, /turf/simulated/floor/tiled/dark, /area/rnd/robotics) +"ddd" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "ddp" = ( /obj/machinery/door/airlock/glass{ name = "Recovery Wing" @@ -3811,10 +4256,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"ddu" = ( -/obj/machinery/camera/network/outside, -/turf/simulated/floor/reinforced/airless, -/area/space) "ddw" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 @@ -3844,7 +4285,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/high/east_bump, +/obj/machinery/power/apc/high/east_mount, /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -3860,18 +4301,29 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) -"deT" = ( -/obj/structure/railing{ - dir = 4 +"deU" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/open, -/area/rnd/research/researchdivision) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "dfM" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/atmospheric_substation/ai) "dgp" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/main_map/hallway/deck2) +"dgx" = ( +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "dhm" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/steel_grid, @@ -3882,15 +4334,27 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/showers) -"dhE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 +"dhy" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"dhF" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "dhN" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -3898,6 +4362,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"dhO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "dik" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -3978,18 +4451,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"dkZ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "dle" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4042,14 +4503,6 @@ /obj/structure/handrail, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"dmh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) "dmn" = ( /obj/structure/closet/hydrant{ pixel_x = 32 @@ -4062,16 +4515,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"dmG" = ( -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - dir = 4; - target_pressure = 15000 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "dmL" = ( /obj/structure/bed/chair/sofa/black/left{ dir = 1 @@ -4090,6 +4533,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"dmT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "dnn" = ( /obj/structure/table/rack{ dir = 8; @@ -4136,10 +4588,57 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_a) +"doK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "dpw" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"dpW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"dpZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/space) +"dqD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) +"drc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "drw" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/tiled, @@ -4150,15 +4649,21 @@ }, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos) +"drO" = ( +/obj/structure/sign/deck2{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) "drT" = ( /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/a) -"drX" = ( -/obj/machinery/power/thermoregulator{ - anchored = 1 +"drV" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/engine_smes) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "dso" = ( /obj/structure/table/fancyblack, /obj/effect/floor_decal/spline/fancy/wood{ @@ -4166,21 +4671,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"dsx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "dth" = ( /obj/machinery/atmospherics/pipe/zpipe/down/supply{ dir = 8 @@ -4218,6 +4708,18 @@ }, /turf/simulated/open, /area/maintenance/engineering) +"dub" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"dug" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/techfloor, +/area/space) "duK" = ( /obj/machinery/shieldgen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -4226,13 +4728,6 @@ "duL" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two) -"duQ" = ( -/obj/structure/table/bench/wooden, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/fitness) "dvl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue{ dir = 8 @@ -4257,10 +4752,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) -"dvx" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +"dvX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "dwf" = ( /obj/structure/railing{ dir = 4 @@ -4277,40 +4775,14 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"dwx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "dwG" = ( /obj/machinery/computer/atmos_alert, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"dwL" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/turf/space/basic, -/area/space) "dxu" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, @@ -4344,27 +4816,12 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"dzb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +"dzl" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"dzg" = ( -/obj/machinery/door/airlock/engineering{ - name = "Science Substation"; - req_one_access = list(11,24,47) - }, -/obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, -/obj/machinery/door/firedoor/glass, -/turf/space, -/area/maintenance/substation/research) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "dzA" = ( /obj/machinery/power/terminal{ dir = 1 @@ -4374,15 +4831,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"dzO" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) -"dzY" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "dAc" = ( /obj/structure/sign/deck/second{ pixel_y = 32 @@ -4398,6 +4846,23 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"dAp" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 6 + }, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/heads/cmo) "dAV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4410,10 +4875,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) -"dAZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "dBx" = ( /obj/machinery/button/remote/blast_door{ id = "hangar_maint"; @@ -4441,31 +4902,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"dBD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"dBM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "dCk" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -4508,12 +4944,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"dDH" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) "dDV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 @@ -4541,15 +4971,15 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/server) -"dEW" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +"dFa" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/aft/starboard) "dGb" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -4576,6 +5006,22 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"dGr" = ( +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/port) "dGt" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -4588,6 +5034,31 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"dGE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"dGK" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"dHa" = ( +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 24 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "dHe" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -4595,38 +5066,25 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"dHw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/turf/simulated/floor/plating, +/area/space) "dHJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 8 }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) -"dIk" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/zpipe/down, -/obj/machinery/atmospherics/pipe/zpipe/down/aux, -/turf/simulated/open, -/area/engineering/engine_eva) "dIo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) -"dIv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "dIE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/railing{ @@ -4659,21 +5117,18 @@ /obj/machinery/biogenerator, /turf/simulated/floor/tiled, /area/hydroponics) -"dKj" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "dKA" = ( /obj/machinery/air_alarm{ pixel_y = 22 }, /turf/simulated/floor/reinforced, /area/space) +"dKJ" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) "dKO" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -4689,17 +5144,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"dKZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel, -/area/space) "dLa" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Flight Deck Subgrid"; @@ -4716,12 +5160,6 @@ }, /turf/simulated/floor/plating, /area/space) -"dLj" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(18,47) - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/Hangar_bay/deck2) "dLw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4756,24 +5194,40 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) -"dMq" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) +"dLS" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"dLT" = ( +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "dMZ" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 }, /turf/simulated/floor/carpet, /area/medical/patient_wing) -"dNh" = ( -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2) "dNs" = ( /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) +"dNL" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/sign/deck2{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"dNP" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "dOB" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/forward/port) @@ -4785,15 +5239,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/space) -"dOK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/research) "dOX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -4806,19 +5251,9 @@ }, /turf/simulated/floor/reinforced, /area/space) -"dPp" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "dPv" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/medical/patient_wing) "dPw" = ( @@ -4827,6 +5262,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) +"dPy" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "dPK" = ( /turf/simulated/floor/glass/reinforced, /area/hydroponics) @@ -4836,10 +5278,46 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"dPW" = ( -/obj/effect/floor_decal/industrial/warning/corner, +"dQg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"dQn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"dQo" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/engineering/engine_room) +"dQB" = ( +/obj/structure/sign/directions/cryo, +/turf/simulated/wall/r_wall/prepainted/command, +/area/ai/foyer) +"dQE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) +/area/space) "dRL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4858,6 +5336,15 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/atmospheric_substation/medical) +"dSo" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "dSr" = ( /turf/simulated/wall, /area/main_map/hallway/deck2/stairs) @@ -4945,7 +5432,7 @@ /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay/maintenance) "dUY" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4968,6 +5455,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"dVE" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "dWc" = ( /turf/simulated/mineral/icerock/lythios43c, /area/rift/surfacebase/underground/under1) @@ -4995,18 +5488,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) -"dWR" = ( -/turf/simulated/wall/prepainted/medical, -/area/medical/patient_b) -"dWX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"dWF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/turf/simulated/floor/plating, +/area/space) +"dWR" = ( +/turf/simulated/wall/prepainted/medical, +/area/medical/patient_b) "dXf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -5026,15 +5520,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"dXq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) "dXu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5047,7 +5532,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/table/standard, /obj/machinery/photocopier/faxmachine{ department = "Quartermaster-Office" @@ -5055,6 +5540,19 @@ /obj/machinery/camera/network/cargo, /turf/simulated/floor/wood, /area/quartermaster/qm) +"dYc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"dYk" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "dYW" = ( /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/processing) @@ -5076,6 +5574,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/server) +"dZD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "dZW" = ( /obj/structure/railing, /turf/simulated/open, @@ -5084,10 +5594,6 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/maintenance/cargo) -"eaA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "eaQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -5126,15 +5632,6 @@ /obj/structure/lattice, /turf/simulated/open, /area/quartermaster/warehouse) -"ebD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "ebT" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -5150,25 +5647,39 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/fitness) +"ecb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"ecl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "ecv" = ( /obj/structure/table/bench/wooden, /obj/machinery/light/no_nightshift, /turf/simulated/floor/wood, /area/crew_quarters/showers) -"ecD" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +"ecO" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/danger/corner, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"ecQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/port) "ecR" = ( /turf/simulated/wall/prepainted/science, /area/rnd/robotics) @@ -5225,19 +5736,19 @@ }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"efa" = ( -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 +"efw" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, -/turf/simulated/wall/r_wall, -/area/engineering/atmos) +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"efy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "efD" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ @@ -5254,16 +5765,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"efN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"efP" = ( -/obj/machinery/computer/rdconsole/robotics, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) "efZ" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -5277,7 +5778,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 10 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "egw" = ( @@ -5303,6 +5804,10 @@ /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"egB" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "ehn" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 @@ -5345,10 +5850,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"eim" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "eiu" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -5407,29 +5908,6 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) -"ejw" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/bed/chair/comfy/teal, -/turf/space/basic, -/area/space) -"ejP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "ejQ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green, /turf/simulated/floor/tiled/techfloor, @@ -5444,13 +5922,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"ekM" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) "ekQ" = ( /obj/structure/closet{ name = "mechanical equipment" @@ -5480,6 +5951,21 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) +"eln" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"elt" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "elA" = ( /obj/structure/table/standard, /obj/item/storage/box/glasses, @@ -5494,6 +5980,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/maintenance/tool_storage) +"emf" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "emj" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, @@ -5505,12 +6003,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) -"enP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "enT" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ dir = 4 @@ -5545,13 +6037,33 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) -"eqp" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/machinery/camera/network/engine{ +"eoW" = ( +/obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"epq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/hallway) +"epT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "eqt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/techfloor, @@ -5575,15 +6087,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/processing) -"eqX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "eri" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5603,6 +6106,24 @@ }, /turf/simulated/floor/plating, /area/space) +"ern" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2/stairs) +"erC" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "erI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -5624,12 +6145,39 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"esP" = ( -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) +"esL" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/port) +"etH" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "etU" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/main_map/maintenance/deck_two/aft/starboard) +"eus" = ( +/obj/machinery/account_database{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"evJ" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "evK" = ( /obj/structure/railing{ dir = 1 @@ -5670,25 +6218,18 @@ /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"exX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"exM" = ( +/obj/structure/closet{ + desc = "Dents and old flaky paint blanket this old storage unit."; + name = "old locker" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "eyf" = ( /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) -"eys" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) "eyC" = ( /obj/machinery/atmospherics/tvalve/digital{ dir = 4 @@ -5699,28 +6240,12 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) -"ezu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "ezG" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"ezJ" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled/techfloor, -/area/space) "ezV" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -5762,6 +6287,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"eBN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "eBS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5777,6 +6311,33 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) +"eBZ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck2) +"eCo" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"eCF" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/pipedispenser/disposal, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) "eCL" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/robotics/mechbay) @@ -5786,17 +6347,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"eDd" = ( -/obj/machinery/shipsensors, -/turf/simulated/floor/reinforced/airless, -/area/space) -"eDq" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 1 - }, -/obj/machinery/camera/network/engine, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "eDv" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Command Grid"; @@ -5812,21 +6362,9 @@ /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"eDU" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/shield_gen) "eDY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -5847,6 +6385,19 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"eEe" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "eEO" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -5866,15 +6417,6 @@ /obj/item/mmi/digital/posibrain, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"eFg" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "eFZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 10 @@ -5890,16 +6432,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) -"eGt" = ( +"eGg" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"eGv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "eHO" = ( /obj/machinery/door/airlock/security{ name = "Observation"; @@ -5908,13 +6460,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"eId" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"eIq" = ( +/obj/structure/ladder/updown, /turf/simulated/floor/plating, -/area/space) +/area/maintenance/engineering/upper) "eIt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5940,6 +6489,10 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"eIY" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "eJd" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ dir = 8 @@ -5966,6 +6519,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"eKi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "eKD" = ( /obj/machinery/mech_recharger, /obj/mecha/combat/fighter/pinnace/loaded{ @@ -5979,62 +6538,56 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) -"eLj" = ( -/obj/structure/cable/green{ +"eKE" = ( +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"eKS" = ( +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"eLG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 9 +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "eLI" = ( /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"eLJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +"eLL" = ( +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two) -"eLM" = ( -/obj/structure/sign/directions/cryo{ +"eLZ" = ( +/obj/structure/bed/chair/comfy/beige, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/wall/r_wall/prepainted/command, -/area/space) -"eLY" = ( -/obj/structure/cable/green{ +/turf/simulated/floor/tiled/monotile, +/area/security/observation) +"eMN" = ( +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"eLZ" = ( -/obj/structure/bed/chair/comfy/beige, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/security/observation) +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "eMR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green, /obj/machinery/meter, @@ -6043,13 +6596,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"eNo" = ( -/obj/structure/sink/kitchen{ - dir = 4; - pixel_x = -12 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) +"eMX" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"eNd" = ( +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "eNw" = ( /obj/structure/railing, /obj/structure/railing{ @@ -6057,37 +6611,20 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/starboard) -"eNz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) "eNA" = ( /obj/machinery/atmospherics/component/binary/pump, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"eNC" = ( -/obj/structure/sign/deck2{ - pixel_y = 32 +"eOH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ePh" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/atmos, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos/gas_storage) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "ePr" = ( /turf/simulated/open, /area/quartermaster/hallway) @@ -6104,6 +6641,17 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) +"ePO" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "ePY" = ( /turf/simulated/open, /area/main_map/Hangar_bay/deck2) @@ -6114,34 +6662,21 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) -"eQw" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/aux{ - dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "eRO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 9 }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"eSj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +"eRT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) -"eSE" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "eSZ" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -6150,11 +6685,29 @@ }, /turf/simulated/floor/plating, /area/medical/patient_a) +"eTi" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "eTm" = ( /obj/machinery/honey_extractor, /obj/structure/railing, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/structure/window/reinforced, @@ -6207,22 +6760,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"eWH" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/aux{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"eWN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"eWy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/plating, +/area/space) "eXp" = ( /obj/item/coin/silver, /obj/item/coin/silver, @@ -6280,15 +6823,6 @@ "eYO" = ( /turf/simulated/floor/plating, /area/rnd/robotics/mechbay) -"eZu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/hallway) "eZF" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6299,20 +6833,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/port) -"eZP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"eZW" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "eZY" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -6331,6 +6851,30 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/fitness) +"fax" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"fbe" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"fbv" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on/welded{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "fbP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6378,6 +6922,13 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"fco" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "fcp" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/tiled/freezer, @@ -6413,37 +6964,11 @@ }, /turf/simulated/floor/tiled, /area/space) -"fdb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"fds" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"fdR" = ( -/obj/machinery/door/airlock{ - name = "Auxiliary Janitorial Closet"; - req_access = list(26) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck2/stairs) +"fdX" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "fek" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -6461,6 +6986,10 @@ }, /turf/simulated/floor/plating, /area/engineering/hallway) +"ffC" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "ffE" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/light{ @@ -6472,6 +7001,15 @@ /obj/machinery/recharger, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"ffL" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "fgg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6503,58 +7041,88 @@ /obj/effect/floor_decal/corner/paleblue/full, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"fhh" = ( -/obj/structure/stairs/spawner/east, +"fhc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) -"fhN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 5 +/area/maintenance/cargo) +"fhm" = ( +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/cargo) -"fhP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/area/main_map/maintenance/deck_two/aft) +"fhw" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/metal{ + req_one_access = list(10); + name = "Engineering"; dir = 4 }, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) +"fhN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/blue{ + dir = 5 }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"fhR" = ( -/obj/machinery/atmospherics/valve{ - name = "EMERGENCY VENT TO SPACE" +/area/main_map/maintenance/atmospheric_substation/cargo) +"fhT" = ( +/obj/structure/railing{ + dir = 1 }, +/obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, -/area/engineering/atmos) +/area/medical/medbay2) "fin" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) -"fjG" = ( -/obj/structure/catwalk, -/obj/machinery/camera/network/outside, -/turf/simulated/floor/reinforced/airless, -/area/space) -"fjJ" = ( -/obj/structure/sign/directions/cryo, -/turf/simulated/wall/r_wall/prepainted/command, -/area/main_map/hallway/deck2) -"fjK" = ( -/obj/effect/floor_decal/techfloor/orange{ +"fjh" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"fjv" = ( +/obj/structure/bed/chair/sofa/black{ dir = 4 }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) +"fjV" = ( +/obj/structure/catwalk, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"fkD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-2" }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 +/obj/machinery/power/apc/east_mount, +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "fkE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -6564,12 +7132,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"fkK" = ( -/obj/machinery/atmospherics/component/unary/engine/biggest{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "fkN" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_wing) @@ -6607,15 +7169,10 @@ }, /turf/simulated/floor/carpet, /area/medical/patient_wing) -"flI" = ( -/obj/structure/lattice, -/turf/simulated/open, -/area/hydroponics/garden) "flL" = ( /obj/machinery/door/blast/shutters{ dir = 4; id = "hanger1a"; - layer = 3.3; name = "Hanger 1 A Shutters" }, /obj/machinery/door/firedoor/glass{ @@ -6623,15 +7180,6 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/a) -"flT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) "flV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6666,6 +7214,30 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"fmt" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/command_secretary, +/turf/simulated/floor/carpet/blue, +/area/bridge/meeting_room) +"fmu" = ( +/obj/machinery/door/airlock/atmos{ + name = "Security Atmospherics Backup"; + req_access = list(24) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) "fmB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -6680,21 +7252,6 @@ "fmX" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/forward) -"fnG" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "fnJ" = ( /obj/machinery/door/airlock/maintenance/sec, /obj/structure/cable/green{ @@ -6715,21 +7272,39 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"foC" = ( -/turf/simulated/open, -/area/medical/medbay2) -"foE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"fnN" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/window/northleft{ + dir = 8; + icon_state = "right"; + name = "Reception Window" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/window/brigdoor/eastright{ + name = "Head of Personnel's Desk"; + req_access = list(57) }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-4" }, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" + }, +/turf/simulated/floor/tiled, +/area/bridge/hop_office) +"fnS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) +/area/main_map/maintenance/deck_two) +"foC" = ( +/turf/simulated/open, +/area/medical/medbay2) "foH" = ( /obj/structure/railing, /turf/simulated/open, @@ -6749,6 +7324,12 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"fpZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "fqv" = ( /obj/structure/railing{ dir = 1 @@ -6777,22 +7358,19 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) -"frk" = ( -/obj/structure/marker_beacon/red, -/turf/simulated/floor/reinforced/airless, -/area/space) +"fre" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "frE" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck2) -"frN" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/closet/crate/trashcart, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "fsp" = ( /obj/machinery/button/ignition{ id = "portnacelle_igniter"; @@ -6809,7 +7387,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6879,12 +7457,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/security) -"fvA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "fvO" = ( /obj/structure/railing, /turf/simulated/open, @@ -6895,8 +7467,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -6924,18 +7495,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"fxF" = ( -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "fyf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7047,6 +7606,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"fDM" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "fDQ" = ( /obj/machinery/power/terminal, /obj/structure/cable{ @@ -7055,12 +7626,26 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, /area/space) +"fEg" = ( +/obj/machinery/door/airlock/maintenance/command, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "fEm" = ( /obj/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) +"fEE" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 4; + target_pressure = 15000 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "fEH" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -7118,15 +7703,13 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"fHl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "4-8" +"fHH" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) +/obj/landmark/spawnpoint/job/blueshield, +/turf/simulated/floor/carpet/blue, +/area/bridge/meeting_room) "fIB" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, @@ -7138,31 +7721,32 @@ }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"fIL" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-8" + }, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "fJL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"fJR" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 8 +"fJQ" = ( +/obj/landmark/spawnpoint/job/janitor, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"fKg" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 }, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "fKn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -7189,21 +7773,12 @@ "fKt" = ( /turf/simulated/wall/prepainted, /area/rift/station/fighter_bay) -"fLc" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +"fKM" = ( /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/space/basic, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/forward) "fLl" = ( /obj/machinery/door/airlock/maintenance/engi, /obj/structure/cable/green{ @@ -7213,6 +7788,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/hallway) +"fLD" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "fLW" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/security) @@ -7225,12 +7806,29 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) +"fMi" = ( +/obj/structure/sign/deck/second, +/turf/simulated/wall/r_wall, +/area/tether/surfacebase/security/lobby) "fMj" = ( /obj/effect/floor_decal/corner/green/border{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"fMC" = ( +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"fMU" = ( +/obj/landmark{ + name = "lightsout" + }, +/obj/structure/railing/grey, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics) "fNq" = ( /obj/machinery/camera/network/research{ dir = 1 @@ -7238,12 +7836,16 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"fNz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/floor_decal/industrial/danger, -/obj/structure/closet/emcloset, +"fNy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two) "fNA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -7284,6 +7886,20 @@ }, /turf/simulated/open, /area/security/brig) +"fOh" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"fOw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "fOI" = ( /obj/machinery/door/airlock/glass/security{ name = "Observation"; @@ -7316,27 +7932,12 @@ "fPn" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/port) -"fPr" = ( -/obj/machinery/atmospherics/component/binary/pump, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"fPt" = ( -/obj/machinery/button/remote/blast_door{ - id = "hangar_pad"; - name = "Hangar Bay Blast Door Control"; - pixel_x = -24; - pixel_y = -28; - req_one_access = list(19,29,38,43,47,63,67); - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) "fPv" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos) +"fPT" = ( +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "fQz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7358,6 +7959,19 @@ /obj/fiftyspawner/glass, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"fQU" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "fRg" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/freezer) @@ -7375,19 +7989,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"fSl" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/space/basic, -/area/space) +"fRK" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/medical/medbay2) +"fRS" = ( +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) "fST" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7400,6 +8007,19 @@ "fTa" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/bar) +"fTd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "fTt" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/borderfloor{ @@ -7410,17 +8030,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"fTN" = ( +"fTu" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) "fTQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -7452,6 +8073,14 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"fUz" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/crew_quarters/recreation_area_hallway) "fUA" = ( /obj/structure/railing, /obj/structure/railing{ @@ -7468,6 +8097,23 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"fVk" = ( +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"fVs" = ( +/obj/structure/closet{ + desc = "Dents and old flaky paint blanket this old storage unit."; + name = "old locker" + }, +/obj/item/clothing/under/rank/medical/scrubs, +/obj/item/clothing/under/rank/medical/scrubs, +/obj/item/clothing/under/rank/medical/scrubs, +/obj/item/clothing/under/rank/medical/scrubs, +/obj/item/clothing/under/rank/medical/scrubs, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "fVD" = ( /obj/machinery/air_alarm{ dir = 8; @@ -7481,6 +8127,29 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"fWc" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -25 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"fWj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "fWB" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/reinforced/phoron, @@ -7500,6 +8169,32 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"fYa" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"fYL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) "fYS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -7528,9 +8223,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) -"fZM" = ( -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "fZN" = ( /obj/machinery/door/airlock/engineering{ name = "Civilian Substation" @@ -7547,6 +8239,9 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/security) +"gaG" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "gaL" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -7573,10 +8268,13 @@ }, /turf/simulated/floor/plating, /area/bridge/meeting_room) -"gce" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +"gcu" = ( +/obj/structure/sign/deck2{ + pixel_y = 32 + }, +/obj/structure/railing, +/turf/simulated/floor/reinforced/overhang, +/area/space) "gcE" = ( /obj/structure/railing{ dir = 4 @@ -7587,20 +8285,13 @@ /area/rift/station/fighter_bay/hangar) "gcG" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/high/east_bump, +/obj/machinery/power/apc/high/east_mount, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"gdv" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, +"gda" = ( +/obj/structure/lattice, +/obj/structure/railing, +/turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) "gdJ" = ( /obj/structure/cable/green{ @@ -7629,19 +8320,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"geV" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"gfI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) "gfJ" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) @@ -7663,20 +8341,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"ggs" = ( -/obj/machinery/door/airlock/lift, -/turf/simulated/floor/holofloor/tiled/dark, -/area/space) -"ggB" = ( -/obj/structure/railing{ +"ghe" = ( +/obj/structure/railing/grey{ dir = 8 }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "rd_office" - }, -/turf/simulated/open, +/turf/simulated/floor/plating, /area/rnd/research/researchdivision) +"gho" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "ghs" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -7699,24 +8374,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"ghD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "ghL" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/reinforced, /area/space) +"giU" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "giW" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 1 @@ -7763,6 +8432,10 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck2) +"gla" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "gli" = ( /obj/structure/catwalk, /turf/simulated/open, @@ -7780,6 +8453,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"glF" = ( +/obj/machinery/camera/network/research{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "gmv" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_d) @@ -7792,6 +8474,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"gmS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/hallway) "gmW" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -7803,24 +8495,42 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"gnc" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) "gnl" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4 }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"gnx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "gnF" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/starboard) -"gnV" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"gnK" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "gos" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7846,8 +8556,7 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos/gas_storage) "goM" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -7874,16 +8583,6 @@ "gpN" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"gqh" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) "gqJ" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -7921,6 +8620,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) +"gsc" = ( +/obj/landmark{ + name = "morphspawn" + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"gsq" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "gsw" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -7964,6 +8678,17 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) +"gtv" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "gtP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7977,50 +8702,33 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"gun" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10 +"guE" = ( +/obj/structure/railing/grey{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "gvd" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"gvi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +"gvn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) -"gvk" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/window/northleft{ - dir = 8; - icon_state = "right"; - name = "Reception Window" - }, -/obj/machinery/door/window/brigdoor/eastright{ - name = "Head of Personnel's Desk"; - req_access = list(57) + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "gvq" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -8032,9 +8740,6 @@ "gvU" = ( /turf/simulated/wall, /area/main_map/hallway/deck2) -"gws" = ( -/turf/simulated/open, -/area/engineering/engine_eva) "gwA" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -8050,11 +8755,24 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/a) -"gwH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +"gwK" = ( +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"gwN" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, /area/space) "gxy" = ( /obj/structure/railing{ @@ -8065,23 +8783,24 @@ }, /turf/simulated/open, /area/space) -"gxA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "gxE" = ( /obj/machinery/atmospherics/component/binary/pump, /obj/effect/floor_decal/corner/lightorange/bordercee, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"gyk" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +"gye" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "gys" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -8135,32 +8854,31 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"gAE" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - pressure_resistance = 750; - target_pressure = 750; +"gAu" = ( +/obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"gAR" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 +/area/maintenance/cargo) +"gBd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"gBt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/space/basic, -/area/space) +/obj/machinery/door/airlock/maintenance/medical{ + name = "Medical Maintenance Access"; + req_access = list(5) + }, +/turf/simulated/floor/tiled/techfloor, +/area/medical/medbay2) "gBO" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -8172,18 +8890,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"gCq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "gCv" = ( /obj/machinery/atmospherics/component/unary/engine/biggest{ dir = 4 @@ -8206,6 +8912,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) +"gDA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) "gDB" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/border_only, @@ -8214,10 +8929,6 @@ "gDO" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/hallway/deck2) -"gDQ" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) "gEs" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8233,16 +8944,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/starboard) -"gFh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "gGr" = ( /obj/landmark{ name = "morphspawn" @@ -8253,64 +8954,30 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) -"gGP" = ( -/obj/structure/closet{ - name = "robotics parts" - }, -/obj/item/cell/high{ - maxcharge = 15000; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/cell/high{ - maxcharge = 15000; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/cell/high{ - maxcharge = 15000; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/cell/high{ - maxcharge = 15000; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" +"gIq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"gIC" = ( +/obj/structure/sign/deck2{ + pixel_y = -32 }, -/obj/machinery/camera/network/research, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "gII" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/mechanical{ @@ -8328,6 +8995,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"gKU" = ( +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "gLc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8337,10 +9007,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"gLm" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "gLs" = ( /obj/machinery/camera/network/engineering, /obj/effect/floor_decal/techfloor/orange{ @@ -8354,18 +9020,16 @@ /obj/machinery/vending/tool, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"gLP" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/medical/medbay2) "gLT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"gMD" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "gMH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8375,6 +9039,21 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) +"gMX" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) +"gNb" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "gNi" = ( /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/danger{ @@ -8382,6 +9061,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"gNl" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2/stairs) "gNn" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8395,6 +9078,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) +"gNs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "gND" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -8405,15 +9103,6 @@ /obj/machinery/mecha_part_fabricator, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"gOz" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/lattice, -/obj/machinery/door/firedoor/glass, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/forward/port) "gOA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8442,6 +9131,15 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) +"gOZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "gPE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8454,6 +9152,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"gPL" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/space) "gPQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8477,6 +9181,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/atmos) +"gQD" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "gQE" = ( /obj/structure/railing, /obj/structure/railing{ @@ -8484,27 +9200,26 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/port) +"gQG" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/pipedispenser, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) "gQY" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/main_map/hallway/deck2/starboard_fore) -"gRG" = ( -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) -"gRV" = ( -/obj/structure/cable{ - icon_state = "4-8" +"gRp" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "gRY" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/tiled/techfloor/grid, @@ -8522,10 +9237,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"gTn" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/space) "gTr" = ( /obj/effect/floor_decal/techfloor/orange/corner{ dir = 8 @@ -8545,60 +9256,36 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"gUL" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 +"gTG" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "gUQ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/starboard) -"gUS" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) -"gVo" = ( -/obj/structure/sign/deck2{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"gVq" = ( -/obj{ - name = "---Merge conflict marker---" - }, +"gWj" = ( /obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/obj/machinery/iv_drip, -/turf/space/basic, -/area/space) -"gVs" = ( -/obj/structure/cable{ - icon_state = "1-4" + dir = 4; + pixel_x = -24 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"gWB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"gWH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"gWx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/aux{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/tiled/techfloor, +/area/space) "gWM" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -8606,36 +9293,12 @@ /obj/structure/bed/chair/bay/comfy, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"gWV" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/hallway) -"gWX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) "gWY" = ( /obj/structure/toilet{ dir = 1 }, /turf/simulated/floor/tiled/white, /area/medical/patient_d) -"gXg" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/hallway) "gXV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -8648,50 +9311,27 @@ "gYx" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/aft) +"gYG" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "gYZ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/server) -"gZp" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"gZu" = ( -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/space) -"gZV" = ( -/obj/structure/sign/deck2{ - pixel_y = 32 +"gZB" = ( +/obj/machinery/light/small{ + dir = 8 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) "hak" = ( /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"hal" = ( -/obj/structure/table/steel, -/obj/item/storage/box/lights/mixed, -/obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"ham" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) "hav" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -8702,12 +9342,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) -"haR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 9 +"hbm" = ( +/obj/structure/cable/cyan{ + icon_state = "2-4" }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) +/turf/simulated/floor/plating, +/area/space) "hbs" = ( /obj/structure/railing, /turf/simulated/open, @@ -8736,6 +9376,10 @@ "hcm" = ( /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"hcp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/turf/simulated/floor/tiled/techfloor, +/area/space) "hcs" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/service) @@ -8745,19 +9389,46 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"hdn" = ( -/obj/machinery/door/airlock/glass/research{ - name = "Robotics Lab"; - req_access = list(29,47) +"hdb" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) +"hdg" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"het" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"hew" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/robotics) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) +"hex" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "heV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8795,16 +9466,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) -"hfT" = ( -/obj/machinery/power/generator{ - anchored = 1; - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "hfU" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/aft/starboard) @@ -8819,6 +9480,11 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) +"hhm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "hhx" = ( /obj/structure/railing{ dir = 1 @@ -8843,18 +9509,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/hallway) -"hie" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"hhL" = ( +/obj/structure/sign/deck2{ + pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"hhR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/access_button/airlock_interior{ + master_tag = "engineering_main"; + pixel_x = 24 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/plating, +/area/space) +"hit" = ( +/obj/machinery/atmospherics/component/binary/pump, +/turf/simulated/floor/tiled/techfloor, +/area/space) "hiO" = ( /obj/structure/sign/directions/cryo, /turf/simulated/wall, @@ -8895,12 +9568,30 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/shield_gen) -"hkE" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2/starboard_fore) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/shield_gen) +"hkE" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2/starboard_fore) +"hkF" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"hkN" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379; + id_tag = "solar_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/engineering/engine_eva) "hlp" = ( /obj/structure/railing, /obj/structure/railing{ @@ -8911,22 +9602,6 @@ "hlv" = ( /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos/gas_storage) -"hlI" = ( -/obj/structure/ladder, -/turf/simulated/floor/plating, -/area/space) -"hlM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "hmh" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/open/shower/medical, @@ -8943,6 +9618,10 @@ }, /turf/simulated/floor/reinforced, /area/space) +"hmr" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "hmA" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -8961,6 +9640,15 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"hmW" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "hnb" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor{ @@ -8981,6 +9669,12 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/patient_a) +"hnr" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "hnu" = ( /obj/structure/closet/walllocker{ pixel_y = -28 @@ -8999,19 +9693,29 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"hpp" = ( -/obj/structure/grille, -/turf/simulated/floor/reinforced/airless, -/area/space) +"hpi" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/hydroponics/garden) "hpx" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/space) -"hrw" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 +"hqb" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"hrq" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/tiled/techfloor, +/area/space) "hrE" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techmaint, @@ -9033,17 +9737,17 @@ /obj/structure/railing, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) +"htd" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "hts" = ( /turf/space, /area/space) -"htL" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +"htC" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor/plating, +/area/space) "htM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -9081,24 +9785,20 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"hvz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"hvD" = ( -/obj/machinery/door/firedoor{ +"hvv" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, -/obj/machinery/door/airlock/hatch, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/railing/grey{ + dir = 8 }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics) +"hvV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/maintenance/cargo) "hwb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9114,15 +9814,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/rdoffice) -"hwE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "hwK" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -9145,43 +9836,20 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck2) -"hxh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"hxn" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/space) "hxr" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"hxA" = ( +"hyf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "hyj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -9204,18 +9872,35 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"hzg" = ( -/obj/structure/cable{ +"hyv" = ( +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"hyB" = ( +/obj/structure/bed/chair/sofa/black/corner{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) +"hyG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/machinery/camera/network/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) +"hyW" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "hzI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9225,27 +9910,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"hzP" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/handrail{ - dir = 8 - }, -/turf/space/basic, -/area/space) "hAa" = ( /obj/structure/fireplace, /turf/simulated/floor/reinforced, /area/medical/patient_wing) -"hAB" = ( -/obj/structure/closet, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) +"hAc" = ( +/turf/simulated/open, +/area/engineering/engine_gas) +"hAy" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "hAM" = ( /obj/machinery/computer/med_data{ dir = 1 @@ -9277,10 +9958,15 @@ "hBz" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/shield_gen) -"hBW" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +"hBY" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "hBZ" = ( /obj/structure/closet/chefcloset, /obj/item/glass_jar, @@ -9302,44 +9988,69 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"hCr" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "hCF" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/stairs) -"hCY" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +"hCI" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) +"hCU" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "hCZ" = ( /obj/structure/noticeboard{ pixel_y = 32 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"hDn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "hDo" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/shield_capacitor, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) +"hDs" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/super/critical/north_mount, +/turf/simulated/floor/tiled/techfloor, +/area/space) "hDF" = ( /obj/structure/catwalk, /obj/structure/ladder/up, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) -"hEd" = ( +"hEk" = ( /obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "hEr" = ( /obj/structure/cable{ icon_state = "1-8" @@ -9347,25 +10058,25 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/plating, /area/maintenance/substation/medical) -"hEu" = ( -/obj/machinery/camera/network/outside{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"hFk" = ( -/obj{ - name = "---Merge conflict marker---" - }, +"hFb" = ( /obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 + dir = 1; + pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/catwalk, -/turf/space/basic, -/area/space) +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) +"hFr" = ( +/obj/machinery/button/remote/blast_door{ + id = "hangar_pad"; + name = "Hangar Bay Blast Door Control"; + pixel_x = 24; + pixel_y = -28; + req_one_access = list(19,29,38,43,47,63,67); + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/maintenance/deck_two/aft/starboard) "hFE" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9373,18 +10084,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"hGh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "hGp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9403,25 +10102,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"hHg" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" - }, -/turf/simulated/floor/plating, -/area/space) "hHh" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Engineering Subgrid"; @@ -9435,63 +10115,33 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) -"hHl" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "hHp" = ( /obj/machinery/light/no_nightshift{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"hIa" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"hHu" = ( +/obj/machinery/power/generator{ + anchored = 1; dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/port) +/turf/simulated/floor/tiled/techfloor, +/area/space) +"hHB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "hIi" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/cargo) -"hIq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) -"hIZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "hJT" = ( /obj/structure/sink{ dir = 4; @@ -9499,6 +10149,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) +"hJW" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "hKb" = ( /obj/machinery/door/airlock/maintenance/command, /obj/machinery/door/blast/regular{ @@ -9525,33 +10181,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) -"hKO" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "hKW" = ( /turf/simulated/floor/plating, /area/storage/tech) -"hLM" = ( -/obj/machinery/camera/network/research{ +"hLW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) -"hMg" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "hNo" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9599,21 +10241,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/hallway/deck2) -"hNQ" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "32-8" - }, -/obj/structure/lattice, -/obj/machinery/door/firedoor/glass, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/forward/port) "hOw" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -9628,6 +10255,11 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/hallway/deck2) +"hPe" = ( +/obj/structure/cable/green, +/obj/machinery/power/apc/high/south_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "hPh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9635,14 +10267,47 @@ /obj/structure/handrail, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"hPD" = ( +"hPN" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"hQe" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/engineering/atmos) +/area/space) "hQg" = ( /obj/structure/railing, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/main_map/hallway/deck2) +"hQA" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"hRe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "hRp" = ( /obj/structure/railing, /obj/structure/railing{ @@ -9676,28 +10341,14 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/hydroponics) -"hTA" = ( -/obj/effect/debris/cleanable/blood/oil, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "hTE" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/starboard) -"hUP" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/handrail{ - dir = 1 - }, -/turf/space/basic, -/area/space) +"hUa" = ( +/obj/structure/closet/l3closet/janitor, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "hVr" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -9722,12 +10373,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) -"hWi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +"hVQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/plating, +/area/space) "hWs" = ( /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/monotile, @@ -9738,21 +10390,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"hWL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"hYb" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/reinforced/airless, -/area/space) +"hWR" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/ai/foyer) "hYi" = ( /obj/machinery/computer/med_data{ dir = 1 @@ -9794,20 +10435,13 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/quartermaster/hallway) "hZB" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) -"hZL" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "hZM" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 8 @@ -9821,17 +10455,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"iai" = ( -/obj/structure/cable{ - icon_state = "1-2" +"hZQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/visible/aux{ + dir = 6 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/plating, +/area/space) "iaq" = ( /obj/structure/closet/secure_closet/freezer/meat{ anchored = 1 @@ -9849,6 +10481,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"iaM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(29,47); + name = "Robotics Lab" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/robotics) "iaY" = ( /obj/structure/cable{ icon_state = "0-8" @@ -9901,13 +10546,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/a) -"ids" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "idO" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -9920,6 +10558,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"idR" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"idZ" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "ieY" = ( /obj/landmark/spawnpoint/job/cargo_technician, /turf/simulated/floor/tiled, @@ -9948,8 +10599,23 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/turf/simulated/floor/plating, -/area/engineering/engine_eva) +/turf/simulated/floor/plating, +/area/engineering/engine_eva) +"igf" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced, +/area/space) +"igs" = ( +/obj/structure/closet/crate/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "igE" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -9978,6 +10644,32 @@ }, /turf/simulated/floor/tiled/techfloor, /area/server) +"iho" = ( +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"ihp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"ihz" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_smes) "ihO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/techmaint, @@ -9993,16 +10685,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"ihZ" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 - }, -/turf/space/basic, -/area/space) "iid" = ( /obj/machinery/door/airlock{ name = "Toilet" @@ -10016,12 +10698,32 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"iif" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "iit" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"iiw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "iiE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -10059,14 +10761,21 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"ijB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/landmark{ + name = "lightsout" + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "ijK" = ( /obj/structure/catwalk, /turf/simulated/open, /area/quartermaster/hallway) -"ijL" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "ijM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10119,12 +10828,17 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/substation/service) -"ikx" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +"ikB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) +/area/main_map/maintenance/deck_two/forward/port) "ikN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10143,26 +10857,6 @@ /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"ilo" = ( -/obj/structure/cable/heavyduty, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ilv" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, -/obj/structure/lattice, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/open, -/area/engineering/engine_eva) "ilF" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/plating, @@ -10176,10 +10870,23 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) +"imJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "inF" = ( /obj/machinery/seed_extractor, /turf/simulated/floor/tiled, /area/hydroponics) +"inW" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "iow" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -10191,12 +10898,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) -"iqj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "iqp" = ( /obj/machinery/power/terminal{ dir = 8 @@ -10226,12 +10927,19 @@ }, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) -"iqJ" = ( +"iqQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "iqZ" = ( /obj/structure/cable/green{ icon_state = "32-8" @@ -10242,6 +10950,9 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/starboard) +"ish" = ( +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "isl" = ( /obj/structure/railing, /obj/structure/railing{ @@ -10249,15 +10960,26 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/xenoflora_storage) -"isE" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"isz" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 8 +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/hallway) +"isO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/aft/starboard) "isT" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -10293,12 +11015,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"iuv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/security) "iuP" = ( /obj/machinery/atmospherics/valve/digital, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -10318,6 +11034,49 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"ivQ" = ( +/obj/structure/catwalk, +/obj/structure/frame/computer{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"iwg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"iww" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"iwx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/aux, +/obj/machinery/pipedispenser, +/turf/simulated/floor/plating, +/area/space) +"iwO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "iwS" = ( /obj/machinery/door/airlock/glass/mining{ name = "Mining Prep Room" @@ -10337,6 +11096,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"ixk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "ixz" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) @@ -10347,7 +11112,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -10372,22 +11137,44 @@ "iyn" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/lab) -"izw" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +"iyA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light/no_nightshift{ - dir = 1 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"iAz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/area/rnd/research/researchdivision) +"izr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, /obj/effect/floor_decal/industrial/danger{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/space) +"izI" = ( +/obj/machinery/keycard_auth{ + pixel_y = -36 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -8; + pixel_y = -26 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "iAD" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ @@ -10401,29 +11188,46 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"iBN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "iCs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 8 }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"iCx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "iCE" = ( /mob/living/simple_mob/animal/sif/fluffy, /turf/simulated/floor/wood, /area/quartermaster/qm) -"iDh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" +"iCV" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/engineering/engine_room) +"iDb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) "iDj" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/maintenance/deck_two/port) @@ -10442,6 +11246,18 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/observation) +"iDw" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "iDV" = ( /obj/machinery/door/airlock/maintenance/command{ name = "Command Atmospheric Substation" @@ -10454,13 +11270,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) -"iFi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/structure/sign/deck2{ - pixel_x = 32 +"iEj" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/engineering/deck2/power_line) +"iFb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"iFd" = ( +/obj/machinery/door/airlock/hatch, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "iFm" = ( /obj/machinery/air_alarm{ dir = 1; @@ -10471,6 +11300,13 @@ "iFr" = ( /turf/simulated/wall/prepainted/medical, /area/medical/patient_d) +"iFH" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Atmospherics"; + req_access = list(24) + }, +/turf/simulated/floor/plating, +/area/engineering/hallway) "iGM" = ( /obj/machinery/button/remote/blast_door{ id = "fighterbaytransportexit"; @@ -10487,41 +11323,23 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"iGY" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine{ - department = "Head of Personnel's Office" - }, -/turf/simulated/floor/wood, -/area/space) -"iHb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"iHp" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1 +"iHt" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/hallway/deck2/port_fore) +"iHR" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, -/obj/effect/floor_decal/industrial/danger{ +/obj/structure/bed/chair/office/light{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "iHT" = ( /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"iIk" = ( -/turf/simulated/wall, -/area/rnd/robotics/mechbay) -"iIC" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "iIR" = ( /obj/structure/sign/warning/radioactive, /turf/simulated/wall/r_wall, @@ -10530,6 +11348,18 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"iJX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "iKb" = ( /obj/structure/table/rack/shelf, /obj/effect/floor_decal/industrial/outline/grey, @@ -10545,22 +11375,19 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rift/station/fighter_bay) -"iKv" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 1 +"iKz" = ( +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/structure/window/phoronreinforced, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "iKN" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -10571,6 +11398,10 @@ /obj/machinery/mech_recharger, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) +"iLc" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_two/forward/starboard) "iLm" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10590,19 +11421,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"iLO" = ( -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced, -/turf/simulated/wall/r_wall, -/area/engineering/atmos) "iMk" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -10627,32 +11445,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) -"iOy" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) "iOD" = ( /obj/machinery/vending/cola, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck2) -"iOK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) "iOZ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -10662,6 +11458,14 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"iPj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "iPo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light_switch{ @@ -10696,13 +11500,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"iQg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "iQr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 5 @@ -10712,14 +11509,19 @@ "iQH" = ( /turf/simulated/floor/airless/ceiling, /area/engineering/engine_eva) -"iQX" = ( -/obj/machinery/door/airlock/glass/engineering, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) +"iQM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "iRV" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/computer/ship/navigation/telescreen{ @@ -10730,6 +11532,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"iSi" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "iSr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -10742,18 +11550,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"iSs" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "iSv" = ( /obj/machinery/door/airlock{ name = "Auxiliary Janitorial Closet"; @@ -10773,16 +11569,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"iSG" = ( -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/monotile, -/area/space) -"iSI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "iTf" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -10799,6 +11585,28 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) +"iTu" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"iTv" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2/stairs) "iTH" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck2/port_fore) @@ -10815,41 +11623,32 @@ /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) "iUn" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "iUx" = ( /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) +"iUO" = ( +/obj/machinery/camera/network/command{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ai/foyer) "iVk" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"iVx" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/computer/roguezones, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "iVy" = ( /turf/simulated/wall/r_wall, /area/main_map/Hangar_bay/deck2/b) -"iVU" = ( -/obj/structure/cable/green{ - icon_state = "32-1" - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/lattice, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) +"iVI" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/blue, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/service) "iXE" = ( /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 2346; @@ -10893,6 +11692,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"iYj" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "iYp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -10911,6 +11716,12 @@ }, /turf/simulated/floor/wood, /area/main_map/hallway/deck2) +"iZA" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "iZH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10932,15 +11743,27 @@ }, /turf/simulated/open, /area/quartermaster/warehouse) +"iZR" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/power/thermoregulator{ + anchored = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/storage) "iZT" = ( /obj/machinery/cryopod/robot, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) -"jaD" = ( -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +"jaI" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/engineering/deck2/power_line) +"jaY" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/blue{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) "jbn" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -10962,12 +11785,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) -"jbW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/space) +"jbt" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "jce" = ( /obj/structure/railing{ dir = 4 @@ -10980,16 +11801,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/port) -"jcG" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "jcJ" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/main_map/maintenance/atmospheric_substation/research) @@ -11048,14 +11859,33 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"jfs" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, +"jeF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/obj/structure/cable/green{ + icon_state = "2-5" + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) +"jeG" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/rnd/research/researchdivision) +"jfv" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "jfM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11068,13 +11898,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_d) -"jfV" = ( -/obj/machinery/door/airlock/maintenance/engi{ - name = "Elevator Shaft Access"; - req_one_access = null - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) +"jfN" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "jgk" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11124,6 +11952,12 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) +"jhY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "jis" = ( /obj/structure/cable/cyan{ icon_state = "0-8" @@ -11137,6 +11971,15 @@ }, /turf/simulated/floor/airless/ceiling, /area/engineering/engine_smes) +"jiV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "jja" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored{ dir = 8 @@ -11150,10 +11993,6 @@ /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"jjl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/blue, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/service) "jjn" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 @@ -11174,12 +12013,56 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/atmos/processing) +"jki" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/hallway) "jkA" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/observation) +"jkG" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"jkO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "jld" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/maintenance/deck_two/aft) +"jlj" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "jlk" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -11190,17 +12073,24 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) +"jlQ" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/plating, +/area/medical/medbay2) +"jmh" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/landmark/spawnpoint/job/janitor, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/cargo) "jmn" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) -"jmt" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) -"jmu" = ( -/obj/machinery/disposal, -/turf/simulated/floor/wood, -/area/space) "jmB" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, @@ -11283,9 +12173,6 @@ "jpm" = ( /turf/simulated/open, /area/crew_quarters/kitchen) -"jpB" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/space) "jqL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -11308,6 +12195,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) +"jro" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "jru" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -11320,45 +12214,26 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) -"jrG" = ( +"jsw" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/aft/starboard) -"jsj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"jsE" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 +"jsB" = ( +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 }, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/wood, +/area/bridge/meeting_room) +"jsZ" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_two/forward) "jtl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -11369,11 +12244,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"jty" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "jtK" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/space) +"jub" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"jue" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "juH" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -11399,6 +12290,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) +"jwx" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "jwS" = ( /obj/structure/sign/deck/second{ pixel_y = -32 @@ -11416,6 +12317,12 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"jxe" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "jxf" = ( /obj/machinery/door/blast/regular{ dir = 2; @@ -11425,21 +12332,31 @@ /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) -"jyc" = ( -/obj/effect/floor_decal/corner/paleblue/border{ +"jxT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/light/spot/no_nightshift{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) +/turf/simulated/floor/tiled/techfloor, +/area/space) "jyk" = ( /obj/machinery/shieldgen, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) +"jyB" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "jyZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -11452,21 +12369,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"jzn" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "jzo" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Cargo Substation Bypass" }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) -"jzL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2/stairs) "jzV" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -11492,15 +12407,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"jAO" = ( +/obj/landmark/spawnpoint/job/senior_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) "jAS" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) -"jBe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) "jBY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11516,6 +12430,22 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/hallway) +"jCm" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "jCx" = ( /obj/structure/railing{ dir = 4 @@ -11528,12 +12458,6 @@ }, /turf/simulated/open, /area/main_map/hallway/deck2) -"jCF" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/blue{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "jCI" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ @@ -11542,12 +12466,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/bridge/bunker) -"jDF" = ( -/obj/machinery/camera/network/outside{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "jDN" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable{ @@ -11559,6 +12477,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"jDQ" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "jDV" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -11573,6 +12498,15 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"jDW" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "jEe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -11613,16 +12547,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"jGc" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 +"jFG" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"jFP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "jGq" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(29,47) @@ -11647,6 +12591,10 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) +"jHP" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/robotics) "jHU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11658,6 +12606,12 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"jIa" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "jIs" = ( /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, @@ -11718,30 +12672,16 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"jJQ" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, +"jJO" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/skills, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"jKn" = ( +/obj/machinery/atmospherics/component/binary/pump, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) -"jKj" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/obj/structure/flora/pottedplant/flower, -/obj/structure/closet/hydrant{ - pixel_x = 32 - }, -/turf/space/basic, /area/space) -"jKM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "jKN" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/bed/chair/comfy/brown{ @@ -11764,7 +12704,7 @@ /area/engineering/hallway) "jLH" = ( /obj/structure/cable, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) "jLZ" = ( @@ -11773,6 +12713,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"jMc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on/welded{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "jMj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11801,12 +12747,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"jNh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "jNj" = ( /obj/machinery/suit_cycler/engineering, /turf/simulated/floor/tiled/techfloor, @@ -11854,20 +12794,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"jOK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) -"jPu" = ( +"jPh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/air_alarm{ dir = 8; pixel_x = 25 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/forward/starboard) "jPv" = ( /obj/machinery/atmospherics/tvalve/digital, @@ -11936,6 +12873,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"jQG" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "jQI" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -11950,6 +12891,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"jQP" = ( +/obj/machinery/computer/card, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "jQS" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 1; @@ -11961,21 +12906,6 @@ "jRq" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora_storage) -"jRZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"jSg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "jSp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12003,11 +12933,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"jTc" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) "jTg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12063,6 +12988,17 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) +"jUH" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "jUK" = ( /obj/structure/table/glass, /obj/machinery/computer/skills{ @@ -12090,18 +13026,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"jWH" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"jWN" = ( +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "jXj" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/structure/cable/heavyduty{ @@ -12109,23 +13045,6 @@ }, /turf/simulated/floor/reinforced, /area/space) -"jXq" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) "jXy" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -12178,6 +13097,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"jXZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "jYD" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -12195,10 +13120,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"jZp" = ( -/obj/structure/wall_frame, +"jZU" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/maintenance/cargo) +/area/main_map/maintenance/deck_two/aft) "kao" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -12240,16 +13168,22 @@ /obj/structure/filingcabinet/tall, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"kbi" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"kbz" = ( +"kbD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 5 }, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"kbE" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/mecha/combat/fighter/baron/sec/loaded{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) "kbG" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -12258,25 +13192,17 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"kbZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/structure/cable{ +"kbP" = ( +/obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) -"kce" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/area/main_map/maintenance/deck_two/forward) "kcD" = ( /obj/structure/railing, /obj/structure/railing{ @@ -12285,15 +13211,67 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) -"kcG" = ( -/obj/structure/cable/green{ - icon_state = "2-8" +"kcK" = ( +/obj/structure/closet{ + name = "robotics parts" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 1 +/obj/item/cell/high{ + maxcharge = 15000; + pixel_x = 5; + pixel_y = -5 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) +/obj/item/cell/high{ + maxcharge = 15000; + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/cell/high{ + maxcharge = 15000; + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/cell/high{ + maxcharge = 15000; + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/machinery/camera/network/research, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics) "kcY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -12304,6 +13282,13 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"kdb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "kde" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12323,12 +13308,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"kdF" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "ked" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 9 @@ -12339,18 +13318,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"kev" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "kfE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 9 @@ -12363,6 +13330,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"kfR" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "kgf" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -12391,25 +13364,12 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) -"kgy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +"kgM" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"khG" = ( -/obj/structure/sign/department/ass{ - pixel_x = 29 - }, -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) +/area/main_map/maintenance/deck_two) "kiL" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12426,15 +13386,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"kiZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "kjn" = ( /obj/structure/railing{ dir = 8 @@ -12453,6 +13404,16 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"kjL" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"kjN" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "kjS" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/borderfloor{ @@ -12469,6 +13430,26 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"kkh" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/high/north_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2/a) +"kkK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"kkZ" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "kld" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -12492,12 +13473,29 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"kmO" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/machinery/door/firedoor/glass, +"klL" = ( +/obj/structure/sign/department/ass{ + pixel_x = 29 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"kmq" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, /turf/simulated/floor/plating, -/area/engineering/atmos) +/area/space) +"kmF" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "kna" = ( /turf/simulated/open, /area/rnd/research/researchdivision) @@ -12510,6 +13508,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"knr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/space) "knD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -12521,6 +13526,20 @@ /obj/item/retail_scanner/command, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"koc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/landmark{ + name = "lightsout" + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "koA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12564,9 +13583,6 @@ "kqv" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/fitness) -"kqG" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/space) "kqW" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -12574,10 +13590,17 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) +"kqX" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "kra" = ( /obj/structure/table/bench/wooden, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/showers) "krf" = ( @@ -12588,7 +13611,7 @@ dir = 5 }, /obj/structure/cable, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) "krg" = ( @@ -12600,6 +13623,10 @@ }, /turf/simulated/open, /area/crew_quarters/recreation_area_hallway) +"kru" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/hallway) "krw" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12613,6 +13640,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/hydroponics) +"krR" = ( +/obj/structure/ladder/updown, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"kse" = ( +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_smes) "ksv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -12625,18 +13660,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"ksw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "ksy" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -12652,6 +13675,18 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"ksY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) "kti" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12670,12 +13705,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"kts" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 1 +"kto" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "ktS" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -12691,12 +13733,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"kud" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "kug" = ( /obj/structure/railing{ dir = 1 @@ -12728,16 +13764,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) -"kuQ" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck2) +"kuH" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/techfloor, +/area/space) "kvJ" = ( /obj/machinery/atmospherics/tvalve/digital/bypass, /turf/simulated/floor/plating, @@ -12785,21 +13815,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"kwJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 +"kwG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/plating, +/area/engineering/engine_room) "kwQ" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -12812,6 +13833,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"kwZ" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Elevator Shaft Access"; + req_one_access = null + }, +/turf/simulated/floor/plating, +/area/medical/medbay2) "kxi" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /turf/simulated/floor/tiled/techfloor/grid, @@ -12857,15 +13885,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"kyt" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "kyD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12902,6 +13921,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"kzM" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "kAl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -12910,6 +13936,39 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"kAn" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) +"kAD" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/head_of_personnel, +/turf/simulated/floor/carpet/blue, +/area/bridge/meeting_room) +"kBr" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "kBt" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored{ dir = 8 @@ -12919,6 +13978,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"kBu" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on/welded{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "kBz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/danger{ @@ -12926,6 +13991,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"kBS" = ( +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kCU" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -12936,20 +14005,6 @@ /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled/steel_grid, /area/rift/station/fighter_bay/maintenance) -"kDu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) "kDH" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/transport_tunnel) @@ -12978,6 +14033,25 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"kEG" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) +"kEZ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "kFe" = ( /obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, @@ -13001,6 +14075,12 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) +"kHm" = ( +/obj/structure/frame/computer{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "kHs" = ( /obj/structure/table/hardwoodtable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13041,21 +14121,6 @@ "kIF" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/storage) -"kIR" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "kIW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, @@ -13106,19 +14171,18 @@ "kKv" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/port) -"kKS" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, +"kKF" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) +"kKM" = ( +/obj/landmark/spawnpoint/job/senior_engineer, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"kKY" = ( -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics) +/area/engineering/hallway) +"kKX" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "kLd" = ( /obj/machinery/button/remote/blast_door{ id = "portnacelle_blastdoor"; @@ -13129,9 +14193,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"kLI" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) "kMa" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/open/shower/medical, @@ -13146,6 +14207,12 @@ /obj/landmark/spawnpoint/job/cargo_technician, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"kMo" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "kMs" = ( /obj/machinery/disposal, /obj/machinery/air_alarm{ @@ -13154,19 +14221,33 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"kMV" = ( -/obj{ - name = "---Merge conflict marker---" +"kMJ" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) +"kNk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/space/basic, -/area/space) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "kNV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13214,25 +14295,40 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"kOM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "kOP" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"kPL" = ( +/obj/structure/bed/chair/sofa/black/left, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "kQm" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/crew_quarters/bar) -"kRs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"kRb" = ( +/obj/machinery/door/airlock/maintenance/engi, +/obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2/stairs) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "kRx" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 1 @@ -13249,20 +14345,6 @@ /obj/structure/table/hardwoodtable, /turf/simulated/floor/wood, /area/medical/patient_wing) -"kRX" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) -"kRZ" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1; - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "kSv" = ( /obj/structure/railing{ dir = 8 @@ -13331,15 +14413,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"kUE" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/space/basic, -/area/space) "kUW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13349,6 +14422,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"kUZ" = ( +/obj/machinery/pipedispenser, +/turf/simulated/floor/plating, +/area/engineering/atmos) "kVy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -13357,6 +14434,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"kWj" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "kWl" = ( /obj/machinery/air_alarm{ dir = 8; @@ -13364,6 +14445,14 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"kWq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "kWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 @@ -13382,15 +14471,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"kXX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "kYq" = ( /obj/machinery/mech_recharger, /obj/machinery/atmospherics/portables_connector{ @@ -13416,35 +14496,22 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/space) -"kYz" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 +"kYE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/space/basic, -/area/space) -"kYR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 +/obj/effect/floor_decal/techfloor/orange/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"kZY" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1 }, /obj/effect/floor_decal/industrial/danger{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"kZx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/area/space) "laL" = ( /obj/machinery/pointdefense_control{ id_tag = "forward_pd"; @@ -13452,11 +14519,6 @@ }, /turf/simulated/floor/plating, /area/space) -"lbA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "lbH" = ( /obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled/techmaint, @@ -13464,6 +14526,16 @@ "lbI" = ( /turf/simulated/floor/glass/reinforced, /area/main_map/hallway/deck2) +"lcs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/frame{ + anchored = 1; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "lcP" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -13527,29 +14599,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) -"leE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"leN" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "leX" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Civilian Substation Bypass" }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) -"lfj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +"lfC" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "lfF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13560,6 +14622,9 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/quartermaster/qm) +"lfV" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/quartermaster/hallway) "lgt" = ( /obj/machinery/atmospherics/component/quaternary/mixer{ tag_east = 2; @@ -13571,6 +14636,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"lgF" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "lgM" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 4; @@ -13579,6 +14650,16 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"lgP" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(24) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/atmos/gas_storage) "lht" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -13595,6 +14676,13 @@ /obj/item/material/ashtray/glass, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"lhv" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "lhz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -13626,10 +14714,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"liy" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/plating, -/area/medical/medbay2) "liO" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -13683,13 +14767,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/cargo) -"lkt" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 - }, +"lkp" = ( +/obj/structure/railing, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/medical/medbay2) +/area/main_map/maintenance/deck_two/starboard) "lkz" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -13725,6 +14807,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"llF" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) +"llM" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "lmf" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -13781,14 +14878,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) -"lpG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/deck2{ - pixel_x = 32 +"loy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "lqj" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -13799,16 +14897,60 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"lqW" = ( +"lqL" = ( /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"lrF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"lrM" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 4; + target_pressure = 15000 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "lrZ" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"lsc" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"lsl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"lsr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "lsz" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -13847,33 +14989,15 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"ltf" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"ltv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"ltM" = ( +/obj/structure/railing{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "lud" = ( /obj/structure/sign/warning/nosmoking_1, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, @@ -13917,13 +15041,33 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"lwH" = ( -/obj/structure/railing, -/obj/structure/railing{ +"lwD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"lwN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "lxh" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/air_alarm{ @@ -13935,6 +15079,15 @@ "lxL" = ( /turf/simulated/open, /area/main_map/maintenance/deck_two/forward) +"lxS" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/port) "lxV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -13966,6 +15119,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) +"lzB" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area_hallway) "lAf" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil{ @@ -13994,6 +15153,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"lAT" = ( +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/tiled/techfloor, +/area/space) "lBf" = ( /obj/structure/cable{ icon_state = "1-4" @@ -14009,6 +15172,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"lBm" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "lBE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 @@ -14022,16 +15192,6 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"lBV" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/atmospherics/component/binary/pump{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "lCr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14052,10 +15212,14 @@ /obj/effect/floor_decal/corner/lightorange/bordercee, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"lDf" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) +"lDC" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "lEx" = ( /obj/machinery/gibber, /turf/simulated/floor/tiled/freezer, @@ -14090,22 +15254,29 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) +"lFB" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "lGa" = ( /turf/simulated/floor/glass/reinforced, /area/rnd/research/researchdivision) -"lGc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +"lGn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"lGC" = ( +/obj/machinery/air_alarm{ + pixel_y = 24 }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"lGl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel, -/area/space) +/area/main_map/maintenance/deck_two/aft/starboard) "lGK" = ( /obj/effect/floor_decal/industrial/danger, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14122,8 +15293,7 @@ /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) "lGM" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/reagent_containers/food/drinks/metaglass, @@ -14131,6 +15301,13 @@ /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/monotile, /area/security/observation) +"lGX" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "lHr" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -14151,15 +15328,6 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_b) -"lHx" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-8" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "lHy" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -14189,10 +15357,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/medical) -"lHF" = ( -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled/techfloor, -/area/space) "lHN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14214,6 +15378,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"lHW" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/wall/r_wall/prepainted, +/area/rift/station/fighter_bay/hangar) "lHZ" = ( /obj/machinery/atmospherics/tvalve/digital{ dir = 4 @@ -14239,6 +15409,17 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"lKg" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "lKt" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -14251,7 +15432,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/maintenance/substation/service) "lKT" = ( @@ -14279,6 +15460,12 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"lLe" = ( +/obj/machinery/camera/network/outside{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "lLw" = ( /obj/structure/railing{ dir = 4 @@ -14288,15 +15475,6 @@ }, /turf/simulated/open, /area/security/brig) -"lMi" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "lMM" = ( /obj/structure/cable/heavyduty{ icon_state = "0-4" @@ -14318,6 +15496,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"lNs" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "lNG" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -14344,10 +15529,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"lOw" = ( -/obj/structure/bed/chair, -/turf/simulated/floor/tiled/monotile, -/area/space) "lOA" = ( /obj/structure/sign/deck2{ pixel_y = 32 @@ -14380,6 +15561,21 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/server) +"lPV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) +"lPW" = ( +/obj/machinery/pointdefense_control{ + id_tag = "talon_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "lQf" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -14392,13 +15588,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/maintenance) -"lQK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "lRb" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Science"; @@ -14439,28 +15628,6 @@ /obj/item/book/manual/standard_operating_procedure, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"lTg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) -"lTl" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "lTr" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 9 @@ -14469,44 +15636,28 @@ /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"lTs" = ( -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 4 - }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) "lTx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) -"lTE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"lTJ" = ( -/obj/structure/cable/green{ +"lUg" = ( +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/hallway) +"lUO" = ( +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"lUg" = ( -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/hallway) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "lVU" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -14521,6 +15672,12 @@ /obj/structure/sign/warning/nosmoking_1, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/processing) +"lWh" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/cargo) "lWl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera/network/civilian{ @@ -14536,6 +15693,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"lWn" = ( +/obj/structure/medical_stand, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"lWu" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft/starboard) "lXi" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -14604,16 +15781,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"lXU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) "lXX" = ( /obj/structure/table/fancyblack, /obj/effect/floor_decal/spline/fancy/wood{ @@ -14621,24 +15788,16 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) -"lYe" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "lYw" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/open, /area/security/brig) +"lZb" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/hallway/deck2/starboard_fore) "lZt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 8 @@ -14668,16 +15827,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"mas" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +"maq" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-8" }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/computer/roguezones, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "maE" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored, /turf/simulated/floor/plating, @@ -14686,9 +15846,17 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) +"maO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "maT" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -14702,9 +15870,11 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"mbx" = ( -/obj/machinery/computer/card, -/turf/simulated/floor/wood, +"mbj" = ( +/obj/machinery/camera/network/outside{ + dir = 10 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "mbJ" = ( /obj/machinery/door/window/brigdoor/westleft{ @@ -14713,57 +15883,53 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor/grid, /area/bridge/bunker) -"mbT" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/structure/closet, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"mcq" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/space/basic, -/area/space) "mcA" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/atmos, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) -"mcO" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 +"mdo" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) +/obj/machinery/door/airlock/maintenance/engi, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/engineering/upper) "mdt" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/plating, /area/crew_quarters/bar) +"mdN" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"meq" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"met" = ( +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"meA" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "meU" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -14786,16 +15952,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"mfc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "mfd" = ( /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled, @@ -14814,16 +15970,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/server) -"mfL" = ( -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - dir = 4; - target_pressure = 15000 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "mgw" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ @@ -14834,6 +15980,10 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"mgF" = ( +/obj/structure/icecream_cart, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/freezer) "mhr" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -14866,6 +16016,12 @@ }, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) +"mjr" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "mjB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14883,6 +16039,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"mka" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/ai) "mkf" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/panic_bunker) @@ -14896,6 +16061,29 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"mkH" = ( +/obj/machinery/button/remote/blast_door{ + id = "mechbay-inner"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = -5; + req_access = list(29,47); + req_one_access = list(47) + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay-inner"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = 6; + req_access = list(29,47); + req_one_access = list(47) + }, +/obj/machinery/door/blast/regular{ + id = "mechbay-inner"; + name = "Mech Bay" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/mechbay) "mlD" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -14906,11 +16094,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"mlH" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/high/north_bump, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2/b) "mlQ" = ( /obj/machinery/door/airlock/glass{ name = "Recovery Wing" @@ -14924,10 +16107,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"mlT" = ( -/obj/structure/ladder/updown, -/turf/simulated/floor/plating, -/area/space) "mmI" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -14964,7 +16143,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) "mow" = ( @@ -14982,12 +16161,28 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"mpi" = ( -/obj/machinery/camera/network/research{ - dir = 4 +"moM" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) +"moR" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "mpH" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -14998,12 +16193,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) -"mpR" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "mpU" = ( /obj/machinery/button/windowtint{ id = "booth_2"; @@ -15050,12 +16239,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/xenoflora_storage) -"mrc" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "mrU" = ( /obj/machinery/door/airlock{ name = "Bar Backroom"; @@ -15069,6 +16252,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"msa" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "mso" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15078,18 +16271,25 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"msO" = ( -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) -"msY" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ +"msz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/effect/floor_decal/industrial/danger{ dir = 4 }, -/obj/effect/floor_decal/industrial/danger{ - dir = 6 +/turf/simulated/floor/tiled/techfloor, +/area/space) +"msI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/ladder/up, +/obj/structure/railing{ + dir = 8 }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"msO" = ( /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/rnd/research/researchdivision) "mtg" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/borderfloor{ @@ -15143,10 +16343,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -15173,6 +16370,15 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/freezer) +"muP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "mvn" = ( /obj/structure/table/reinforced, /obj/item/stamp/cargo, @@ -15205,6 +16411,13 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"mvB" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "mvH" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) @@ -15219,26 +16432,21 @@ }, /turf/simulated/wall, /area/main_map/maintenance/deck_two) -"mvW" = ( -/obj/structure/cable{ +"mwL" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/medical) +"mwQ" = ( +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"mwL" = ( -/obj/machinery/power/apc/direction_bump/west, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/medical) +/area/main_map/maintenance/deck_two/forward/port) "mwX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, @@ -15247,20 +16455,15 @@ /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall, /area/main_map/hallway/deck2/starboard_fore) +"mym" = ( +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "myB" = ( /obj/machinery/mech_recharger, /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) -"myX" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "myY" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/security) @@ -15279,20 +16482,38 @@ }, /turf/simulated/floor/wood, /area/medical/patient_wing) -"mAp" = ( -/obj/structure/cable{ - icon_state = "1-2" +"mAe" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) +"mAU" = ( +/obj/structure/dogbed, +/mob/living/simple_mob/animal/passive/dog/corgi/Ian, +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "mBg" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"mBu" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "mBy" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -15302,6 +16523,15 @@ }, /turf/simulated/floor/carpet, /area/medical/patient_wing) +"mBM" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "mBU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -15327,31 +16557,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"mCS" = ( -/obj/structure/cable/green{ - icon_state = "0-4" +"mDm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "mDY" = ( /obj/structure/grille, /obj/structure/girder/reinforced, /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) -"mEH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "mFc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -15369,7 +16588,7 @@ /area/main_map/hallway/deck2) "mGy" = ( /obj/structure/cable, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) "mGY" = ( @@ -15391,11 +16610,37 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"mHn" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/high/north_bump, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2/a) +"mHE" = ( +/obj/machinery/door/airlock/command{ + name = "Head of Personnel"; + req_access = list(57) + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"mHL" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "mIl" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/plain{ @@ -15412,6 +16657,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) +"mIP" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"mIZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "mJl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -15422,6 +16685,18 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"mJs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "mJJ" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, @@ -15447,14 +16722,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) -"mLk" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, +"mKw" = ( +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"mKW" = ( +/obj/structure/door_assembly, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) "mLq" = ( /obj/machinery/door/airlock/engineering{ @@ -15482,13 +16756,20 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"mNs" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 8 +"mNS" = ( +/obj/landmark{ + name = "morphspawn" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/starboard) +"mNU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "mNW" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -15517,7 +16798,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -15539,9 +16820,26 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"mPi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"mPq" = ( +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "mPs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 @@ -15554,6 +16852,14 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) +"mQJ" = ( +/obj/structure/table/rack/shelf, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "mQU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -15598,6 +16904,17 @@ "mSp" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/medical) +"mSD" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft/port) +"mSU" = ( +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/tiled, +/area/hydroponics) "mSY" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/industrial/danger{ @@ -15619,27 +16936,10 @@ /obj/structure/sign/warning/nosmoking_1, /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) -"mTG" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 9 - }, -/obj/machinery/light/no_nightshift, -/turf/simulated/open, -/area/engineering/engine_eva) "mTI" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) -"mTO" = ( -/turf/simulated/floor/tiled/monotile, -/area/rnd/research/researchdivision) "mUi" = ( /obj/machinery/door/airlock/glass/mining{ name = "Warehouse" @@ -15661,6 +16961,15 @@ "mVb" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck2) +"mVr" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "mVP" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -15668,9 +16977,13 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) +"mWg" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "mWn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15684,12 +16997,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"mWI" = ( +"mWs" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "mWL" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -15709,15 +17023,6 @@ /obj/machinery/holopad, /turf/simulated/floor/wood, /area/medical/patient_wing) -"mWP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) "mWX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -15739,13 +17044,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"mXz" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "mXM" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -15756,6 +17054,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) +"mXP" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "mYo" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/cargo) @@ -15815,19 +17117,10 @@ }, /turf/simulated/floor/tiled, /area/space) -"mZy" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel, -/area/space) -"mZV" = ( -/obj/machinery/account_database{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/space) +"mZw" = ( +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "mZY" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/floodlight, @@ -15839,6 +17132,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"naN" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "naW" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -15856,12 +17153,6 @@ /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/hydroponics) -"nbs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "nby" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/techmaint, @@ -15893,14 +17184,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"ncv" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, +"ncI" = ( +/obj/machinery/door/airlock/hatch, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, /area/engineering/engine_gas) "ncT" = ( /obj/structure/railing, @@ -15909,29 +17196,19 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"nda" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) "ndc" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) -"ndd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 5 +"ndz" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos) -"ndw" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/area/main_map/maintenance/deck_two/forward/starboard) "ndE" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15939,7 +17216,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) "ndO" = ( @@ -16005,40 +17282,21 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) -"nfh" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/port) -"nfq" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" +"nfi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/space) -"ngr" = ( -/obj/structure/lattice, -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/structure/railing, -/obj/structure/railing{ +/obj/machinery/light/small{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "32-8" +/obj/effect/floor_decal/techfloor{ + dir = 6 }, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "ngt" = ( /turf/simulated/wall/prepainted, /area/hallway/primary/underone) @@ -16048,6 +17306,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"ngM" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "ngW" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16063,6 +17328,21 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) +"nhc" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "nhm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -16118,37 +17398,26 @@ /obj/item/coin/bananium, /turf/simulated/floor/plating, /area/storage/tech) +"njw" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "nkk" = ( /obj/structure/sign/greencross, /turf/simulated/wall/r_wall/prepainted/medical, /area/crew_quarters/heads/cmo) -"nkE" = ( -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/bar_backroom) -"nkK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +"nky" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 9 }, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"nle" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/area/main_map/hallway/deck2/stairs) +"nkE" = ( +/turf/simulated/wall/prepainted/civilian, +/area/crew_quarters/bar_backroom) "nlf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16160,6 +17429,17 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"nlD" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0; + dir = 4 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "nlH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 @@ -16209,11 +17489,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"nnq" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled/monotile, -/area/space) "nnx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -16250,10 +17525,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"nnS" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) +"nnU" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "nob" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16262,33 +17540,73 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"nog" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "non" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/forward) +"not" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "noz" = ( /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) "noC" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"noG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "noL" = ( /turf/simulated/floor/plating, /area/engineering/engine_room) -"npA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, +"npl" = ( +/obj/structure/table/fancyblack, +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar) +"npw" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/aft/starboard) +"npB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "npD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue{ dir = 4 }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) +"npE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "npK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -16303,24 +17621,9 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"nqj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "nqm" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/main_map/maintenance/atmospheric_substation/security) -"nqw" = ( -/obj/structure/sign/deck2{ - pixel_y = 32 - }, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "nqE" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -16331,6 +17634,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"nrc" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "nrk" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -16357,12 +17669,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"nsB" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "ntf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -16378,6 +17684,26 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) +"ntR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"nud" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "nun" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 4; @@ -16407,6 +17733,13 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) +"nuZ" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "nvc" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -16428,13 +17761,12 @@ "nvX" = ( /turf/simulated/floor/tiled/techmaint, /area/maintenance/engineering) -"nxm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +"nxj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "nxD" = ( /obj/structure/table/reinforced, /obj/fiftyspawner/rods, @@ -16442,36 +17774,28 @@ /obj/fiftyspawner/rods, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) -"nxF" = ( -/obj/effect/floor_decal/techfloor/orange{ +"nyw" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) -"nxV" = ( -/obj/machinery/keycard_auth{ - pixel_y = -36 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -8; - pixel_y = -26 +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) +"nyD" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/space) -"nyq" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "nyV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16503,6 +17827,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/maintenance) +"nzH" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "nAg" = ( /turf/simulated/floor/plating, /area/engineering/engine_gas) @@ -16515,6 +17845,21 @@ /obj/machinery/turnstile, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"nBB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "nBI" = ( /obj/structure/table/standard, /obj/machinery/vending/wallmed1/public{ @@ -16542,6 +17887,9 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) +"nCc" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/medical/medbay2) "nCu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -16575,20 +17923,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"nEi" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"nEo" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/open, +/area/hydroponics/garden) "nEw" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) "nEQ" = ( @@ -16635,13 +17981,16 @@ "nEZ" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/a) -"nGg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"nFx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "nGt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -16651,16 +18000,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) -"nGO" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/item/radio/intercom{ - pixel_y = -24 +"nGy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/maintenance/tool_storage) +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "nHf" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 10 @@ -16677,16 +18025,17 @@ /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_two) -"nIc" = ( -/obj/effect/floor_decal/corner/paleblue/full, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "nIe" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, /area/space) +"nIp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "nIt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16697,6 +18046,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"nIz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "nIA" = ( /obj/machinery/r_n_d/circuit_imprinter, /obj/item/reagent_containers/glass/beaker/sulphuric, @@ -16705,34 +18063,18 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"nIY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 +"nIL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/camera/network/engineering{ - dir = 8 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/obj/structure/closet/firecloset, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"nIZ" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/area/main_map/maintenance/deck_two/forward/starboard) "nJy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "nJI" = ( @@ -16742,9 +18084,26 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"nJT" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "nKv" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/foyer) +"nLf" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft/port) "nLn" = ( /obj/structure/railing{ dir = 8 @@ -16759,6 +18118,15 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) +"nLw" = ( +/obj/structure/table/bench/wooden, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/light/no_nightshift, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/fitness) "nLN" = ( /obj/structure/window/reinforced{ dir = 8 @@ -16791,22 +18159,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck2) -"nMW" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"nNl" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "nNn" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 6 @@ -16852,13 +18204,12 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) -"nOs" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +"nOA" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/plating, +/area/space) "nOP" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/briefcase/inflatable, @@ -16881,6 +18232,24 @@ }, /turf/simulated/open, /area/quartermaster/hallway) +"nPv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/port) "nPx" = ( /obj/structure/railing, /obj/structure/railing{ @@ -16890,6 +18259,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) +"nQp" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "nQO" = ( /obj/structure/cable{ icon_state = "2-4" @@ -16904,12 +18280,12 @@ }, /turf/simulated/floor/reinforced, /area/space) -"nRU" = ( -/obj/structure/sign/deck2{ - pixel_x = 32 +"nRr" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "nRX" = ( /obj/machinery/door/airlock/glass/mining{ name = "Cargo Bay"; @@ -16919,6 +18295,19 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"nSe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "nSu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16979,6 +18368,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_d) +"nUf" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) "nUo" = ( /obj/structure/window/reinforced{ dir = 8 @@ -16988,14 +18388,25 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"nUu" = ( -/obj/structure/cable/green{ +"nUF" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"nUJ" = ( +/obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/floor/plating, /area/space) +"nUU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "nVc" = ( /obj/machinery/vending/snack{ dir = 8 @@ -17008,6 +18419,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"nVt" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "nVN" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Security"; @@ -17024,13 +18441,24 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"nVV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"nWb" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/port) +"nWv" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "nWF" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -17053,6 +18481,18 @@ }, /turf/simulated/floor/plating, /area/engineering/hallway) +"nXi" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "nXu" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 1 @@ -17080,6 +18520,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"nYU" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "nZd" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -17087,19 +18531,20 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) -"nZz" = ( -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Fighter Bay Maintenance"; - req_one_access = list(19,29,38,43,47,63,67) - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "nZS" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/security) +"nZT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "oac" = ( /obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/fancy/wood{ @@ -17107,11 +18552,10 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) -"oaf" = ( -/obj/structure/dogbed, -/mob/living/simple_mob/animal/passive/dog/corgi/Ian, -/turf/simulated/floor/wood, -/area/space) +"oav" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) "oaA" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ @@ -17153,22 +18597,35 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) -"obo" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "oce" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 }, /turf/simulated/floor/carpet, /area/medical/patient_wing) +"ocq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "ocU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) +"ocZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "odb" = ( /obj/structure/railing{ dir = 1 @@ -17197,12 +18654,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"odQ" = ( -/obj/structure/cable{ - icon_state = "1-8" +"oee" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"ofc" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "ofh" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger{ @@ -17244,15 +18708,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) -"ofO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "ofZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -17265,18 +18720,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"ogh" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "ogD" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -17286,12 +18729,22 @@ "ogP" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/service) +"ogY" = ( +/turf/simulated/open, +/area/rnd/robotics) "ohc" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"ohj" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/corner/paleblue, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "ohk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17338,12 +18791,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"ojG" = ( -/obj/structure/sign/deck2{ - pixel_x = 32 - }, -/turf/simulated/floor/plating, -/area/maintenance/cargo) "ojQ" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -17371,6 +18818,23 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"okI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"olw" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "olJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -17384,21 +18848,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"omf" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"olX" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "omr" = ( /obj/structure/sink{ dir = 4; @@ -17424,12 +18880,10 @@ "omU" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) -"ong" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +"onn" = ( +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "onC" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 4 @@ -17446,16 +18900,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) -"ooG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "ooK" = ( /obj/structure/dispenser{ phorontanks = 0 @@ -17469,6 +18913,45 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"opl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) +"opK" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/red/auto, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) +"opW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) "oqb" = ( /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 1443; @@ -17492,16 +18975,39 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/patient_b) +"oqK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"oqO" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"oqS" = ( +/obj/structure/frame{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "orw" = ( /obj/structure/ladder/updown, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"orC" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "osk" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -17580,6 +19086,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"otM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "otZ" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 @@ -17589,10 +19105,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"ouC" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/space) "ovm" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -17604,18 +19116,16 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) -"ovx" = ( -/turf/simulated/floor/tiled/steel, -/area/space) -"ovF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"ovD" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/landmark{ + name = "morphspawn" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "ovL" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -17638,13 +19148,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"owx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/obj/machinery/camera/network/engine{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "owA" = ( /obj/effect/floor_decal/industrial/danger{ dir = 5 @@ -17652,19 +19155,43 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) -"oxr" = ( -/obj/structure/railing{ - dir = 1 +"oxb" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"oxF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "oyt" = ( /obj/structure/railing{ dir = 4 }, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/starboard) +"oyG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"oyX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "ozO" = ( /turf/simulated/floor/tiled/white, /area/medical/medbay2) @@ -17699,6 +19226,20 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"oCD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) +"oCQ" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, +/obj/effect/floor_decal/industrial/danger{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "oDh" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/space) @@ -17760,9 +19301,27 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/panic_bunker) +"oEa" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/landmark{ + name = "morphspawn" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "oEd" = ( /turf/simulated/wall/prepainted/medical, /area/medical/patient_c) +"oEn" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "oEq" = ( /obj/machinery/door/airlock/command{ name = "Server Room"; @@ -17771,10 +19330,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) -"oEw" = ( -/obj/machinery/mecha_part_fabricator, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) "oEH" = ( /obj/structure/cable{ icon_state = "2-8" @@ -17788,6 +19343,14 @@ "oEJ" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/showers) +"oEN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "oFd" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -17851,10 +19414,31 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"oIq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, +"oIf" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/aft/starboard) +"oIh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/service) +"oIy" = ( +/obj/machinery/atmospherics/component/binary/pump, +/turf/simulated/floor/plating, +/area/engineering/atmos) "oIC" = ( /obj/structure/table/reinforced, /obj/item/radio/off, @@ -17883,7 +19467,7 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_c) "oJP" = ( @@ -17893,6 +19477,26 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/server) +"oJT" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on/welded{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"oKu" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"oKH" = ( +/obj/structure/table/bench/wooden, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled, +/area/crew_quarters/fitness) "oKI" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Mining Outpost Airlock" @@ -17904,6 +19508,27 @@ }, /turf/simulated/floor, /area/hallway/primary/underone) +"oLd" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) +"oLx" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "oLz" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -17920,12 +19545,6 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) -"oLS" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "oLT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17936,6 +19555,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) +"oMs" = ( +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/danger, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(24) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/atmos) "oNf" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -17994,6 +19622,13 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"oNH" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "oNJ" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -18013,6 +19648,24 @@ /obj/fiftyspawner/steel, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"oOl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/space) +"oON" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"oOS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/space) "oOZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -18028,12 +19681,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"oPE" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) "oPM" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 8; @@ -18104,6 +19751,13 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"oRM" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(24) + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "oSm" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/main_map/maintenance/deck_two/aft) @@ -18123,6 +19777,21 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/foyer) +"oSI" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) +"oTr" = ( +/obj/structure/sign/deck2{ + pixel_y = 32 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "oTE" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18143,18 +19812,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) -"oUm" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "oUq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -18163,17 +19820,13 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) "oUw" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18211,19 +19864,16 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) -"oWs" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "oWw" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) +"oWC" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "oWO" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -18238,6 +19888,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/maintenance) +"oWU" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "oXk" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 10 @@ -18265,11 +19932,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -18297,7 +19960,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -18308,6 +19971,19 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) +"oYE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "oYL" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 @@ -18397,14 +20073,10 @@ }, /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) -"paD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) +"paH" = ( +/obj/machinery/atmospherics/valve/digital, +/turf/simulated/floor/tiled/techfloor, +/area/space) "paM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -18425,9 +20097,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/engineering/hallway) -"paT" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) "pbe" = ( /obj/machinery/power/smes/buildable/engine/rust, /obj/structure/cable/cyan{ @@ -18435,15 +20104,14 @@ }, /turf/simulated/floor/airless/ceiling, /area/engineering/engine_smes) -"pbq" = ( -/obj/item/clothing/under/swimsuit, -/obj/structure/cable/green{ - icon_state = "4-8" +"pbS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "pcf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18476,23 +20144,40 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) +"peI" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "pfb" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, /turf/simulated/floor/wood, /area/main_map/hallway/deck2) -"pfp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "pfY" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Forward Point Defense Substation Bypass" }, /turf/simulated/floor/plating, /area/space) +"pgc" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "pgv" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -18528,30 +20213,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"phC" = ( -/obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access = list(57) - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "bridge_lockdown"; - name = "Bridge Lockdown"; - opacity = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/space) "phS" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -18610,21 +20271,18 @@ "pjR" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/hallway) -"pkd" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) +"pko" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"pkv" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "pkG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/starboard) -"ply" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "plE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -18640,16 +20298,26 @@ }, /obj/structure/catwalk, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) "pmc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"pmf" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) +"pmh" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "pms" = ( /obj/structure/window/reinforced, /obj/machinery/portable_atmospherics/canister/phoron, @@ -18662,6 +20330,10 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"pmC" = ( +/obj/machinery/door/airlock/glass/atmos, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) "pnB" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4 @@ -18688,10 +20360,22 @@ }, /turf/simulated/floor/plating, /area/medical/medbay2) -"ppi" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +"poW" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" + }, +/turf/simulated/floor/plating, +/area/bridge/hop_office) "ppn" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 @@ -18723,15 +20407,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) -"ppz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "ppD" = ( /turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/gas_storage) @@ -18751,10 +20426,16 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "ppT" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"pqj" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "pqW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18775,11 +20456,35 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"prJ" = ( +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"psc" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "psS" = ( /obj/structure/lattice, /obj/machinery/camera/network/security, /turf/simulated/open, /area/security/brig) +"ptq" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "puk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -18793,7 +20498,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) "puw" = ( @@ -18802,6 +20507,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) +"puD" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "puR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/visible/green{ @@ -18809,24 +20520,30 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"pvT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 +"pvy" = ( +/turf/simulated/wall/r_wall/prepainted/command, +/area/ai/foyer) +"pvA" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/medical/patient_wing) +"pvE" = ( +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/component/binary/pump, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"pwo" = ( -/obj{ - name = "---Merge conflict marker---" +/area/main_map/maintenance/deck_two/aft/starboard) +"pwr" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/power/smes/magical{ + output_level = 5000; + output_level_max = 5000 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/engineering/engine_room) "pwZ" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, @@ -18863,32 +20580,26 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) -"pyY" = ( -/obj/structure/cable{ - icon_state = "1-2" +"pze" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"pzb" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"pzh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) -"pzf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "pzv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18917,18 +20628,25 @@ }, /turf/simulated/floor/plating, /area/engineering/hallway) +"pzY" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "pAg" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"pAl" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 +"pAq" = ( +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "pAF" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -18974,18 +20692,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) -"pBk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"pBm" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/storage) "pBx" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/suit/space/emergency, @@ -19036,14 +20742,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"pCZ" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "pDg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19056,6 +20754,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) +"pDC" = ( +/obj/machinery/mecha_part_fabricator, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "pDF" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -19068,17 +20770,18 @@ /obj/structure/grille, /turf/space, /area/space) -"pDX" = ( -/obj/structure/railing{ - dir = 8 +"pDU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 }, -/obj/structure/railing, -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/zpipe/down{ - dir = 1 +/turf/simulated/floor/plating, +/area/space) +"pEs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 }, -/turf/simulated/open, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled/techfloor, +/area/space) "pEz" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -19104,12 +20807,6 @@ "pFe" = ( /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"pFp" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "pFE" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19162,17 +20859,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/hallway) -"pHj" = ( -/obj/machinery/camera/network/engineering, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) -"pHr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "pHH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/no_nightshift{ @@ -19207,17 +20893,33 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"pJy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 8 +"pIV" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/effect/floor_decal/techfloor/hole/right, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) +"pIY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"pJI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/area/main_map/maintenance/deck_two/aft) +"pJp" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "pJJ" = ( /obj/machinery/air_alarm{ dir = 8; @@ -19328,29 +21030,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) -"pPg" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/grass_edge/corner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research/researchdivision) -"pPp" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +"pPJ" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "pPN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -19371,12 +21054,13 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) -"pQT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"pQZ" = ( +/obj/machinery/air_alarm{ + pixel_y = 24 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "pRH" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, @@ -19390,6 +21074,26 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/a) +"pSx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"pSH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "pSK" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ @@ -19413,6 +21117,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"pTm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "pTo" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1; @@ -19437,13 +21147,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) -"pUB" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 +"pUm" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "pVJ" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing, @@ -19461,16 +21173,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/research) -"pWd" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) "pWj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"pWo" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "pWw" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -19491,6 +21202,21 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"pWH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "pWM" = ( /obj/machinery/cryopod/robot, /turf/simulated/floor/tiled/steel_grid, @@ -19498,12 +21224,6 @@ "pXb" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"pXl" = ( -/obj/item/clothing/under/swimsuit, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area_hallway) "pXq" = ( /obj/structure/sign/warning/nosmoking_1{ pixel_y = 32 @@ -19519,20 +21239,19 @@ "pXJ" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/maintenance/deck_two/aft/starboard) -"pYr" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "pYz" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/barrestroom) -"pYL" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +"pZC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) +/area/main_map/hallway/deck2) "pZS" = ( /obj/machinery/door/window/northright{ name = "Air Mix Controller"; @@ -19556,14 +21275,27 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/durathread, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay) +"qau" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "qaV" = ( /obj/structure/cable/green{ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/substation/medical) +"qbb" = ( +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) "qbf" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -19639,27 +21371,17 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"qdB" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access = list(16); - req_one_access = list() - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) -"qef" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +"qeo" = ( +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/cable/green, +/obj/machinery/power/apc/south_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/turf/simulated/floor/wood, +/area/bridge/hop_office) "qer" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "COMMAND" @@ -19686,40 +21408,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"qfO" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/storage/toolbox/mechanical, +"qfm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 }, -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"qgM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/space/basic, -/area/space) -"qfW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"qgQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/forward/starboard) -"qgu" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "qgS" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -19750,6 +21463,23 @@ "qhn" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/aft) +"qho" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/server) +"qin" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "qiF" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ icon_state = "map_vent_out"; @@ -19765,6 +21495,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"qiR" = ( +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "qje" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 @@ -19781,6 +21515,10 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"qks" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck2) "qkD" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -19794,12 +21532,6 @@ }, /turf/simulated/floor/reinforced, /area/space) -"qkZ" = ( -/obj/machinery/pointdefense_control{ - id_tag = "talon_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "qlL" = ( /obj/machinery/computer/rdconsole/robotics, /turf/simulated/floor/tiled/steel_grid, @@ -19813,6 +21545,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"qlX" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "qmQ" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 6 @@ -19825,6 +21564,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/fitness) +"qoh" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "qok" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass, @@ -19874,12 +21620,27 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"qqL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "qqS" = ( /obj/effect/floor_decal/industrial/danger{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"qrd" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "qrC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19895,31 +21656,45 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"qsb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) "qsr" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"qst" = ( -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Fighter Bay Maintenance"; - req_one_access = list(19,29,38,43,47,63,67) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "qsx" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/gas_storage) -"qsE" = ( -/obj/machinery/lathe/autolathe, +"qsD" = ( +/obj/machinery/door/blast/regular{ + id = "mechbay-inner"; + name = "Mech Bay" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) -"qtm" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/main_map/maintenance/deck_two/forward/starboard) +/area/rnd/robotics/mechbay) +"qtv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "qtX" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -19961,12 +21736,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/main_map/hallway/deck2) -"qvm" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) "qvC" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -19983,30 +21752,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"qwk" = ( -/obj/machinery/button/remote/blast_door{ - id = "mechbay-inner"; - name = "Mech Bay"; - pixel_x = 27; - pixel_y = -5; - req_access = list(29,47); - req_one_access = list(47) - }, -/obj/machinery/button/remote/blast_door{ - id = "mechbay-inner"; - name = "Mech Bay"; - pixel_x = 27; - pixel_y = 6; - req_access = list(29,47); - req_one_access = list(47) - }, -/obj/machinery/door/blast/regular{ - id = "mechbay-inner"; - name = "Mech Bay"; - dir = 4 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/mechbay) "qwl" = ( /obj/machinery/door/blast/regular{ dir = 4 @@ -20034,18 +21779,9 @@ "qwI" = ( /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) -"qxf" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +"qxa" = ( +/turf/simulated/open, +/area/ai/foyer) "qxB" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/plain{ @@ -20073,6 +21809,17 @@ /obj/structure/curtain/open/shower/medical, /turf/simulated/floor/plating, /area/medical/patient_a) +"qyN" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) +"qzk" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "qzN" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 8 @@ -20083,7 +21830,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) "qAa" = ( @@ -20121,12 +21868,25 @@ }, /turf/simulated/floor/airless/ceiling, /area/engineering/engine_eva) +"qBl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "qBx" = ( /obj/machinery/atmospherics/pipe/tank/phoron{ dir = 4 }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"qBZ" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "qCd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -20156,6 +21916,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/space) +"qCZ" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "qDh" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donut, @@ -20195,6 +21959,13 @@ "qFk" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"qFn" = ( +/obj/structure/sign/deck2{ + pixel_x = 32 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "qFt" = ( /obj/structure/railing{ dir = 1 @@ -20240,6 +22011,10 @@ }, /turf/simulated/floor/tiled, /area/space) +"qGi" = ( +/obj/structure/marker_beacon/red, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "qGs" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, @@ -20263,6 +22038,23 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) +"qGZ" = ( +/obj/structure/frame{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"qHn" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "qHT" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -20275,6 +22067,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"qIl" = ( +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge/hop_office) +"qIo" = ( +/obj/structure/railing/grey, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics) "qIE" = ( /obj/machinery/light/no_nightshift, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -20288,41 +22087,24 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) -"qJg" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) "qJj" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/crew_quarters/heads/cmo) -"qJq" = ( -/obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +"qJK" = ( +/obj/structure/table/hardwoodtable, +/obj/item/stamp/qm{ + pixel_x = -6 }, -/turf/simulated/floor/plating, -/area/space) -"qJx" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 1 +/obj/item/stamp/denied{ + pixel_x = 7 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/port) -"qJE" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1 +/obj/item/stamp/cargo, +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 24 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/turf/simulated/floor/wood, +/area/quartermaster/qm) "qKi" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -20360,6 +22142,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"qLg" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "qLl" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -20401,6 +22193,9 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"qLK" = ( +/turf/simulated/floor/reinforced/overhang, +/area/space) "qLM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20408,9 +22203,12 @@ /area/main_map/maintenance/deck_two/forward/starboard) "qLV" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/critical/south_bump, +/obj/machinery/power/apc/critical/south_mount, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"qLW" = ( +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "qMd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20426,19 +22224,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) -"qMk" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "qMD" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled, @@ -20465,12 +22250,17 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) -"qNn" = ( -/obj/structure/table/rack/shelf, -/obj/fiftyspawner/steel, -/obj/fiftyspawner/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) +"qNv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) "qNC" = ( /obj/machinery/air_alarm{ dir = 1; @@ -20487,6 +22277,18 @@ /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall, /area/main_map/hallway/deck2/port_fore) +"qPr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "qPE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20496,6 +22298,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"qQa" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"qQJ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "qRn" = ( /obj/structure/toilet{ dir = 1 @@ -20510,6 +22324,22 @@ }, /turf/simulated/open, /area/hydroponics) +"qRu" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "qRB" = ( /obj/machinery/door/airlock{ name = "Showers" @@ -20526,15 +22356,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/showers) -"qRL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "qRR" = ( /obj/structure/railing{ dir = 8 @@ -20666,46 +22487,21 @@ /obj/structure/girder/reinforced, /turf/simulated/floor/reinforced/carbon_dioxide, /area/space) -"qWL" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "qWZ" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/port_fore) -"qXn" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"qXs" = ( +"qXj" = ( /obj/structure/cable/green{ - icon_state = "32-1" - }, -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/open, -/area/space) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "qXw" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/recreation_area_hallway) @@ -20729,15 +22525,26 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/hallway) -"qZb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +"qYj" = ( +/obj/structure/railing/grey{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/turf/simulated/open, +/area/rnd/research/researchdivision) +"qYn" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"qZw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/techfloor, +/area/space) "qZO" = ( /obj/structure/railing, /obj/machinery/camera/network/cargo{ @@ -20745,16 +22552,10 @@ }, /turf/simulated/open, /area/quartermaster/hallway) -"qZQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/rnd/rdoffice) +"qZR" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rau" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) @@ -20764,35 +22565,62 @@ }, /turf/simulated/floor/tiled/techfloor, /area/server) -"rbI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"rdq" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ +"rca" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"rcw" = ( +/obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"rdw" = ( -/obj/machinery/door/airlock/atmos{ - name = "Security Atmospherics Backup"; - req_access = list(24) +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) +"rcy" = ( +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"rcT" = ( +/obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/bed/chair{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"rcU" = ( +/obj/structure/door_assembly/medical, +/obj/structure/firedoor_assembly, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) +"rdq" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) +/area/main_map/maintenance/deck_two/forward/port) "rdE" = ( /obj/structure/railing, /obj/structure/railing{ @@ -20803,11 +22631,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/port) -"rdJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "rel" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -20826,15 +22649,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"reW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor/plating, +/area/space) "rff" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/brig) -"rfS" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) "rgm" = ( /obj/structure/railing, /obj/structure/railing{ @@ -20849,15 +22670,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"rgM" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "rgO" = ( /obj/machinery/door/window/survival_pod{ dir = 2; @@ -20882,9 +22694,6 @@ }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) -"rhD" = ( -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) "rhN" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -20893,6 +22702,11 @@ /obj/machinery/door/window/brigdoor/southright, /turf/simulated/floor/plating, /area/security/brig) +"rhQ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) "rhW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -20913,12 +22727,26 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"rjo" = ( +"riD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"rjq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "rjC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20948,47 +22776,24 @@ }, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/gas_storage) -"rkw" = ( -/obj/machinery/button/remote/blast_door{ - id = "hangar_pad"; - name = "Hangar Bay Blast Door Control"; - pixel_x = 24; - pixel_y = -28; - req_one_access = list(19,29,38,43,47,63,67); - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/main_map/maintenance/deck_two/aft/starboard) -"rkT" = ( -/obj/machinery/icecream_vat, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/freezer) "rlc" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"rlm" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "rlo" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) -"rly" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) "rlB" = ( /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/xenoflora_storage) @@ -21007,13 +22812,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"rlY" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/space) +"rlE" = ( +/obj/effect/debris/cleanable/blood/oil, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "rms" = ( /obj/structure/table/rack{ dir = 8; @@ -21030,12 +22832,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/hallway) -"rnp" = ( -/obj/machinery/light/small{ - dir = 4 +"rnh" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft) "rnJ" = ( /obj/structure/cable/green{ icon_state = "32-2" @@ -21053,17 +22858,32 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/port) -"rnN" = ( -/obj/machinery/door/airlock/atmos, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) +"rnU" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "rnV" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/aft/starboard) +"rod" = ( +/obj/structure/catwalk, +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"rog" = ( +/obj/machinery/lathe/autolathe, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "rol" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -21078,18 +22898,10 @@ /obj/item/stamp/cmo, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"rot" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) +"rop" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/hydroponics/garden) "roN" = ( /obj/machinery/atmospherics/component/trinary/mixer{ dir = 4 @@ -21100,35 +22912,19 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/critical/east_bump, +/obj/machinery/power/apc/critical/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) "rpp" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"rpC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "rpI" = ( /obj/machinery/door/firedoor{ dir = 2 }, /turf/simulated/floor/tiled/monotile, /area/security/observation) -"rqz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "rqL" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/hallway) @@ -21141,36 +22937,12 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"rrh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "rrk" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) -"rrl" = ( -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/research/researchdivision) -"rrq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) "rru" = ( /obj/machinery/shower{ dir = 1 @@ -21207,6 +22979,15 @@ /obj/random/soap, /turf/simulated/floor/wood, /area/crew_quarters/showers) +"rtm" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "rtx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -21226,6 +23007,10 @@ "rui" = ( /turf/simulated/floor/wood, /area/medical/patient_wing) +"ruP" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "ruU" = ( /obj/structure/toilet{ dir = 1 @@ -21249,6 +23034,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"rwl" = ( +/obj/structure/sign/directions/cryo{ + dir = 8 + }, +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge/hop_office) "rwL" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -21302,18 +23093,18 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) -"ryt" = ( -/obj/structure/cable{ - icon_state = "4-8" +"ryu" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/effect/floor_decal/techfloor{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "ryw" = ( /obj/structure/table/steel, /obj/machinery/microwave, @@ -21341,6 +23132,16 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck2) +"rzB" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"rzJ" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rzN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -21357,6 +23158,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) +"rzX" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "rAa" = ( /obj/machinery/shower{ pixel_y = 16 @@ -21379,6 +23186,15 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) +"rAL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "rAO" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21392,15 +23208,6 @@ "rAT" = ( /turf/simulated/floor/tiled/techmaint, /area/quartermaster/hallway) -"rAX" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "rBj" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) @@ -21424,9 +23231,15 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"rBL" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "rCj" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 10 @@ -21446,34 +23259,38 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/storage) -"rCK" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"rDa" = ( -/obj/structure/cable{ - icon_state = "4-8" +"rDc" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "hangar_pad"; + name = "Hangar Bay Blast Door" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/obj/machinery/atmospheric_field_generator/perma, +/turf/simulated/floor/reinforced, +/area/rift/station/fighter_bay/hangar) "rDn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc/high/south_bump, +/obj/machinery/power/apc/high/south_mount, /obj/structure/cable{ icon_state = "0-8" }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"rDv" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"rDw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "rDH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -21481,29 +23298,6 @@ "rDL" = ( /turf/simulated/floor/plating, /area/medical/medbay2) -"rEj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"rEo" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" - }, -/turf/simulated/floor/plating, -/area/space) "rEy" = ( /obj/structure/sign/deck/second{ pixel_y = 32 @@ -21549,43 +23343,28 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"rFX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"rGp" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 }, -/obj/structure/cable{ +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"rHc" = ( +/obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) -"rGd" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/cable/green{ + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"rGD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 + dir = 10 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"rHm" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/turf/simulated/floor/wood, +/area/bridge/hop_office) "rHn" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -21606,15 +23385,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"rHw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "rHE" = ( /turf/simulated/wall, /area/space) @@ -21624,26 +23394,19 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/marker_beacon/red, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"rIU" = ( -/obj/machinery/door/blast/regular{ - id = "mechbay-inner"; - name = "Mech Bay"; - dir = 4 +"rIp" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/mechbay) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "rJK" = ( /obj/structure/railing{ dir = 4 @@ -21672,6 +23435,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"rKx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "rLk" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21682,12 +23452,26 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/monotile, /area/security/observation) +"rLJ" = ( +/obj/structure/table/glass, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "rLK" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"rMO" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "rNk" = ( /obj/landmark{ name = "morphspawn" @@ -21754,28 +23538,36 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/critical/north_bump, +/obj/machinery/power/apc/critical/north_mount, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) +"rOV" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/obj/landmark/spawnpoint/job/janitor, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"rPB" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rPD" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"rQb" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 1 +"rPS" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/window/phoronreinforced, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "rQs" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/aft/port) @@ -21795,6 +23587,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"rRh" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "rRj" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -21810,6 +23609,26 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"rRx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"rRJ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"rRN" = ( +/obj/structure/catwalk, +/obj/machinery/camera/network/outside, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rSo" = ( /obj/machinery/computer/robotics{ dir = 8 @@ -21845,21 +23664,14 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"rTc" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"rSX" = ( +/obj/structure/catwalk, +/obj/structure/frame{ + anchored = 1; + dir = 1 }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) +/area/main_map/maintenance/deck_two) "rTe" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -21902,6 +23714,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"rTX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "rUw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -21913,12 +23731,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"rUM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "rVy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -21934,15 +23746,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"rXI" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) "rXS" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -21962,6 +23765,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/hallway) +"rYG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/space) "rZl" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -21986,36 +23793,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) -"saC" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/heads/cmo) "sbI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) -"scc" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/space/basic, -/area/space) "scC" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -22025,21 +23806,45 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) +"sdd" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/space) +"sdn" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"seJ" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "seT" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/meeting_room) -"sfl" = ( -/obj/structure/cable{ +"sfr" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/plating, +/area/bridge/hop_office) "sfY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/bluegrid, @@ -22048,13 +23853,22 @@ /obj/structure/railing, /turf/simulated/open, /area/space) -"sgT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"sgF" = ( +/obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) +/obj/structure/railing, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"sgI" = ( +/obj/structure/sign/deck2{ + pixel_x = 32 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "sha" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22083,6 +23897,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) +"sij" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "siA" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -22101,18 +23919,26 @@ /obj/machinery/washing_machine, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) -"sjh" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 10 +"sjm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/aux, +/obj/machinery/camera/network/engine{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/space) +"sjO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor{ + dir = 2 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"sjV" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "ske" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -22135,6 +23961,21 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) +"skX" = ( +/obj/effect/floor_decal/grass_edge/corner, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/rnd/research/researchdivision) "skY" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 @@ -22142,6 +23983,19 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) +"slf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "slv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -22152,7 +24006,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/security/brig) "slU" = ( @@ -22161,6 +24015,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"smc" = ( +/obj/machinery/camera/network/research{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/black/right{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "smm" = ( /obj/structure/railing, /obj/machinery/light/small{ @@ -22173,19 +24039,52 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/hallway/primary/underone) +"smn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "smx" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"smB" = ( -/obj/machinery/door/blast/regular{ +"smE" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ dir = 4; - id = "hangar_pad"; - name = "Hangar Bay Blast Door" + name = "Maintenance Access" }, -/obj/machinery/atmospheric_field_generator/perma, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) +"smF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/wall/r_wall/prepainted, +/area/rift/station/fighter_bay/hangar) +"smH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"snb" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "snz" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass, @@ -22208,20 +24107,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"sop" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/bed/chair/comfy/teal, -/obj/machinery/computer/security/telescreen{ - pixel_y = 32 +"snV" = ( +/obj/structure/railing{ + dir = 8 }, -/turf/space/basic, -/area/space) +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "soB" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -22230,24 +24122,6 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) -"soX" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"spg" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/port) "spv" = ( /obj/structure/bed/chair/sofa/black/right, /turf/simulated/floor/tiled/monotile, @@ -22255,10 +24129,10 @@ "spD" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/storage) -"sqV" = ( -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) +"sqC" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "srv" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) @@ -22278,15 +24152,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"ssU" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 +"stq" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "stM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22299,6 +24173,16 @@ }, /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) +"stR" = ( +/obj/machinery/camera/network/outside{ + dir = 5 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"stV" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "suA" = ( /obj/machinery/air_alarm{ dir = 1; @@ -22338,6 +24222,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"svp" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) +"svt" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "svx" = ( /obj/machinery/door/airlock/engineering{ name = "Hangar Substation" @@ -22347,6 +24243,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"svA" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "svO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22361,13 +24261,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/starboard) -"swr" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/robotics) "swF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22378,10 +24271,22 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"sxa" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/wood, -/area/space) +"swV" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(10) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) +"sxb" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "sxk" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -22409,12 +24314,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/aft) -"sxY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "sya" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22435,18 +24334,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"syA" = ( +/obj/machinery/camera/network/outside{ + dir = 5 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"syJ" = ( +/obj/machinery/atmospherics/pipe/tank, +/turf/simulated/floor/tiled/techfloor, +/area/space) "szC" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"sAd" = ( +"sAe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) "sAl" = ( /obj/structure/closet/firecloset, @@ -22455,10 +24363,28 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) +"sAw" = ( +/obj/machinery/button/remote/blast_door{ + id = "hangar_pad"; + name = "Hangar Bay Blast Door Control"; + pixel_x = -24; + pixel_y = -28; + req_one_access = list(19,29,38,43,47,63,67); + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "sAF" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/port) +"sBk" = ( +/obj/machinery/camera/network/outside, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "sBz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22508,10 +24434,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"sDQ" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/research/researchdivision) "sDS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22521,6 +24443,12 @@ }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"sDX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "sEd" = ( /obj/machinery/camera/network/engineering{ dir = 8 @@ -22533,6 +24461,13 @@ "sEh" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/starboard) +"sEm" = ( +/obj/structure/closet/firecloset, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "sEr" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_a) @@ -22625,6 +24560,41 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"sFF" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"sFS" = ( +/obj/machinery/door/airlock/engineering{ + name = "Science Substation"; + req_one_access = list(11,24,47) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/substation/research) +"sFU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "sGh" = ( /obj/machinery/camera/network/engineering, /obj/structure/cable/green{ @@ -22641,12 +24611,30 @@ }, /turf/simulated/open, /area/engineering/hallway) +"sGD" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Fighter Bay Maintenance"; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "sGG" = ( /obj/machinery/atmospherics/component/binary/pump{ name = "Fuel Line to Thrusters" }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"sGM" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/multi_tile/metal{ + req_one_access = list(10); + name = "Engineering" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) "sGT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22659,35 +24647,43 @@ }, /turf/simulated/floor/plating, /area/engineering/hallway) +"sHd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"sHi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/blue{ + dir = 5 + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) "sHu" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/wood, /area/medical/patient_wing) -"sIT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "sJz" = ( /obj/structure/sign/deck/second{ pixel_x = 32 }, /turf/simulated/floor/tiled/monotile, /area/security/observation) -"sKs" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-8" +"sKe" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "sKv" = ( /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22700,7 +24696,7 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "sKO" = ( @@ -22713,6 +24709,15 @@ /obj/item/radio/off, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"sLY" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "sMK" = ( /obj/structure/railing, /turf/simulated/open, @@ -22725,6 +24730,10 @@ /obj/machinery/door/window/brigdoor/westright, /turf/simulated/floor/plating, /area/security/brig) +"sNL" = ( +/obj/machinery/computer/rdconsole/robotics, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "sNN" = ( /turf/simulated/wall, /area/main_map/hallway/deck2/port_fore) @@ -22749,33 +24758,40 @@ /obj/machinery/shieldgen, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"sOR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 10 +"sPy" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/port) +"sPB" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) +"sQu" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos) -"sPg" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/area/main_map/maintenance/deck_two) +"sQC" = ( +/obj/structure/railing/grey{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"sPy" = ( -/obj/structure/catwalk, /turf/simulated/open, -/area/main_map/maintenance/deck_two/port) -"sQX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/area/rnd/research/researchdivision) +"sQK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/door/airlock/maintenance/engi, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"sQR" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "sRd" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -22802,6 +24818,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"sRC" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "sRI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, @@ -22882,12 +24907,6 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"sUr" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "sUy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 6 @@ -22900,6 +24919,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"sUz" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "sUJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -22950,13 +24981,6 @@ }, /turf/simulated/open, /area/security/observation) -"sWo" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "sWt" = ( /obj/structure/sink{ dir = 4; @@ -22977,15 +25001,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) -"sWM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access"; - req_access = list(5) - }, -/turf/simulated/floor/tiled/techmaint, -/area/medical/medbay2) "sXb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -23012,10 +25027,44 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"sXU" = ( +/obj/machinery/power/apc/east_mount, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2/stairs) +"sYe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "sYV" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/observation) +"sZm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) "sZN" = ( /obj/structure/railing, /obj/structure/railing{ @@ -23042,6 +25091,28 @@ /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"tbl" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"tbs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "tbN" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ @@ -23134,27 +25205,21 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) -"tfD" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/main_map/maintenance/atmospheric_substation/ai) -"tfH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"tfk" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) -"tfY" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/maintenance/engineering/upper) +"tfD" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/atmospheric_substation/ai) "tgc" = ( /obj/machinery/door/airlock{ name = "Secondary Janitorial Closet"; @@ -23171,14 +25236,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) -"tgk" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/atmos, +"tgi" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos/gas_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "tgr" = ( /obj/structure/railing{ dir = 1 @@ -23200,6 +25264,17 @@ "thb" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) +"thm" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft/starboard) "thK" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 4; @@ -23233,6 +25308,28 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) +"tiT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"tja" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "tje" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23261,9 +25358,6 @@ "tjx" = ( /turf/simulated/floor/plating, /area/maintenance/cargo) -"tjA" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "tkb" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -23283,6 +25377,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"tkA" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"tkF" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "tkH" = ( /obj/machinery/computer/supplycomp/control{ dir = 4 @@ -23307,18 +25413,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"tlJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) "tlS" = ( /obj/structure/table/reinforced, /obj/item/stack/material/plastic{ @@ -23344,25 +25438,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"tmY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) "tnf" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) +"tnr" = ( +/obj/structure/ladder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "tnA" = ( /turf/simulated/floor/wood, /area/crew_quarters/showers) +"toB" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "toG" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -23400,6 +25495,11 @@ /obj/effect/floor_decal/techfloor/orange/corner, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"tpv" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "tpC" = ( /obj/structure/table/steel, /obj/effect/floor_decal/techfloor, @@ -23414,18 +25514,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"tpX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/security) +"tqh" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "tqi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23441,13 +25533,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"tqn" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, +"tqy" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"trl" = ( +/obj/structure/grille, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"trp" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "trr" = ( /obj/structure/kitchenspike, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/freezer, @@ -23459,17 +25565,24 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) -"trS" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"trL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/techfloor, /area/space) +"trO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "tsq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23479,13 +25592,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"tsx" = ( -/obj/item/clothing/under/swimsuit, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area_hallway) "tsZ" = ( /obj/item/radio/intercom{ dir = 1; @@ -23497,6 +25603,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"ttc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "ttq" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -23512,31 +25626,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"ttP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 5 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "tuc" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/main_map/hallway/deck2) -"tuk" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "tuY" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -23550,41 +25645,35 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "2-4" }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"tvN" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 +"tvs" = ( +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/vending/fitness, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "tvU" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"twy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"tvX" = ( +/obj/machinery/door/firedoor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/component/binary/pump{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/obj/machinery/door/airlock/hatch, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "twJ" = ( /obj/item/storage/toolbox/mechanical{ pixel_y = 5 @@ -23608,12 +25697,6 @@ }, /turf/simulated/open, /area/quartermaster/warehouse) -"txn" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/storage) "txB" = ( /obj/structure/table/rack/shelf, /obj/item/storage/backpack/parachute{ @@ -23699,13 +25782,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"tyE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "tzk" = ( /obj/structure/cable{ icon_state = "2-4" @@ -23718,13 +25794,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) -"tzO" = ( -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/space) "tzX" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -23767,10 +25836,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"tAx" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "tAC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/effect/floor_decal/industrial/danger{ @@ -23778,19 +25843,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"tAE" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) -"tAJ" = ( -/obj/structure/table/fancyblack, -/turf/simulated/floor/carpet, -/area/crew_quarters/bar) "tAR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /turf/simulated/floor/plating, @@ -23806,17 +25858,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"tAX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"tAZ" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/ai) "tBx" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23827,12 +25868,28 @@ }, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/recreation_area_hallway) +"tCH" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "tCN" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"tDc" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "tDw" = ( /obj/structure/railing{ dir = 1 @@ -23842,52 +25899,35 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) -"tDB" = ( -/obj/machinery/door/firedoor/glass, -/obj/effect/floor_decal/industrial/danger, -/obj/machinery/door/airlock/glass/atmos, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/atmos) "tDH" = ( /obj/structure/ladder/up, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/port) +"tDN" = ( +/obj/structure/railing/grey, +/turf/simulated/open, +/area/rnd/research/researchdivision) "tEs" = ( /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/port) -"tEJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "tFj" = ( /obj/machinery/atmospherics/pipe/tank/phoron{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"tFl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) "tFm" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) -"tFq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/door/airlock/glass/atmos, -/obj/machinery/door/firedoor/glass, +"tFN" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/port) "tFR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -23908,6 +25948,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"tGm" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "tGo" = ( /obj/machinery/vending/assist, /turf/simulated/floor/tiled, @@ -23915,6 +25959,13 @@ "tGw" = ( /turf/simulated/floor/wood, /area/bridge/meeting_room) +"tGN" = ( +/obj/structure/bed/chair/sofa/black, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "tHq" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) @@ -23930,6 +25981,32 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/security/observation) +"tIc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"tIw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"tIM" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_two/aft/starboard) "tIW" = ( /obj/structure/sign/deck/second, /turf/simulated/wall, @@ -23993,25 +26070,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) -"tKq" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/floodlight{ - anchored = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ +"tKs" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 8 }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two) "tLh" = ( /obj/structure/sign/directions/cryo{ dir = 8 @@ -24021,12 +26086,32 @@ "tLr" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/station/fighter_bay) +"tLI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/deck2{ + pixel_x = 32 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "tMn" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"tMv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "tMB" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24054,16 +26139,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"tNc" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "tNL" = ( /obj/structure/cable/green{ icon_state = "2-8" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) -"tNO" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/maintenance/tool_storage) "tNT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24073,6 +26160,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) +"tNW" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) "tOq" = ( /obj/machinery/door/airlock/atmos{ name = "Civilian Atmospherics Backup"; @@ -24090,18 +26181,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"tOR" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "tPa" = ( /obj/machinery/door/airlock/maintenance/command{ name = "Command Atmospheric Substation" @@ -24137,42 +26216,24 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) -"tPM" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "tQt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"tQB" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/space/basic, -/area/space) "tRb" = ( /turf/simulated/wall/prepainted/medical, /area/main_map/maintenance/deck_two/forward/starboard) +"tRs" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "tRL" = ( /obj/machinery/atmospherics/component/binary/pump, /turf/simulated/floor/tiled/techfloor, @@ -24195,6 +26256,17 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/port) +"tSz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "tSI" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -24206,8 +26278,7 @@ /turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) "tTX" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/wood, @@ -24231,6 +26302,15 @@ /obj/fiftyspawner/glass, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) +"tUN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "tUW" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/green, /turf/simulated/floor/tiled/techfloor, @@ -24239,7 +26319,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) "tVp" = ( @@ -24254,21 +26334,24 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) +"tVE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/space) +"tWm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/component/binary/pump, +/turf/simulated/floor/plating, +/area/space) "tWn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_c) -"tWx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "tWA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -24304,22 +26387,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"tXw" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "tXx" = ( /obj/effect/floor_decal/techfloor/orange/corner{ dir = 8 @@ -24330,23 +26397,33 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"tXY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"tYk" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/obj/machinery/camera/network/engine{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "tYn" = ( /obj/machinery/camera/network/research{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"tZt" = ( +"tZg" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/rnd/rdoffice) +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_two/aft/port) "tZE" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research/researchdivision) -"tZK" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/reinforced/airless, -/area/space) "tZY" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -24356,19 +26433,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"uaa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/direction_bump/north, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) "uad" = ( /obj/effect/floor_decal/corner/paleblue/bordercee{ dir = 4 @@ -24382,15 +26446,6 @@ /obj/structure/railing, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/port) -"ubz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "ubH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24419,6 +26474,37 @@ /obj/machinery/atmospherics/valve/digital, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"udK" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) +"udR" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/engineering/deck2/power_line) +"uec" = ( +/obj/structure/sign/deck2{ + pixel_y = -32 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"uee" = ( +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "ueK" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24446,27 +26532,19 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) -"ugw" = ( -/obj/structure/cable{ - icon_state = "1-8" +"ugP" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "uhf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/maintenance) -"uht" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "uiO" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 1; @@ -24492,16 +26570,6 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/tiled, /area/space) -"ujx" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) "ukt" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/cable/green{ @@ -24531,8 +26599,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/showers) "ulZ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/plating, @@ -24544,16 +26611,20 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"umt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, +"umO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"umS" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/structure/railing, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/open, +/area/maintenance/cargo) "umZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24598,12 +26669,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"unL" = ( -/obj/structure/railing{ +"uny" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "unO" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -24614,6 +26692,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/space) +"uok" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "uoF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24641,6 +26723,17 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled, /area/space) +"uoU" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "upk" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -24654,10 +26747,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 2; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/door/firedoor/glass{ dir = 1 }, @@ -24676,18 +26766,9 @@ }, /turf/simulated/open, /area/quartermaster/hallway) -"upx" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/space) -"upY" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +"upG" = ( +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "uqo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24695,18 +26776,6 @@ }, /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) -"uqO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) "uqZ" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 6 @@ -24724,29 +26793,54 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two) +"urK" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "usj" = ( /obj/effect/floor_decal/corner_techfloor_grid, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"usn" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"usF" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"utU" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/port) "uue" = ( /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"uuj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +"uur" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/wall/r_wall/prepainted, -/area/main_map/maintenance/deck_two/aft/starboard) -"uuF" = ( -/obj/machinery/atmospherics/component/unary/engine/biggest{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "uuJ" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/starboard) @@ -24756,12 +26850,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"uuW" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics) "uvc" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -24778,19 +26866,12 @@ }, /turf/simulated/open, /area/space) -"uvN" = ( -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ +"uvV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/turf/simulated/wall/r_wall, -/area/engineering/atmos) +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "uws" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24807,13 +26888,6 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) -"uwR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "uwS" = ( /obj/structure/railing, /obj/machinery/light/small{ @@ -24836,6 +26910,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) +"uxd" = ( +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "uxB" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, @@ -24856,20 +26933,34 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"uxJ" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/atmos, -/obj/machinery/atmospherics/pipe/simple/hidden/black{ +"uxL" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/railing{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "32-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) +"uyB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "uzM" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/floor_decal/industrial/warning{ @@ -24877,24 +26968,15 @@ }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) +"uzS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "uAp" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"uAy" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) "uBb" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -24937,10 +27019,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"uCD" = ( -/obj/structure/table/fancyblack, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/bar) +"uCJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "uDq" = ( /obj/structure/cable{ icon_state = "2-4" @@ -24955,18 +27040,25 @@ /obj/structure/railing, /turf/space, /area/space) +"uEc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "uEG" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/space) -"uEJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +"uEL" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "uEQ" = ( /obj/machinery/door/firedoor, /obj/structure/catwalk, @@ -24986,6 +27078,16 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/main_map/hallway/deck2) +"uEV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "uFd" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 @@ -25029,6 +27131,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"uGx" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "uHa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -25058,31 +27169,63 @@ }, /turf/simulated/floor/reinforced, /area/space) +"uHf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"uHC" = ( +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) "uHH" = ( /obj/effect/floor_decal/industrial/danger{ dir = 9 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"uHU" = ( +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) +"uIa" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "uIg" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) -"uIm" = ( -/obj/machinery/door/airlock/glass/engineering{ - name = "Engineering Hallway" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) -"uIA" = ( -/obj/structure/catwalk, -/obj/machinery/camera/network/outside{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) +"uIn" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "uIR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -25104,6 +27247,9 @@ }, /turf/simulated/open, /area/security/brig) +"uJd" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/quartermaster/hallway) "uJn" = ( /obj/structure/railing, /obj/structure/railing{ @@ -25111,10 +27257,6 @@ }, /turf/simulated/open, /area/security/brig) -"uJw" = ( -/obj/machinery/door/airlock/maintenance/command, -/turf/simulated/floor/plating, -/area/space) "uJy" = ( /obj/structure/railing{ dir = 8 @@ -25137,15 +27279,21 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/plating, /area/main_map/hallway/deck2/starboard_fore) -"uKw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +"uLe" = ( +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/structure/railing{ dir = 4 }, /turf/simulated/floor/plating, -/area/main_map/hallway/deck2) +/area/main_map/maintenance/deck_two/starboard) +"uLw" = ( +/obj/structure/sign/deck2{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "uLA" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -25168,6 +27316,15 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_smes) +"uMl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "uMx" = ( /obj/structure/cable{ icon_state = "2-4" @@ -25210,14 +27367,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"uNG" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/research{ - name = "Robotics Lab"; - req_access = list(29,47) - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/robotics) "uNX" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -25250,6 +27399,45 @@ }, /turf/simulated/open, /area/main_map/hallway/deck2) +"uOu" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"uOB" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"uOE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"uOT" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "uQa" = ( /obj/structure/sink/kitchen{ dir = 8; @@ -25280,30 +27468,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"uSP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/engineering{ - name = "Engineering Hallway" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) -"uSU" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "uTM" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -25334,7 +27498,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ id = "hanger1b"; - layer = 3.3; name = "Hanger 1 B Shutters" }, /turf/simulated/floor/reinforced, @@ -25348,28 +27511,14 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"uVR" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/hallway) -"uWe" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"uWc" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "uWs" = ( /obj/machinery/air_alarm{ dir = 8; @@ -25383,13 +27532,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"uXg" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) "uXj" = ( /obj/machinery/button/remote/blast_door{ id = "fighterbaytransportexit"; @@ -25421,12 +27563,15 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/storage) -"uXF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +"uXO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "uXQ" = ( /obj/machinery/papershredder, /obj/structure/extinguisher_cabinet{ @@ -25492,12 +27637,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"vao" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "var" = ( /turf/simulated/floor/plating, /area/maintenance/substation/research) @@ -25507,36 +27646,40 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"vaM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +"vaE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"vaX" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"vbm" = ( -/obj/structure/railing{ - dir = 1 +/obj/machinery/air_alarm{ + pixel_y = 24 }, -/obj/structure/railing{ +/turf/simulated/floor/plating, +/area/maintenance/substation/security) +"vaG" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/robotics) -"vbs" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"vbk" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central3, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research/researchdivision) +"vbC" = ( +/obj/machinery/light/small{ + dir = 1 }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/starboard) "vbN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -25574,26 +27717,10 @@ "vcx" = ( /turf/simulated/floor/plating, /area/maintenance/engineering) -"vdd" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) -"vds" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/Hangar_bay/deck2) -"vdY" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/space) +"vdV" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "ved" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/robotics) @@ -25615,11 +27742,18 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) +"vem" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/cargo) "vew" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -25667,23 +27801,6 @@ }, /turf/simulated/open, /area/security/brig) -"vfp" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/space/basic, -/area/space) "vfy" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/tiled/techfloor, @@ -25697,29 +27814,33 @@ }, /turf/simulated/floor/carpet, /area/medical/patient_wing) +"vfH" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "vgj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/tiled/monotile, /area/security/observation) -"vgw" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) -"vgx" = ( -/obj{ - name = "---Merge conflict marker---" +"vgs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "2-4" }, /obj/effect/floor_decal/rust, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"vgw" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "vgE" = ( /obj/structure/toilet{ pixel_y = 9 @@ -25740,12 +27861,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"vhr" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "vic" = ( /obj/item/modular_computer/console/preset/command{ dir = 8 @@ -25845,13 +27960,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"vlS" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) +"vly" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced/overhang, +/area/space) "vmh" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -25859,16 +27971,23 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) -"vnE" = ( -/obj{ - name = "---Merge conflict marker---" +"vmM" = ( +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"vng" = ( +/obj/structure/table/rack/shelf, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6 }, -/turf/space/basic, -/area/space) +/obj/item/storage/toolbox/electrical{ + pixel_y = -4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "vnG" = ( /obj/machinery/light{ dir = 8 @@ -25905,6 +28024,13 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"vph" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "vpR" = ( /obj/machinery/door/blast/regular{ dir = 4; @@ -25934,33 +28060,12 @@ }, /turf/simulated/open, /area/security/brig) -"vre" = ( -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" - }, -/turf/simulated/floor/plating, -/area/space) "vrk" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"vrI" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/engineering/hallway) "vsd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloor{ @@ -25995,12 +28100,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/hydroponics) +"vtx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "vtG" = ( /turf/simulated/wall/r_wall, /area/bridge/bunker) +"vtK" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "vuh" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -5 @@ -26041,18 +28158,13 @@ /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_two) -"vvd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +"vuZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/tiled/techfloor, +/area/space) "vvp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -26063,9 +28175,13 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"vvz" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "vwk" = ( /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) @@ -26093,13 +28209,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"vwy" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/high/east_bump, -/turf/simulated/floor/plating, -/area/space) "vwz" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/brflowers, @@ -26108,6 +28217,12 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/patient_wing) +"vxb" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "vxl" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 6 @@ -26142,24 +28257,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"vyv" = ( -/obj/structure/closet/crate/trashcart, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "vyK" = ( /obj/machinery/atmospherics/component/binary/pump, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"vzd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) "vzj" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/civilian) @@ -26232,29 +28333,16 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"vAK" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "vAU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rift/station/fighter_bay/maintenance) -"vBY" = ( -/obj/structure/catwalk, -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"vCf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "vCl" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -26304,10 +28392,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"vFn" = ( -/obj/machinery/atmospherics/pipe/tank, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "vFD" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -26334,6 +28418,13 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"vFR" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "vFV" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -26344,16 +28435,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"vFZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "vGb" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, @@ -26378,10 +28459,12 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"vGw" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/medical/patient_wing) +"vGC" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "vGH" = ( /obj/structure/table/rack, /obj/item/stack/material/phoron{ @@ -26393,12 +28476,15 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"vGL" = ( +"vGS" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "vHa" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Service Substation Bypass" @@ -26424,32 +28510,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"vHM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"vHR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"vIf" = ( -/obj/structure/closet, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "vIh" = ( /obj/structure/handrail{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"vIm" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 4 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "vIx" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 5 @@ -26465,6 +28538,16 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"vIU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "vJi" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/airless/ceiling, @@ -26479,6 +28562,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) +"vKm" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/space) "vKw" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, @@ -26550,6 +28636,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) +"vNc" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/turf/simulated/floor/tiled/techfloor, +/area/space) "vNA" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -26593,37 +28683,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"vNN" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"vOl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) -"vOB" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) -"vPn" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 10 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) +"vOZ" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "vPo" = ( /obj/machinery/light/small/emergency{ dir = 8 @@ -26638,6 +28702,17 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) +"vPA" = ( +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"vPV" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "vQc" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -26690,6 +28765,34 @@ /obj/structure/bed/padded, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_d) +"vQM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"vRd" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"vRf" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "vRr" = ( /obj/machinery/air_alarm{ dir = 8; @@ -26705,6 +28808,13 @@ }, /turf/simulated/floor/plating, /area/medical/patient_b) +"vRW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "vSf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -26728,12 +28838,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) -"vTY" = ( -/obj/structure/cable/cyan{ - icon_state = "2-4" +"vTN" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/hallway) "vUt" = ( /obj/structure/railing, /obj/effect/floor_decal/spline/fancy/wood{ @@ -26753,12 +28864,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) -"vUC" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/skills, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/space) "vUV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -26806,6 +28911,16 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/gas_storage) +"vWD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "vWN" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -26823,10 +28938,6 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"vXA" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/rnd/robotics) "vXT" = ( /obj/machinery/air_sensor{ frequency = 1443; @@ -26835,15 +28946,6 @@ }, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) -"vXV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/service) "vXZ" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -26857,22 +28959,19 @@ "vYd" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/forward) +"vYm" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/ai/foyer) +"vYy" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "vYK" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/barrestroom) -"vYS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"vZk" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "vZo" = ( /obj/structure/cable{ icon_state = "1-8" @@ -26902,6 +29001,28 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two) +"wau" = ( +/obj/structure/table/fancyblack, +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"way" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "waB" = ( /obj/effect/spider/stickyweb/dark, /turf/simulated/floor/plating, @@ -26922,17 +29043,21 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos) +"waT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/hallway) "wbh" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/hydroponics) -"wbl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) "wbN" = ( /obj/structure/table/reinforced, /turf/simulated/floor/tiled/techfloor, @@ -26944,6 +29069,15 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/storage) +"wch" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "wcM" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ @@ -26953,6 +29087,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/crew_quarters/heads/cmo) +"wcZ" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "wdx" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor{ @@ -26989,6 +29129,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck2) +"weB" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "weG" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -27019,21 +29172,6 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) -"wgu" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"wgQ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) "whq" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor{ @@ -27042,29 +29180,6 @@ /obj/machinery/door/window/brigdoor/westright, /turf/simulated/floor/plating, /area/security/brig) -"whG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"whH" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-2" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "whZ" = ( /obj/structure/table/rack{ dir = 8; @@ -27095,6 +29210,13 @@ }, /turf/simulated/floor/reinforced, /area/space) +"wip" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/forward/starboard) "wiv" = ( /obj/structure/railing{ dir = 1 @@ -27134,6 +29256,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"wjn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/space) +"wjy" = ( +/turf/simulated/floor/plating, +/area/engineering/engine_eva) +"wjF" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"wjI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "wjP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -27152,6 +29299,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) +"wkd" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "wkn" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 8; @@ -27161,6 +29314,18 @@ }, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) +"wkt" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/rnd/research/researchdivision) +"wkI" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/space) "wkW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 5 @@ -27213,19 +29378,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck2) -"wmZ" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) -"wnR" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "woy" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored{ dir = 8 @@ -27259,9 +29411,13 @@ layer = 2.6 }, /obj/item/storage/toolbox/mechanical, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) +"woO" = ( +/obj/structure/janitorialcart, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "woS" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 @@ -27289,18 +29445,29 @@ /obj/machinery/light, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) -"wqV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"wpK" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0; dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) +"wpT" = ( +/turf/simulated/wall, +/area/tether/surfacebase/security/lobby) +"wqf" = ( +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "wqW" = ( /obj/structure/window/reinforced{ dir = 8 @@ -27322,16 +29489,6 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) -"wri" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "wrq" = ( /obj/machinery/button/remote/airlock{ id = "bathroomlock15"; @@ -27393,6 +29550,18 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"wtd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "wtk" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -27460,6 +29629,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"wuV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"wvi" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "wvw" = ( /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall, @@ -27470,11 +29661,26 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"wvD" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +"wvI" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"wvJ" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) +"wvS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "wvW" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -27490,25 +29696,21 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"wwj" = ( -/obj/machinery/camera/network/outside{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"wwm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"wwa" = ( +/obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/bed/chair{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "wwF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27518,26 +29720,38 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"wwM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "wwN" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"wxe" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) "wxj" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/bunker) +"wxl" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "wxo" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-5" }, @@ -27552,6 +29766,44 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) +"wxB" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) +"wxJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/item/frame/noticeboard{ + pixel_y = 32 + }, +/obj/item/paper/pamphlet/violent_video_games, +/obj/item/paper/crumpled, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"wxM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/shield_gen) +"wxN" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/captain, +/turf/simulated/floor/carpet/blue, +/area/bridge/meeting_room) "wyl" = ( /obj/machinery/light{ dir = 4 @@ -27565,6 +29817,9 @@ /obj/machinery/vending/snack, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"wyn" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ai/foyer) "wyz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -27589,12 +29844,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"wyS" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "wzd" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/power/port_gen/pacman{ @@ -27617,12 +29866,22 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"wzJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 9 +"wAO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/port) "wBB" = ( /obj/machinery/door/airlock/glass/engineeringatmos{ name = "Damage Control Storage" @@ -27630,6 +29889,11 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"wBH" = ( +/obj/structure/railing, +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/plating, +/area/medical/medbay2) "wBN" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -27665,14 +29929,8 @@ }, /turf/simulated/floor/reinforced, /area/space) -"wEF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/rdoffice) "wEL" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -27688,6 +29946,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) +"wER" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "wEX" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -27725,6 +29991,15 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_a) +"wGk" = ( +/obj/machinery/door/firedoor/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(24); + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/atmos) "wGn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -27745,6 +30020,41 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) +"wGw" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"wGH" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) +"wGP" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"wHc" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "wHw" = ( /obj/machinery/door/airlock/engineering{ name = "Science Substation"; @@ -27756,14 +30066,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/research) -"wHz" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "wHB" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -27776,25 +30078,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"wHJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"wHS" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "wHW" = ( /obj/machinery/mech_recharger, /obj/machinery/atmospherics/portables_connector, @@ -27841,10 +30124,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"wJc" = ( -/obj/structure/stairs/spawner/west, -/turf/space, -/area/main_map/hallway/deck2/stairs) +"wJd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"wJo" = ( +/obj/structure/girder/displaced, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "wJE" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/glass/reinforced, @@ -27867,19 +30162,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"wKl" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" +"wKk" = ( +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_two/starboard) "wKT" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -27911,31 +30200,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) -"wMZ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"wNj" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"wNe" = ( +/obj/structure/railing/grey{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/crew_quarters/bar) +/turf/simulated/floor/plating, +/area/rnd/research/researchdivision) "wNo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -27949,34 +30219,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/stairs) -"wNw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/hallway) -"wNx" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"wNB" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) "wNI" = ( /obj/structure/cable{ icon_state = "0-8" @@ -28044,6 +30286,13 @@ }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) +"wPE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) "wPJ" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -28082,6 +30331,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/hallway) +"wQL" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "wQZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -28094,14 +30349,25 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"wRy" = ( -/obj/structure/cable{ - icon_state = "1-2" +"wRd" = ( +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) +"wRs" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" + }, +/turf/simulated/floor/plating, +/area/bridge/hop_office) "wRF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28117,6 +30383,19 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) +"wSD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "wSH" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -28137,6 +30416,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/security) +"wSV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"wSY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) "wTg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -28153,25 +30452,50 @@ "wTx" = ( /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"wUD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/turf/simulated/floor/plating, -/area/space) -"wUU" = ( +"wUu" = ( +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(10); + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) +"wUv" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"wUX" = ( +/obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"wVi" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"wVB" = ( +/obj/landmark{ + name = "lightsout" }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/obj/effect/floor_decal/steeldecal/steel_decals_central3, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research/researchdivision) "wVC" = ( /turf/simulated/floor/plating, /area/engineering/hallway) +"wVD" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/generator{ + anchored = 1; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "wVH" = ( /obj/machinery/light/no_nightshift{ dir = 1 @@ -28184,18 +30508,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"wVX" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "wWg" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, @@ -28221,12 +30533,13 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"wXk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 +"wWD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled/steel_ridged, +/area/quartermaster/foyer) "wXn" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -28235,26 +30548,6 @@ /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"wXN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"wXO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "wXY" = ( /obj/machinery/air_alarm{ dir = 1; @@ -28269,15 +30562,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) -"wYf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "wYV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -28288,6 +30572,22 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) +"wZD" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/techfloor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"wZP" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "xak" = ( /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28300,18 +30600,15 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_b) -"xbe" = ( -/obj/mecha/combat/fighter/pinnace/loaded{ - dir = 1 - }, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +"xbc" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "xbl" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ dir = 4 @@ -28344,24 +30641,45 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) +"xce" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "xcp" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/pool/changing_room) -"xeg" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"xdj" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"xdH" = ( /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc/high/east_mount, /turf/simulated/floor/plating, -/area/space) -"xev" = ( -/turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_two/aft/starboard) +/area/maintenance/engineering/upper) +"xdU" = ( +/obj/machinery/door/airlock{ + name = "Auxiliary Janitorial Closet"; + req_access = list(26) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) +"xeG" = ( +/obj/structure/girder/displaced, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "xeW" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -28374,12 +30692,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"xgk" = ( -/obj/structure/sign/deck2{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "xgn" = ( /obj/structure/curtain/open/shower, /obj/structure/window/reinforced{ @@ -28405,12 +30717,13 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/crew_quarters/showers) -"xgN" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 +"xgx" = ( +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "rd_office" }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/open, +/area/rnd/research/researchdivision) "xgP" = ( /obj/structure/fans/tiny, /obj/machinery/door/blast/regular{ @@ -28420,6 +30733,10 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) +"xhs" = ( +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "xhx" = ( /obj/structure/closet/secure_closet/CMO, /obj/item/cmo_disk_holder, @@ -28434,8 +30751,7 @@ /obj/item/clothing/mask/surgical, /obj/item/storage/secure/briefcase/ml3m_pack_cmo, /obj/item/clothing/accessory/poncho/roles/cloak/cmo, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -28447,26 +30763,6 @@ /obj/item/retail_scanner/medical, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"xhy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"xhH" = ( -/obj/structure/cable{ - icon_state = "5-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "xhI" = ( /obj/machinery/button/windowtint{ id = "booth_1"; @@ -28506,15 +30802,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"xjy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"xju" = ( +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"xjH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) +/area/space) "xjK" = ( /turf/simulated/floor/carpet, /area/medical/patient_wing) @@ -28533,6 +30834,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"xle" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "xlg" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 8 @@ -28572,6 +30878,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/open, /area/security/brig) +"xlV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "xmh" = ( /obj/structure/railing{ dir = 1 @@ -28598,17 +30915,6 @@ "xmY" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"xna" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) "xnp" = ( /obj/structure/window/reinforced{ dir = 8 @@ -28618,16 +30924,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"xnG" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +"xnP" = ( +/obj/landmark/spawnpoint/job/chief_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/hallway) "xob" = ( /obj/machinery/camera/network/research{ dir = 8 @@ -28646,6 +30946,15 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"xok" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "xoo" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 @@ -28655,6 +30964,20 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"xor" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/crew_quarters/bar) "xos" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ dir = 8 @@ -28739,12 +31062,20 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) -"xrg" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +"xqa" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/deck_two/forward) +"xre" = ( +/obj/structure/closet{ + desc = "Dents and old flaky paint blanket this old storage unit."; + name = "old locker" }, -/turf/simulated/floor/tiled/techfloor, -/area/space) +/obj/item/clothing/suit/storage/toggle/labcoat, +/obj/item/clothing/suit/storage/toggle/labcoat, +/obj/item/clothing/suit/storage/toggle/labcoat, +/obj/item/clothing/suit/storage/toggle/labcoat, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "xrk" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/steel_grid, @@ -28774,15 +31105,33 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) -"xtB" = ( -/obj/structure/cable{ - icon_state = "4-8" +"xsu" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"xsM" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) +"xtc" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "xtI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -28790,6 +31139,16 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/medical/patient_c) +"xtN" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "xul" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -28816,19 +31175,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) -"xuZ" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/space/basic, -/area/space) "xvb" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing, @@ -28854,11 +31200,23 @@ /obj/effect/spider/stickyweb, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) +"xwn" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "xws" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/lime/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -28871,13 +31229,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft) -"xxt" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) "xxC" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -28898,21 +31249,11 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"xyr" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) "xyA" = ( /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) @@ -28939,13 +31280,6 @@ "xyQ" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) -"xyS" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "xyV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -28956,6 +31290,25 @@ /obj/structure/railing, /turf/simulated/open, /area/crew_quarters/recreation_area_hallway) +"xzS" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"xAg" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "xAn" = ( /obj/item/storage/toolbox/emergency, /obj/item/storage/toolbox/emergency, @@ -28963,8 +31316,16 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"xAr" = ( -/turf/simulated/floor/tiled/monotile, +"xAR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, /area/space) "xAU" = ( /obj/structure/table/reinforced, @@ -28981,32 +31342,46 @@ /obj/structure/railing, /turf/simulated/open, /area/rnd/rdoffice) -"xCL" = ( -/obj/machinery/door/firedoor{ - dir = 8 +"xBf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/component/binary/pump{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/hatch, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/atmospheric_substation/security) +"xCh" = ( +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Head of Personnel's Office" + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"xCj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) +"xCl" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "xDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"xDN" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/generator{ - anchored = 1; - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "xDQ" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -29019,6 +31394,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) +"xDT" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"xEu" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "xEG" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -29026,12 +31414,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/patient_wing) -"xEQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "xEX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -29041,6 +31423,18 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_b) +"xFb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2/stairs) "xGo" = ( /turf/simulated/wall/r_wall/prepainted, /area/main_map/maintenance/deck_two/aft/starboard) @@ -29057,10 +31451,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck2/port_fore) -"xHy" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/reinforced/airless, -/area/space) "xHC" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/light/no_nightshift, @@ -29078,6 +31468,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"xHX" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) "xIk" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 @@ -29093,11 +31493,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"xJo" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/medical/medbay2) "xJE" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -29113,6 +31508,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/port) +"xKC" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "xKM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29129,21 +31530,6 @@ }, /turf/simulated/floor/reinforced, /area/space) -"xLA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/space) "xLF" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -29155,7 +31541,7 @@ dir = 1 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) "xMe" = ( @@ -29166,22 +31552,6 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"xMr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"xMu" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) "xMv" = ( /turf/simulated/wall/prepainted/medical, /area/medical/medbay2) @@ -29194,13 +31564,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"xNq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "xNW" = ( /obj/structure/closet/crate/corporate/nanotrasen, /turf/simulated/floor/tiled/techmaint, @@ -29220,43 +31583,10 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"xOu" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for shutters."; - id = "hop_office_desk"; - layer = 3.3; - name = "Desk Privacy Shutter"; - pixel_x = 6; - pixel_y = -29 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/space) -"xOH" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/super/critical/north_bump, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"xPj" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/space/basic, -/area/space) +"xOQ" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "xPl" = ( /obj/structure/closet/secure_closet/freezer/fridge{ anchored = 1 @@ -29288,6 +31618,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"xPH" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "AI Upload Access"; + req_access = list(16); + req_one_access = list() + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/ai) "xPN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29311,20 +31655,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/hallway) -"xQB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) +"xQx" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "xQE" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/medical) -"xQM" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "xQO" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -29382,6 +31721,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"xSx" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) +"xSD" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "xSH" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ @@ -29390,12 +31741,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) +"xSM" = ( +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "xST" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"xTR" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/rdoffice) "xUs" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 10 @@ -29453,37 +31811,39 @@ }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"xWA" = ( -/obj{ - name = "---Merge conflict marker---" +"xWg" = ( +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"xWj" = ( /obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 + pixel_y = 24 }, -/obj/structure/catwalk, -/turf/space/basic, -/area/space) -"xWO" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/closet/crate/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/medical/pillbottle, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"xWZ" = ( +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, +/obj/landmark/spawnpoint/job/station_engineer, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"xXi" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/red, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_ridged, /area/engineering/hallway) "xXl" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -29532,6 +31892,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"xYx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "xYZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -29570,6 +31936,14 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, /area/quartermaster/qm) +"xZI" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(10); + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) "xZK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -29579,12 +31953,6 @@ "yao" = ( /turf/simulated/floor/plating, /area/space) -"yau" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "yaA" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -29600,6 +31968,12 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"yaL" = ( +/obj/machinery/atmospherics/component/binary/pump, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/atmos) "yaZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29619,14 +31993,27 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/maintenance) -"ycI" = ( +"ybY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-5" +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"ycQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/area/main_map/maintenance/deck_two) "ycY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29656,10 +32043,25 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_eva) +"ydQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "ydV" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) +"yei" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "yev" = ( /obj/structure/sign/deck/second{ pixel_x = 32 @@ -29675,30 +32077,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/transport_tunnel) -"yeQ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "yeW" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/atmos, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"yfj" = ( -/obj/structure/sign/deck2{ - pixel_y = -32 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "yfF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, @@ -29724,17 +32108,18 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) -"yfZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "ygP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"yhd" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/high/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2/b) "yhH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29745,6 +32130,14 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) +"yih" = ( +/obj/structure/lattice, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) "yiy" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/door/blast/regular{ @@ -29776,21 +32169,26 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"yjG" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +"yjA" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/atmos/gas_storage) "yjM" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"yjY" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "ykb" = ( /turf/simulated/wall/prepainted/civilian, /area/hydroponics) @@ -29809,24 +32207,45 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"ykn" = ( +/obj/structure/stairs/spawner/north, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"yku" = ( +/obj/machinery/door/airlock{ + name = "Auxiliary Janitorial Closet"; + req_access = list(26) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "yky" = ( /obj/structure/railing{ dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) -"ymh" = ( -/obj/structure/cable{ +"ylP" = ( +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) (1,1,1) = {" hts @@ -30477,80 +32896,80 @@ hts hts hts hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +hts +hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +pEs +hdg +hdg +dug +bYZ +dKJ +oyX +baX +knr +vRW +hdg +hdg +bxj +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts hts hts hts @@ -30693,19 +33112,19 @@ qVH qVH qVH qVH -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +kMo +vtx +nQp +lsl +jaY +gPL +wvS +nOA +reW +vaG +ptq +aMn +kMo hts hts hts @@ -30887,19 +33306,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +vNc +qZw +hHu +snb +aHu +yao +hJW +yao +yao +cHI +hit +aMn +kMo qVH qVH hts @@ -31081,19 +33500,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +aIh +rKx +kkZ +vQM +aHu +yao +hJW +yao +yao +cHI +ptq +paH +tYk qVH qVH hts @@ -31275,7 +33694,21 @@ qVH qVH qVH qVH -hts +jxT +rBL +hcp +xAR +hVQ +dHw +vph +jKn +auF +tbs +lAT +hit +wkI +qVH +qVH hts qVH qVH @@ -31290,7 +33723,6 @@ qVH qVH qVH qVH -hts qVH qVH qVH @@ -31302,21 +33734,8 @@ qVH qVH qVH qVH -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +qVH +qVH hts hts hts @@ -31459,19 +33878,6 @@ hts qVH qVH qVH -ihZ -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -hts -hts -qVH qVH qVH qVH @@ -31482,6 +33888,19 @@ qVH qVH qVH qVH +vuZ +lrF +nQp +jfv +oOS +yao +hJW +yao +pDU +tbs +lAT +ptq +vNc qVH qVH hts @@ -31663,19 +34082,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +kMo +jJz +wVD +ihp +yao +yao +hJW +yao +pDU +tbs +jJz +jJz +kMo qVH qVH hts @@ -31857,19 +34276,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +izr +msz +kZY +gwN +dHw +dHw +ffL +dHw +tWm +oCQ +trL +nrc +jiV qVH qVH hts @@ -32051,19 +34470,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +dpZ +oCD +dpZ +wjn +ttc +ttc +hQe +xjH +dWF +hDn +aGn +qau +dmT qVH qVH hts @@ -32090,7 +34509,7 @@ qVH qVH qVH qVH -vgx +qVH qVH qVH qVH @@ -32245,28 +34664,28 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH +hbm +nUJ +jty +jty +jty +jty +jty +jty +nGy +hdb +nIz +hdb +rDw qVH qVH -qVH -qVH -qVH -qVH -qVH -hts hts hts hts hts -hts -qfO +qVH +qVH +qVH qVH qVH qVH @@ -32422,7 +34841,7 @@ qVH hts hts hts -frk +qGi hts hts hts @@ -32439,27 +34858,27 @@ qVH qVH hts hts -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +hDs +baO +vRd +rYG +yao +sdd +htC +htC +kmq +oLd +fEE +lrM +lrM qVH qVH hts hts hts hts -hts -hts +qVH +qVH qVH qVH qVH @@ -32512,7 +34931,7 @@ qVH qVH qVH hts -frk +qGi hts hts hts @@ -32616,7 +35035,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -32633,19 +35052,19 @@ qVH qVH hts hts -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +qYn +hrq +kuH +yao +yao +pDU +yao +oOl +reW +tVE +eBN +qqL +eCo qVH qVH hts @@ -32706,7 +35125,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -32810,7 +35229,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -32827,19 +35246,19 @@ qVH qVH hts hts -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +syJ +bWv +dQE +aEr +hhR +qsb +eWy +hZQ +sjm +iwx +bNv +wjF +gWx qVH qVH hts @@ -32900,7 +35319,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -33004,7 +35423,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -33094,7 +35513,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -33198,7 +35617,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -33236,21 +35655,21 @@ hts pDJ caB caB -hpp -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -hpp +trl +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +trl pDJ pDJ pDJ @@ -33288,7 +35707,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -33392,7 +35811,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -33428,25 +35847,25 @@ hts hts hts mRB -sqV -lTs +kBS +vIm wvw -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm wvw -kLI -kLI +vKm +vKm mRB hts hts @@ -33482,7 +35901,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -33586,7 +36005,7 @@ hts hts hts hts -kLI +vKm hts hts hts @@ -33676,7 +36095,7 @@ hts hts hts hts -kLI +vKm hts hts hts @@ -33779,9 +36198,9 @@ hts hts hts hts -kLI -kLI -kLI +mRB +mRB +mRB hts hts hts @@ -33869,9 +36288,9 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -33973,9 +36392,9 @@ hts hts hts hts -kLI -kLI -kLI +mRB +yao +mRB hts hts hts @@ -34063,9 +36482,9 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -34166,12 +36585,12 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -hts +mRB +mRB +yao +mRB +mRB +mRB hts hts hts @@ -34256,11 +36675,11 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -34358,15 +36777,15 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +mRB +mRB +yao +yao +yao +yao +mRB +mRB hts hts hts @@ -34448,15 +36867,15 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -34551,8 +36970,8 @@ hts hts hts hts -kLI -kLI +vKm +oXy oXy oXy oXy @@ -34560,8 +36979,8 @@ oXy oXy oXy oXy -kLI -kLI +mRB +vKm hts hts hts @@ -34598,13 +37017,13 @@ syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +kKF +kKF +kKF +kKF +kKF noL noL noL @@ -34641,17 +37060,17 @@ hts hts hts hts -kLI -kLI -rkw +vKm +vKm +hFr xGo hfU hfU hfU hfU hfU -kLI -kLI +vKm +vKm hts hts hts @@ -34743,21 +37162,21 @@ hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm oXy -dbv -dbv +ePY +ePY +ePY ePY ePY ePY oXy oXy -kLI -kLI -kLI +vKm +vKm +vKm hts hts gCv @@ -34781,24 +37200,24 @@ iLu oqD sGG kLd -efa -jXq -jXq -jXq -iLO +fPv +fPv +fPv +fPv +fPv fPv gQA syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +kKF +kKF +kKF +kKF +kKF noL noL noL @@ -34827,27 +37246,27 @@ mRB mRB mRB wvw -hts -hts -gCv -hts -hts -gCv -vdY -clM -clM -smB -smB -xGo +vKm +vKm +rzJ +vKm +vKm +rzJ +bvd +rDc +rDc +rDc +rDc +bvd nus nus aZS aZS hfU -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -34935,29 +37354,29 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm oXy ePY ePY +dak +dak +dak ePY -ePY -ePY -ePY +cXA oXy oXy -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm xph dCI dCI @@ -34975,24 +37394,24 @@ gpN gpN qKz lDd -iKv +kMJ lBS wlk xQO -rQb +qLg ilF waS syq noL noL noL -noL -noL +kKF +kKF noL iIR noL -noL -noL +kKF +kKF noL noL noL @@ -35021,29 +37440,29 @@ rff qWl qWl mRB -kLI -kLI -kLI -kLI -kLI -kLI -vdY -xrg -pWd -pWd -fPt -xGo +vKm +vKm +vKm +vKm +vKm +vKm +bvd +pTm +pTm +pTm +sAw +bvd nus nus ncT rvh hfU -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -35127,37 +37546,37 @@ hts hts hts hts -kLI -arg -kLI -kLI -kLI -kLI -kLI -kLI +vKm +rPB +vKm +vKm +vKm +vKm +vKm oXy ePY ePY -ePY -ePY -ePY -ePY -ePY +cVE +cVE +cVE +cQp +cXA +cXA oXy oXy -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm cRq cRq cRq cRq kao -kao +rMO kao eFZ tUW @@ -35169,24 +37588,24 @@ xul gpN lNG gpN -rQb +qLg dXk mYP ddw -cXM -fhR +aNn +oIy jVG syq noL noL noL +kKF +kKF noL noL noL -noL -noL -noL -noL +kKF +kKF noL noL noL @@ -35215,31 +37634,31 @@ rff rff rff mRB -kLI -kLI -kLI -kLI -kLI -kLI -vdY -esP -esP -esP -esP -xGo +vKm +vKm +vKm +vKm +vKm +vKm +bvd +fPT +fPT +fPT +fPT +bvd nus nus xvv rvh hfU -kLI -kLI -kLI -kLI -kLI -kLI -arg -kLI +vKm +vKm +vKm +vKm +vKm +vKm +rPB +vKm hts hts hts @@ -35321,14 +37740,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +oXy oXy oXy iuS @@ -35350,7 +37769,7 @@ cRq qBx qBx cRq -gun +hyG uSB aUT bTC @@ -35363,24 +37782,24 @@ roN pDF lNG iXE -rQb +qLg wzE dCk szC -rQb -hPD +qLg +kUZ waS syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +pwr +pwr +pwr +kKF +kKF noL noL noL @@ -35415,25 +37834,25 @@ hfU hfU hfU xGo -xGo -esP -esP -esP -dPW -xGo -xGo -xGo +bvd +fPT +fPT +fPT +sij +bvd +bvd +bvd hfU ujj hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -35515,14 +37934,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oXy cVE cVE @@ -35536,15 +37955,15 @@ cVE cVE cVE cVE -hrE -cRq +cVE +bbH lve rlo lve kEj mTI -cRq -pHj +oRM +bTC bTC uOj mqg @@ -35557,24 +37976,24 @@ hWE iaC eEb iaC -mcO +jUH mHg aZs szC -rQb -hPD +qLg +cjM waS syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +erC +gTG +kwG +kKF +kKF noL noL noL @@ -35608,26 +38027,26 @@ shT shT shT shT -xGo -esP -esP -esP -esP -bFQ -aYx -xbe -xGo shT -aZS +bvd +fPT +fPT +fPT +htd +nby +kbE +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -35709,14 +38128,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -wwj +ofc +mym +eoW +vKm +vKm +vKm +vKm +lLe oXy lrZ lrZ @@ -35737,13 +38156,13 @@ lve lve gnl fVM -rnN +tGm pwZ pwZ ehX aHa dDV -pAg +fWj fPv dKT oqD @@ -35751,24 +38170,24 @@ vyK woS kxi gxE -iKv +kMJ lBS mYP szC -rQb +qLg ilF waS syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +iCV +dQo +iCV +kKF +kKF noL noL noL @@ -35802,26 +38221,26 @@ shT shT shT shT -xGo -esP -esP -esP -esP -bFQ -aZS -aZS -xGo shT -aZS +bvd +fPT +fPT +fPT +htd +tHq +tHq +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -35901,16 +38320,16 @@ hts hts hts hts -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm ryc bUF pSb @@ -35924,7 +38343,7 @@ ryc ryc ryc lrZ -cVE +hrE cRq lve ksF @@ -35935,21 +38354,21 @@ cRq gcG tFZ nXu -wgQ +olX gvq skY -tDB +oMs ajq dpw dpw dhN dhN fsp -efa -jXq -jXq -cGZ -uvN +fPv +nlD +nlD +wpK +fPv fPv tjj syq @@ -35959,7 +38378,7 @@ noL noL noL noL -noL +jIa noL noL noL @@ -35996,28 +38415,28 @@ shT shT shT shT -xGo -esP -esP -esP -esP -nOs -hIq -hIq -xGo shT -aZS +bvd +fPT +fPT +fPT +ugP +oSI +oSI +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm hts hts hts @@ -36093,18 +38512,18 @@ hts hts hts hts -kLI -arg -arg -arg -aPO -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +rPB +rPB +rPB +dub +mym +eoW +vKm +vKm +vKm +vKm +vKm ryc icy nEZ @@ -36130,9 +38549,9 @@ auf mmI syd lVX -flT +hxr nXu -abD +yaL crM vyK gRY @@ -36153,7 +38572,7 @@ noL noL noL noL -noL +jIa noL noL noL @@ -36190,30 +38609,30 @@ shT shT shT shT -xGo -esP -esP -esP -esP -bFQ -aYx -xbe -xGo shT -aZS +bvd +daV +fPT +fPT +htd +nby +kbE +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -rAX -arg -arg -arg -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +jDW +rPB +rPB +rPB +vKm hts hts hts @@ -36286,21 +38705,21 @@ hts hts hts hts -kLI -tAx -gZu -gZu -gZu -gZu -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +ofc +mym +mym +mym +mym +mym +eoW +vKm +vKm +vKm +vKm +vKm ryc -mHn +kkh drT drT drT @@ -36346,9 +38765,9 @@ jne jne jne omU -xCL -hvD -lBV +qin +moR +tvX omU jne jne @@ -36378,37 +38797,37 @@ nbh nbh nbh rff -shT -shT -shT -xGo -xGo -xGo -xGo -vdd -esP -esP -esP -bFQ -aZS -aZS xGo +kRb +bvd +bvd +bvd +bvd +bvd +lHW +fPT +fPT +fPT +htd +tHq +tHq +bvd +shT shT -aZS hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -kLI -kLI -kLI -kLI -xQM -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +vKm +vKm +vKm +vKm +eoW +vKm hts hts hts @@ -36480,19 +38899,19 @@ hts hts hts hts -kLI -tAx -kLI +vKm +ofc +vKm mRB mRB mRB -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -36535,19 +38954,19 @@ fBh eJd hNA omU -rUM -rbI -rbI -lbA -yfZ -tfY -hZL -ecQ -dBM -hxh -rbI -rbI -iSI +nAg +nAg +nAg +nAg +nAg +qLW +qLW +qLW +nAg +nAg +nAg +nAg +nAg omU rff rff @@ -36574,35 +38993,35 @@ nbh rff shT shT +bvd +bvd +bNB +nhc +wxB +nUU +fPT +fPT +fPT +ugP +oSI +oSI +bvd shT -xGo -jsE -kwJ -rhD -qvm -esP -esP -esP -nOs -hIq -hIq -xGo shT -aZS hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym mRB mRB mRB -kLI -xQM -kLI +vKm +eoW +vKm hts hts hts @@ -36674,19 +39093,19 @@ hts hts hts hts -frk -tAx -xHy +qGi +ofc +qZR mRB mRB mRB -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -36729,19 +39148,19 @@ enT xbl hNA omU -pAl -xEQ -kRZ -tEJ -jCF -bvR -tWx -xgN -eim -myX -kts -vNN -pAl +nAg +nAg +nAg +nAg +nAg +qLW +qLW +qLW +nAg +nAg +nAg +nAg +nAg omU aTO gyB @@ -36768,35 +39187,35 @@ nbh rff shT shT +cCP +wxB +wxB +wxB +wxB +nUU +fPT +fPT +fPT +htd +nby +kbE +bvd shT -xGo -rhD -rhD -rhD -qvm -esP -esP -esP -bFQ -aYx -xbe -xGo shT -aZS hfU -ddu -kLI -kLI -kLI -kLI -tAx -gZu +sBk +vKm +vKm +vKm +vKm +ofc +mym mRB mRB mRB -xHy -xQM -frk +qZR +eoW +qGi hts hts hts @@ -36868,19 +39287,19 @@ hts hts hts hts -kLI -wwj +vKm +lLe mRB mRB mRB mRB -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -36922,20 +39341,20 @@ yiN omJ omJ iuP -tFq -dvx -rrh -hfT -ids -isE -jNh -vbs nAg nAg -kyt -fPr -vNN -pAl +nAg +nAg +nAg +nAg +qLW +qLW +qLW +nAg +nAg +nAg +nAg +nAg omU psS dth @@ -36960,37 +39379,37 @@ nbh nbh nbh rff -rnV -wvD -rnV -uuj -qNn -rhD -rhD -qvm -esP -esP -esP -bFQ -aZS -aZS -xGo shT -aZS +shT +smF +mQJ +wxB +wxB +wxB +nUU +fPT +fPT +fPT +htd +tHq +tHq +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym mRB mRB mRB mRB -ddu -kLI +sBk +vKm hts hts hts @@ -37062,19 +39481,19 @@ hts hts hts hts -kLI -kLI -kLI -tAx +vKm +vKm +vKm +ofc bRO bRO -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37112,24 +39531,24 @@ dpw gNi uuP xIk -fPv -fPv -fPv -tjj +xmY +xmY +pmC +hNA omU -eDq -pYr -qJE -sWo -pJy -vbs -vbs nAg nAg -kyt -kts -cYe -eqp +nAg +nAg +nAg +qLW +qLW +qLW +nAg +nAg +nAg +nAg +nAg omU tJA cPJ @@ -37155,36 +39574,36 @@ nbh nbh rff shT -aZS -iqj -xGo -rhD -rhD -rhD -qvm -esP -esP -esP -cqf -pWd -pWd -xGo shT -aZS +bvd +vng +wxB +wxB +wxB +nUU +fPT +fPT +fPT +lgF +pTm +pTm +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym bRO bRO -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -37257,18 +39676,18 @@ hts hts hts hts -kLI -kLI -kLI -cIh -lwH -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +pAq +czO +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37305,25 +39724,25 @@ sUy xhN tAC pCT -ndd -fPv -ujx -wxe -jOK +pCT +pCT +pCT +pCT +iDb mTs -izw -yau -eaA -pBk -mNs -nVV -nVV -cMd -bko -ncv -aZv -fPr -wgu +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc mTs rff rff @@ -37349,35 +39768,35 @@ jkA jkA jkA shT -aZS -aZS -xGo -qsE -rhD -rhD -qvm -esP -esP -esP -esP -esP -esP -qst shT -aZS +bvd +bvd +rog +wxB +wxB +nUU +fPT +fPT +fPT +fPT +fPT +fPT +sGD +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -37453,16 +39872,16 @@ hts hts hts hts -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37495,35 +39914,35 @@ rOQ xDQ tuY auf -uxJ -apO +bDR +wGk fPv +wGH +cfB +xmY +drO +xmY xmY -sOR -kmO -wUD -iFi -jbW omU -gUL -leE -kRZ -wXN -eLG -ecD -yjG -gMD -nMW -ncv -aZv -kts -dvx +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc omU jAi +jQG +jQG jAi jAi -jAi -dzO qhn jAi jAi @@ -37544,32 +39963,32 @@ rLB jkA hwK shT -aZS -xGo -efP -rhD -rhD -xGo shT +bvd +sNL +wRd +hPe +bvd +ish +ish +bvd +fPT +fPT +qyN +bvd shT -xGo -xev -xev -xev -xGo shT -aZS hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm hts hts hts @@ -37649,14 +40068,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37690,34 +40109,34 @@ eec tuY auf xif -gWV +isz pjR pjR pjR pjR pjR pjR -vrI +iFH +omU +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc omU -pAl -fZM -xDN -xnG -enP -cel -tKq -nsB -nMW -ncv -fZM -fZM -pAl -bgx -dzO -dzO -dzO -dzO -dzO +jAi +jAi +jQG +jQG +jAi qhn jAi jAi @@ -37738,30 +40157,30 @@ lue jkA ovL shT -aZS -xGo -oEw -rhD -rhD -xGo -fhh -fhh -xGo -xev -xev -xev -xGo shT -aZS -hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +bvd +pDC +mAe +wxB +bvd +mXP +mXP +bvd +qyN +qyN +qyN +bvd +shT +shT +tIM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -37843,14 +40262,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37866,8 +40285,8 @@ bFb lrZ tsq oXy -dLj -dLj +buy +buy auf mhV dxM @@ -37893,25 +40312,25 @@ jQI jQI iKN omU -kYR -cjl -iHp -msY -obo -cuj -lYe -rqz -pvT -cjy -iAz -lTE -rGD +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc omU -kJt +cbf kJt kJt jld -dzO +jAi qhn jAi jAi @@ -37932,30 +40351,30 @@ sJz tHF shT shT -aZS -xGo -xGo -nZz -xGo -xGo -xGo -xGo -xGo -xGo -xGo -xGo -xGo shT -aZS -hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +bvd +bvd +bZe +bvd +bvd +bvd +bvd +bvd +bvd +bvd +bvd +bvd +shT +shT +tIM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -38038,13 +40457,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -38059,7 +40478,7 @@ drT bFb lrZ tsq -dNh +eMX cVE cVE pan @@ -38076,36 +40495,36 @@ pnB qFk lOr dkK -tgk +lgP kJz xlx mJP -bfR +sGM mJP lGK nAL nAL nAL -mXz -iCx -tyE -iCx -iCx -iCx -wHz -whG -kgy -vaM -wri -nEi -rpC -kXX +iFd +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW vKx hBq iVk mNW jld -dzO +jQG rff rff rff @@ -38126,11 +40545,12 @@ jkA jkA pXJ jlk -aZS shT shT shT +kjL shT +rnV shT shT shT @@ -38140,15 +40560,14 @@ shT shT shT shT -aZS -hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +tIM +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -38232,13 +40651,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm ryc pSb pSb @@ -38270,36 +40689,36 @@ llj eNA gBO nrW -ePh +yjA kVy rHv ixz -iQX +lRt ixz cKk wVC wVC wVC -ply -vTY -dEW -dzY -dzY -dzY -dzY -dzY -dzY -ssU -lGc -cem -lGc -fhP +ncI +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW wJT bYT lfF mNW jld -dzO +jQG rff nbh nbh @@ -38319,30 +40738,30 @@ jkA kbd aJt wHw -soX -lqW -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +xAg +hQA +oON +oON +pqj +shT +xce +shT +shT +shT +shT +shT +shT +shT +shT +shT +tIM +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -38412,7 +40831,7 @@ qVH qVH qVH qVH -hUP +qVH qVH qVH qVH @@ -38426,13 +40845,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -wwj +mym +eoW +vKm +vKm +vKm +vKm +lLe oXy peC cVE @@ -38475,25 +40894,25 @@ oXm paQ pHd omU -xOH -gAE -sjh -jKM -nAg -wXk -oIq -oIq -wzJ -hrw -dmG -mfL -mfL +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc kJt xST hzI bxr jld -dzO +jAi rff nbh foH @@ -38513,9 +40932,9 @@ jkA lRb abe fln -ngr -kdF -shT +uxL +jsw +xSD aCf aCf aCf @@ -38525,18 +40944,18 @@ aCf aCf aCf aCf -shT -shT -shT -shT +rnV +uIn +rnV +rnV hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -38609,7 +41028,7 @@ qVH qVH qVH qVH -vfp +qVH qVH qVH qVH @@ -38620,13 +41039,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE lBh @@ -38669,25 +41088,25 @@ nrV hwP cvs hwP -ajf -lfj -jaD -nAg -nAg -nMW -nAg -wVi -eim -efN -dhE -fvA -fvA +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc kJt xST lfF cex jld -dzO +jAi rff nbh foH @@ -38707,9 +41126,9 @@ uSp kqs pVX fln -aZS -kdF -shT +wkd +stq +stV aCf qiF ldU @@ -38724,13 +41143,13 @@ shT shT shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -38810,17 +41229,17 @@ qVH qVH qVH qVH -hzP +qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE wNo @@ -38854,34 +41273,34 @@ auf auf auf jcQ -xMu +wUu nrV -yao -eys -mlT +gKU +sxb +eIq hwP qUy kFX hwP -vFn -nIY -fNz -npA -bcv -xNq -beG -sPg -owx -ijL -eWH -eQw -sIT +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc kJt tef djS cex jld -dzO +jQG rff nbh foH @@ -38900,10 +41319,10 @@ rff var var ctf -dzg -gVs -kdF -shT +sFS +hmW +vGC +stV aCf aqm kuk @@ -38918,13 +41337,13 @@ shT shT shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39008,13 +41427,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE uno @@ -39050,24 +41469,24 @@ auf txH rHv nrV -yao -kbz -yao +gKU +npE +gKU hwP dIR kFX hwP hwP hwP -wHS -wHS +nAg +nAg bYA wXn riA kld bYA -wHS -wHS +nAg +nAg kJt kJt kJt @@ -39075,7 +41494,7 @@ kwQ mJl kJt jld -dzO +jQG rff nbh nbh @@ -39095,9 +41514,9 @@ fln fln fln fln -gnF -kdF -hwK +sHd +vGC +wUv aCf oDu eqt @@ -39112,13 +41531,13 @@ shT shT shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39189,10 +41608,10 @@ qVH qVH qVH qVH -tQB qVH qVH -mcq +qVH +qVH qVH qVH qVH @@ -39202,13 +41621,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE nVq @@ -39244,24 +41663,24 @@ auf txH rHv nrV -yao -kbz -yao +gKU +npE +gKU hwP jqO dzA ndO kFX hwP -gws -gws +wjy +wjy bYA oSs itl -xOd +hkN bYA -gws -gws +wjy +wjy kJt pbe wDx @@ -39269,7 +41688,7 @@ aPL bYL kJt jAi -dzO +jAi rff rff rff @@ -39286,19 +41705,19 @@ fnJ rff rff nZS -gVo +uLw vgw -rnV -gnF -wMZ -ovL +wkd +eKS +kYE +rGp aCf dGb dEB dZB pWw mtY -fyw +qho aGz aCf shT @@ -39306,13 +41725,13 @@ shT shT shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39396,13 +41815,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE nWF @@ -39438,53 +41857,53 @@ auf mkv lXM nrV -yao -kbz -yao +gKU +npE +gKU hwP lSi daw ksv kFX hwP -gws -gws +wjy +wjy bYA aoA ifJ xOd bYA -gws -gws +wjy +wjy kJt jis asi uxC -lfF +ihz kJt jAi -dzO jAi +jQG +uWc +jQG jAi -jpB -xAr -xAr -xAr -xAr -xAr -jpB -ppx +jAi +jQG +gYx +wGw shT +ppx +wGw nZS -tpX +vaE mzh bnD nZS -rvh -bJG -rnV -gnF -bqw +shT +shT +hyW +okI +tbl etU aCf aCf @@ -39500,13 +41919,13 @@ ijk ijk ijk ijk -ddu -kLI -kLI -kLI -kLI -tAx -gZu +sBk +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39590,13 +42009,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm oXy peC cVE @@ -39632,41 +42051,41 @@ auf txH gTt nrV -yao -kbz -yao -hpx +gKU +npE +gKU +bPe eUN eUN oDI eUN eUN -gws -gws +bYA +bYA bYA kbG ydo xyL bYA -gws -gws +bYA +bYA kJt pIo wDx aPL cGR kJt +jQG jAi -dzO jAi +jQG jAi -jpB -xAr -xAr -xAr -xAr -xAr -jpB +jAi +jAi +jAi +mWg +shT +shT xpc obk mth @@ -39675,16 +42094,16 @@ cHo lsz nZS rvh -gUS -rnV -gnF -bqw +xHX +hyW +okI +tbl tZE -msO -msO -mpi -ltv -msO +hyB +fjv +smc +gNs +sKe ijk xAV bvX @@ -39694,13 +42113,13 @@ pMy pMy wxo ijk -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39783,14 +42202,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm iVy bKM bKM @@ -39826,10 +42245,10 @@ auf pXq tql nrV -yao -kbz -yao -yao +gKU +npE +gKU +kjN eUN rms avr @@ -39850,18 +42269,18 @@ cXL xpI qLV kJt -dzO -dzO jAi jAi -jpB -xAr -xAr -xAr -xAr -xAr -jpB -gdv +jAi +jAi +jQG +jQG +jQG +jAi +gYx +wGw +shT +azv vgw nZS nVN @@ -39869,16 +42288,16 @@ wji lHN nZS rvh -gUS -rnV -gnF -bqw +qdz +hyW +okI +tbl tZE -msO -msO +tGN +rLJ bok rzN -msO +uok hwB qKL mtg @@ -39887,15 +42306,15 @@ uZc paM rTB sEJ -tZt -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +xTR +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -39977,14 +42396,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40020,76 +42439,76 @@ mcA mlD ojQ fLl -eId -hxn -eId -xeg +tgi +tfk +tgi +jwx peH vMk xRn vel aAi -pFp -dAZ -dAZ -haR iQH -vPn -cDO -cDO -ttP +iQH +iQH +iQH +iQH +iQH +iQH +iQH +iQH uLY wTg cXL fgg cms kJt -dzO -jAi jAi +jQG +jQG diA -jpB -xAr -xAr -xAr -xAr -xAr -jpB -gdv -shT +bHf +bHf +bHf +bHf +bHf +bHf +bHf +fTu +iZA nZS rxM xyM axC rTt -hrN -iVU -rnV -gnF -bqw +oON +uHC +hyW +okI +tbl tZE -msO +kPL xZK msO jJr -ycI +jeF aRM cdl -qZQ +cyN bRB bRB fVb hfD jUK -tZt -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +xTR +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -40171,14 +42590,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40214,76 +42633,76 @@ lkO qAa ixz nrV -yao -vwy -yao -cdR +gKU +xdH +gKU +hEk eUN woB xsn hHh eUN -ilv -pDX iQH iQH iQH iQH iQH -dIk -mTG +iQH +iQH +iQH +iQH kJt wNI cXL fgg -drX +kse kJt -dzO jAi +jQG jAi qcp -jpB -xAr -xAr -xAr -xAr -xAr -jpB -gdv -shT +bHf +xSM +xSM +xSM +xSM +hPN +bHf +qXj +fLD nZS nZS cYp nZS nZS -fin -rnV -rnV -gnF -qWL +lGC +shT +hyW +okI +qRu brK -jFh +xlV bYF jFh dty -msO +uok hwB gmB -wEF -adh +iHR +wcZ adh eiu aJB tiG -tZt -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +xTR +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -40357,7 +42776,7 @@ qVH qVH qVH qVH -kMV +qVH qVH qVH qVH @@ -40365,14 +42784,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40406,12 +42825,12 @@ quZ sEd auf fCn -lRt +xZI nrV nrV nrV nrV -sQX +mdo eUN eUN mnS @@ -40430,37 +42849,37 @@ kJt clm aMX nER -drX +pXb kJt -dzO jAi jAi jAi -qJq -xAr -lDf -lDf -lDf -lDf -bBB -htL -aZS -aZS -aZS -gnF -wvD -aZS +jQG +nUf +xSM +eIY +eIY +eIY +eIY +kAn +bly +shT +cWx +shT +rTX +fin rvh -oxr -rnV -gnF -fTN +rvh +rvh +hyW +okI +ylP tZE -msO -msO -msO -msO -msO +lFB +nVt +nVt +nVt +jxe ijk qAb rSo @@ -40470,14 +42889,14 @@ jbn fTt cRV ijk -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -40559,14 +42978,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40604,7 +43023,7 @@ ixz xbt aOu meU -uVR +xWZ lRq jLd tTR @@ -40630,48 +43049,48 @@ xxd qhn qhn qhn -jpB -nnS -dKZ -rHE -nnS -nnS -jpB -cxb -aUW -aUW +bHf +tNW +opW +wpT +tNW +tNW +bHf +bgi +tXY +tXY aUW -ugw +pvE rnV -shT -rvh -oxr -rnV -gnF -fTN +kEG +kEG +yih +hyW +okI +ylP tZE -aGV -kRX +skX +fco lGa lGa -wmZ -ggB -ggB -ggB -ggB -ggB -ggB -ggB -ggB +elt +xgx +xgx +xgx +xgx +xgx +xgx +xgx +xgx tZE -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -40740,7 +43159,7 @@ qVH qVH qVH qVH -gVq +qVH qVH qVH qVH @@ -40753,14 +43172,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40795,9 +43214,9 @@ xyA auf flh lAk -gXg -nyY -nyY +vTN +kKM +xnP jQs ntJ nyY @@ -40824,31 +43243,31 @@ soJ soJ soJ lmj -jpB -wyS -vzd -nnS -bRO -bRO +bHf +met +cnR +tNW +atT +atT nqm -rdw +fmu myY myY myY myY myY -rnV -rvh -oxr -rnV -gnF -fTN +nus +nus +gda +xCl +dhO +wHc tZE dAc -sDQ +tDN lGa lGa -oPE +vtK kna kna kna @@ -40858,14 +43277,14 @@ kna kna kna tZE -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -40947,14 +43366,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -41018,31 +43437,31 @@ uJy fUA soJ tDw -jpB -lOw -vzd -nnS -bRO -bRO +bHf +dgx +cnR +tNW +atT +atT nqm -eNz +ksY kIW shw -iuv +sHi wSR myY rnV -wvD rnV rnV -rEj -uWe +rnV +gnF +lWu tZE -uXg -unL +jeG +ghe lGa -mTO -pkd +vbk +qYj kna kna kna @@ -41052,14 +43471,14 @@ kna kna kna tZE -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -41141,14 +43560,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -41183,9 +43602,9 @@ xyA auf puk ixz -gXg +vTN oom -nyY +kKM jQs xRc xRc @@ -41212,48 +43631,48 @@ xmm sMK soJ hDF -jpB -lOw -eGt -rHE -upx -upx +bHf +dgx +rjq +wpT +iSi +iSi nqm -bwl +xCj uBC fLW fZO gsZ myY +pQZ +nuZ +lhv shT -aZS -shT -shT -gnF -fTN +rTX +uOT tZE -xxt -dDH +wkt +wNe lGa -rrl -deT +wVB +sQC +kna +kna +kna +kna +kna kna kna kna -tAE -tAE -tAE -tAE -tAE tZE -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -41335,14 +43754,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -41387,7 +43806,7 @@ tTR cFL nvh nvh -nvh +epq cCG nvh nvh @@ -41406,48 +43825,48 @@ ctR sMK soJ ney -jpB -lOw -lXU -lGl -gwH -xAr +bHf +dgx +smn +aLf +kkK +xSM nqm -uaa +sZm pLu iQr lZt nlH vxW -aZS -aZS -fds -iHb -odQ -fTN +shT +shT +oIf +aUW +pvE +npw tZE dAc -sDQ +tDN lGa lGa -oPE +vtK kna kna bkS -uuW -uuW -uuW -uuW -uuW +hvv +hvv +hvv +hvv +hvv ved -ddu -kLI -kLI -kLI -kLI -tAx -gZu -xQM +sBk +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -41528,17 +43947,17 @@ hts hts hts hts -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm iVy -mlH +yhd iUx iUx iUx @@ -41562,13 +43981,13 @@ nqE rxB wbQ pjR -wNw -vEr +jki +gmS lxV vEr vEr -xXi -vEr +swV +gmS fDs ixz awY @@ -41579,9 +43998,9 @@ aXz awY awY kIF -hpx -hpx -hpx +jaI +jaI +jaI hBz nUo xnp @@ -41600,14 +44019,14 @@ xmm sMK soJ tDw -jpB -boQ -hCY -ovx -uXF -xAr +bHf +pPJ +lNs +fRS +nRr +xSM nqm -fHl +dqD hav qFG liX @@ -41615,34 +44034,34 @@ gsZ myY hwK kFe -hWL -cpo -cpo -jrG +trO +jkO +axF +ajv tZE -pPg -ekM +btR +nnU lGa lGa -qJg -deT -deT +guE +sQC +sQC bkS wTj dcQ ncb ncb wTj -vXA -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI +jHP +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm hts hts hts @@ -41721,16 +44140,16 @@ hts hts hts hts -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm iVy wVH pKc @@ -41773,9 +44192,9 @@ ljK cvx fuZ kIF -mlT -tzO -yao +krR +udR +jub hBz cCV iPW @@ -41794,14 +44213,14 @@ hhl rJK soJ dxw -jpB -boQ -lDf -mZy -lDf -nnq +bHf +pPJ +eIY +oav +eIY +eIY nqm -tlJ +xBf kIW sSQ jKS @@ -41809,35 +44228,35 @@ fvh myY ovL shT -gnF +rTX shT -aZS -bbG +shT +ddd uFy -wbl -mas -wbl -kZx -wbl -ham -wbl -hdn +ocq +qtv +tSz +nSe +tSz +adg +opl +iaM lte vxt cJP nhm fNq -vXA -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI +jHP +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm hts hts hts @@ -41914,17 +44333,17 @@ hts hts hts hts -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -wwj +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +lLe iVy uBb iVy @@ -41967,9 +44386,9 @@ pyl mQU sha rCm -aMD -qXs -yao +xtN +cIS +iEj hBz tVu wld @@ -41988,14 +44407,14 @@ gYx gYx xxd gYx -jpB -iSG -ovx -ovx -ovx -iSG +bHf +cAp +fRS +fRS +fRS +cAp nqm -rdw +fmu myY qxG qxG @@ -42003,36 +44422,36 @@ qxG qxG qxG kSv -gnF +mHL shT -cao -hlM +vgs +isO tZE -msO -aAa -hLM -rHm -msO -gvi -msO -uNG +lFB +hBY +glF +peI +nVt +iyA +jxe +bTi mVP uoI swF wTj kyU -vXA -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI +jHP +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm hts hts hts @@ -42107,18 +44526,18 @@ hts hts hts hts -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm mRB sBK fPn @@ -42168,36 +44587,36 @@ hBz roP uMG hkt -bKa +wxM igT hBz gqJ qDW -eDU +cYd hBz gYx uUB gYx cDr jAi -dzO jAi -jpB -btP -ovx -ovx -ovx -bsV -oSm -rFX jAi +bHf +fMi +fRS +fRS +fRS +cPe +oSm +kto +pkv qxG noz vPo bqH jhI wVK -gnF +rTX eIB sTq eIB @@ -42216,18 +44635,18 @@ czQ wTj ekQ ved -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -42301,18 +44720,18 @@ hts hts hts hts -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -fkK -kLI -kLI -fkK +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +rzJ +vKm +vKm +rzJ mRB sBK fPn @@ -42369,29 +44788,29 @@ hBz hBz hBz hBz -jAi -rDa +jQG +sya jAi cDr +jQG +jQG jAi -dzO -jAi -oSm -jpB -ovx -ovx -ovx -jpB -jAi -ksw -jAi +bHf +bHf +fRS +fRS +fRS +bHf +jkG +pIY +mPq qxG eyf eyf nOP jhI nPx -ebD +ydQ jDN iZH nob @@ -42408,20 +44827,20 @@ ecR sCZ lmf wTj -gGP +kcK ved -kLI -kLI -fkK -kLI -kLI -uuF -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +rzJ +vKm +vKm +lBm +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -42495,20 +44914,20 @@ hts hts hts hts -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm mRB -sBK +mSD fPn fPn fPn @@ -42533,7 +44952,7 @@ svk jNj pjR qYd -lRt +fhw awY tsZ kwz @@ -42549,43 +44968,43 @@ oIC uAp ppP kIF -tAZ +mka qPE kwq -bHV -wRy -wRy -jfs -jfs -jfs -jfs -vvd -ong -mFc -ong -ong -dwx -jAi +xPH +vGS +vGS +bWe +bWe +bWe +bjg +pSH +bWe +rnh +bWe +ajA +cSC +skE cDr cDr -dzO +jAi cDr cDr -jpB -arp -arp -arp -jpB -jAi -ksw -jAi +bHf +hCI +hCI +hCI +bHf +jkG +pIY +pkv qxG nEw tUp tUp vXZ aUW -hwE +dFa eIB lwa rau @@ -42601,21 +45020,21 @@ egw bkS gOn czQ -kKY -vbm +fMU +ogY ved -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -42689,18 +45108,18 @@ hts hts hts hts -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm mRB wxx fPn @@ -42713,8 +45132,8 @@ oXy oXy oXy iuS -cYP -vds +bBn +eBZ spD gfJ kds @@ -42726,7 +45145,7 @@ giW otA jUp pjR -eZu +waT lAk awY jyk @@ -42752,34 +45171,34 @@ aNZ cDr cDr cDr -jAi -cSw -jAi +jQG +fre +jQG gYx jAi -jAi -rDa +oEa +sya rNk jAi jAi -dzO jAi jAi -jpB -jpB -jpB -jpB -jpB -jAi -pzb -skE +jQG +bHf +bHf +bHf +bHf +bHf +jQG +tiT +mvB qxG mQu eyf jAm jhI uNy -gnF +mHL eIB lHZ oZX @@ -42795,21 +45214,21 @@ fFn bkS qlL czQ -wTj -swr +qIo +ogY ved -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -42883,12 +45302,12 @@ hts hts hts hts -frk -kLI -kLI -vBY -gZu -gZu +qGi +vKm +vKm +rod +mym +mym wvw mRB mRB @@ -42946,36 +45365,36 @@ aNZ jAi jAi cDr -jAi -cSw -jAi +cag +jZU +skE gYx jAi -jAi -rjo -ong -ong -ong -ong -ong -ong -ong +jQG +dzl +kfR +kfR +kfR +kfR +kfR +kfR +kfR mFc -ong -ong -ong -ong -dsx -jAi +kfR +kfR +kfR +kfR +kNk +pkv qxG jnB lXi eXH jhI wVK -gnF +rTX eIB -dOK +bwE ayZ vhb jyZ @@ -42989,8 +45408,8 @@ yev ecR nIA czQ -wTj -swr +qIo +ogY ved mRB mRB @@ -42998,12 +45417,12 @@ mRB mRB mRB wvw -gZu -xQM -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -43077,12 +45496,12 @@ hts hts hts hts -kLI -kLI -kLI -qkZ -kLI -kLI +vKm +vKm +vKm +lPW +vKm +vKm mRB yao yao @@ -43119,7 +45538,7 @@ tbY awY oho uAp -pBm +iZR uAp uAp fZK @@ -43138,10 +45557,10 @@ hKI kcY aNZ jAi -jAi +jQG cDr jAi -cSw +fre gYx gYx jAi @@ -43153,21 +45572,21 @@ iow gvU jAi jAi -jAi +jQG gYx -jAi -jAi -jAi -jAi -ksw -jAi +jQG +tvs +jQG +jkG +pIY +pkv qxG qxG qxG qxG qxG nPx -gnF +rTX eIB eIB eIB @@ -43192,12 +45611,12 @@ yao yao yao mRB -gZu -xQM -kLI -kLI -kLI -frk +mym +eoW +vKm +vKm +vKm +qGi hts hts hts @@ -43271,12 +45690,12 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -uIA +vKm +vKm +vKm +vKm +vKm +atk mRB yao yao @@ -43308,21 +45727,21 @@ spD qNJ qNJ pjR -uSP -uIm +fYL +fhw kIF oho -uAp +jAO ldT uAp -uAp +uHU fZK awY hYN wEX -txn -txn -txn +eCF +gQG +gnc uml kIF oTN @@ -43334,11 +45753,11 @@ dfM gYx gYx gYx -jAi -cSw +gRp +fre gYx -jAi -jAi +jQG +jQG jAi gvU vQk @@ -43346,27 +45765,27 @@ vQk vQk gvU jAi -jAi -jAi +hVJ +jQG gvU gvU gvU gvU gvU -kIR -jfs -jfs -jfs -iai -jfs -kiZ -mAp -ltf -mAp -nIZ -pfp -mEH -jcG +eTi +iwg +iwg +iwg +fhm +iwg +thm +ecl +ccp +ecl +bDW +cnC +maO +jFG eCL uwA pAL @@ -43386,12 +45805,12 @@ yao yao yao mRB -fjG -xQM -kLI -kLI -kLI -kLI +rRN +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -43465,12 +45884,12 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -gZu +vKm +vKm +vKm +vKm +vKm +mym mRB yao yao @@ -43489,7 +45908,7 @@ rQs sAF rQs rQs -nfh +sBK ite spD fkE @@ -43510,15 +45929,15 @@ uXA kIF kIF kIF -hpx -hpx -hpx -hpx -hpx -hpx -hpx -hpx -hpx +vYm +vYm +vYm +vYm +vYm +vYm +vYm +vYm +jld aNZ aNZ oPM @@ -43528,8 +45947,8 @@ gpj gpj gpj gvU -jAi -cSw +jQG +gBd gvU gvU gvU @@ -43544,21 +45963,21 @@ gvU gvU gvU oQN -srv +woO caV gvU -ksw -dzO -dzO -mWI -xtB -cef -tPM +pIY +pkv +pkv +aHc +otM +dPy hrN -wXO -aZS -xhy -aZS +dLS +drc +shT +emf +shT mPs mOG eCL @@ -43567,7 +45986,7 @@ bjJ sfY uqo hNo -rIU +qsD lKt piC sUJ @@ -43580,12 +45999,12 @@ yao yao yao mRB -gZu -xQM -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -43659,12 +46078,12 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -gZu +vKm +vKm +vKm +vKm +vKm +mym mRB yao yao @@ -43673,7 +46092,7 @@ yao yao mRB gMH -sBK +nLf sBK sBK sBK @@ -43704,16 +46123,16 @@ vcx vcx vcx vcx -oDh -bRO -bRO -jJz -jJz -jJz -gTn -oDh -yao -hlI +pvy +qxa +qxa +wyn +wyn +wyn +hWR +pvy +jAi +tnr aNZ aNZ aNZ @@ -43723,9 +46142,9 @@ srv srv gvU diA -cSw +fre gvU -wnR +qoh syt bwD srv @@ -43737,23 +46156,23 @@ srv vQk vQk gvU -leN -srv +rOV +fJQ bBv gvU -iSs -cNF +uyB +ovD hpx azB jBY hpx hpx -shT -kev +wGw +bjf ezZ -xhy -aZS -shT +lwD +wGw +wGw tKc bTb vTG @@ -43761,7 +46180,7 @@ bjJ bjJ ogD mYO -qwk +mkH oZR ehq wTj @@ -43774,12 +46193,12 @@ yao yao yao mRB -gZu -xQM -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -43854,11 +46273,11 @@ hts hts hts hts -kLI -kLI -kLI -kLI -gZu +vKm +vKm +vKm +vKm +mym mRB yao yao @@ -43891,33 +46310,33 @@ bnA mfd cDa hwX -cDa +qks rzn vcx dtC kHU nvX nvX -oDh -bRO -bRO -jJz -jJz -jJz -bTl -oDh -yao -yao -yao -yao -ouC +pvy +qxa +qxa +wyn +wyn +wyn +iUO +pvy +jAi +jAi +jAi +jAi +gla gvU +idZ srv -srv -srv +asH gvU qcp -cSw +fre gvU mGe rDH @@ -43927,26 +46346,26 @@ lbI lbI lbI srv -srv +dVE vQk vQk gvU -srv -srv +fJQ +fJQ dPM gvU -ksw -hVJ +pIY +hCr hpx dUY uMx kIA hpx -shT +naN trt shT -xhy -aZS +emf +wGw shT shT eCL @@ -43968,11 +46387,11 @@ uEG uEG yao mRB -gZu -xQM -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm hts hts hts @@ -44049,10 +46468,10 @@ hts hts hts hts -kLI -kLI -kLI -gZu +vKm +vKm +vKm +mym mRB mRB mRB @@ -44071,8 +46490,8 @@ iow iow iow hiO -wNB -xna +rRh +nyw spD wBB spD @@ -44092,14 +46511,14 @@ gvU gvU gvU ovm -dgp -dgp -dgp -dgp -dgp -qdB -fjJ -dgp +pvy +pvy +pvy +pvy +pvy +axq +dQB +pvy gvU gvU gvU @@ -44111,11 +46530,11 @@ nMN nMN tIW hiO -kuQ +aSD gvU tLh -nMN -qCd +gNb +uIa gvU iow iow @@ -44139,14 +46558,14 @@ hpx rnV rnV rnV -xhy -aZS +lwD +wGw shT shT eCL avX bjJ -iIk +eqK eYO eYO eCL @@ -44162,10 +46581,10 @@ pVJ jRq mRB mRB -gZu -xQM -kLI -kLI +mym +eoW +vKm +vKm hts hts hts @@ -44244,10 +46663,10 @@ hts hts hts hts -kLI -kLI -gZu -gZu +vKm +vKm +mym +mym mRB fPn fPn @@ -44273,7 +46692,7 @@ wmU rLK jPX tMn -tMn +pUm tMn hvm tXx @@ -44281,36 +46700,36 @@ rLK fwa tMn tMn -tMn +pUm tMn tMn jPX rLK gkH rLK -jPX +vRf tMn tMn tMn tMn tMn -jPX +vRf rLK wmU rLK -jPX +vRf tMn tMn tMn tMn tMn -jPX +vRf dGt gkH rLK jPX aiq -tMn +pUm tMn tMn tMn @@ -44318,7 +46737,7 @@ jPX rLK gkH rLK -tMn +pUm tMn tMn jPX @@ -44330,17 +46749,17 @@ qbf wQo dLa hpx -uuJ -uuJ +lWn +vPV rnV -xhy -aZS -aZS -aZS +lwD +shT +shT +wGw eCL avX bjJ -iIk +eqK wrH wrH eCL @@ -44354,11 +46773,11 @@ jRq jRq isl jRq -gZu -gZu -gZu -xQM -kLI +mym +mym +mym +eoW +vKm hts hts hts @@ -44439,9 +46858,9 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm mRB fPn fPn @@ -44461,82 +46880,82 @@ lRo lRo tje sFe -dmh -iDh -kbZ -iDh -ogh -uqO -dmh -paD -gWX -iDh -iDh -wwm -lTg -dmh -rrq -lRo -lRo -eSj -xQB -rXI -xQB -eSj -lRo -lRo -bXU -lRo -lRo -eSj -xQB -xyr -xQB -nxm -lRo -lRo -lRo -lRo -lRo -eSj -bHo -rXI -xQB -eSj -uKw -lRo -lRo -lRo -lRo -eSj -xQB -rXI -nda -aln -aln -aln -aem -rdJ -xhH -mfd +bMm +gDA +sjO +gDA +gye +kEZ +bMm +uXO +hew +gDA +gDA +lwN +bRJ +bMm +akV +lPV +pZC +olw +wPE +xsM +wPE +olw +efy +efy +koc +efy +efy +olw +wPE +tRs +wPE +tMv +efy +efy +efy +efy +efy +olw +qNv +xsM +wPE +olw +ePO +efy +efy +efy +efy +olw +wPE +xsM +wSY +nIp +efy +pZC +pzh +iwO +qQJ +fdX hpx hpx hpx hpx hpx -uuJ +upG uuJ rnV -ctg -geV +emf +smE rnV -aZS +kKX eCL avX bjJ -iIk -iIk -iIk +eqK +eqK +eqK eCL wtk ofM @@ -44548,10 +46967,10 @@ rlB rlB rlB jRq -cIh -cIh -cIh -kLI +pAq +pAq +pAq +vKm hts hts hts @@ -44634,8 +47053,8 @@ hts hts hts hts -kLI -kLI +vKm +vKm mRB fPn fPn @@ -44652,7 +47071,7 @@ sae mfb avx uLA -uLA +auy uLA uLA uLA @@ -44705,24 +47124,24 @@ oFd avx aJU wuo -uAy -khG -nxF -fjK -cAo -aCp +opK +klL +uLA +oFd +avx +hcY dkM nNn gvU uuJ -uuJ -uuJ -uuJ -uuJ -uuJ sEh -qxf -bEC +dbe +upG +upG +kWj +sEh +iqQ +kWj rnV jSU eCL @@ -44742,9 +47161,9 @@ fPm qLr rlB jRq -ddu -kLI -kLI +sBk +vKm +vKm hts hts hts @@ -44848,7 +47267,7 @@ nKv nKv nKv oSA -oSA +wWD nKv gvU gvU @@ -44891,8 +47310,8 @@ nWG gvU iow iow -dMq -dMq +wvJ +giU iow iow mnn @@ -44912,11 +47331,11 @@ gvU gvU hOw hOw -hOw +rcU hOw sEh -qxf -bEC +bzq +kWj rnV qdz eCL @@ -45032,7 +47451,7 @@ aNJ fPn gQr fPn -fPn +esL nKv kgf bYR @@ -45061,10 +47480,10 @@ vCt xLb fhN mYo -cfF -tjx -tjx +vdV +vdV tjx +sVL gvU bnA jES @@ -45096,21 +47515,21 @@ fIB xVE bkV vkg -nGO -mnn +moM +ban bnA aZo iow gpj gpj gvU -uuJ -uuJ -uuJ +igs +kWj +upG uuJ sEh -qxf -bEC +bzq +uuJ rnV rnV eCL @@ -45242,7 +47661,7 @@ tjx bbR sVL tjx -bJc +fhc vzj sWu fcu @@ -45255,17 +47674,17 @@ fUt xLb sbI mYo -cfF -tjx -tjx -tjx +vdV +vdV +evJ +dNP gvU tZY jES mfd pfb hQg -ovT +pmf gvU gvU gvU @@ -45289,7 +47708,7 @@ tQt fkY ubH pFe -pFe +qbb aqF ban bnA @@ -45298,15 +47717,15 @@ iow srv srv gvU -uuJ -uuJ -uuJ -uuJ +xWj +kBu +upG +upG sEh -ymh -ckX +nBB +umO ehF -uuJ +kWj eCL avX avX @@ -45436,12 +47855,12 @@ bbR bbR eap tjx -bJc +qgM vzj fsW tfh vzj -jGc +jmh cpl mYo slU @@ -45449,10 +47868,10 @@ pOf lWm vFK mYo -cfF -tjx -tjx +vmM +vdV tjx +qGZ gvU vSf jES @@ -45485,22 +47904,22 @@ sSU wwN pFe tGo -ban -bnA +mnn +tZY aZo tIW ese -ded +azL gvU -uuJ -uuJ -uuJ +upG +jhY +upG uuJ sEh -qxf -bEC -uuJ +wxJ +kWj uuJ +cTP eCL eCL eCL @@ -45628,9 +48047,9 @@ rlC nKv tjx bbR +tqy tjx -tjx -bJc +fhc vzj vzj mLq @@ -45643,12 +48062,12 @@ kBt sVV sbI mYo -cfF -tjx -tjx +vdV +vdV tjx +qGZ gvU -bnA +hqb qcY mfd nBd @@ -45667,43 +48086,43 @@ seT iow iow iow -dMq -dMq +wvJ +giU iow iow mnn oOf -tNO +rhQ aHb tJE txR -pFe +qbb tGo ban bnA gTr -wmU +hAy dBy mfd gvU +dHa +loy +mqE +sDX +eKE +tUN uuJ uuJ uuJ -uuJ -sEh -qxf -bEC -aRq -aRq -sEh -uuJ -uuJ -uuJ -uuJ -sEh -aZH -aZH -paT +nWv +fpZ +fpZ +xsu +fpZ +fpZ +fpZ +fpZ +xtc kvR aZH aZH @@ -45824,9 +48243,9 @@ boa boa boa boa -uEJ -jBe -cXm +aUX +hvV +wJd gtP bbR bbR @@ -45837,18 +48256,18 @@ uIW xRz bpg mYo -cfF -tjx -tjx -tjx +vdV +vdV +wJo +vvz gvU osL qCd dZc -oDh -nfq -gvk -oDh +qIl +wRs +fnN +qIl hCZ alw mXb @@ -45876,32 +48295,32 @@ kSV ban mfb voM -iTf +rnU uLA nNn gvU +aKi +uvV uuJ -uuJ -uuJ -uuJ +upG sEh -qxf -bEC -bEC -bEC -nyq -bEC -bEC -bEC -bEC -nyq -paT -paT -paT +jlj +hHB +hHB +hHB +iiw +lGn +trp +lGn +lGn +hLW +lGn +tja +uOB kvR aZH -aZH -aZH +oyG +jMc boX hts hts @@ -46020,29 +48439,29 @@ lFf boa boa aZw -tfH +cmB dLL cQw -cQw -qef +oEN +cMO arH cry xYZ mGy xRz mYo -cfF -tjx -tjx -tjx +vdV +vdV +aFO +evJ gvU bnA qcY mfd -mCS -mbx -xOu -oDh +csx +jQP +cfx +qIl uXQ tGw dSJ @@ -46065,7 +48484,7 @@ mnn mnn sDS pFe -pFe +ePy kSV mnn byD @@ -46074,29 +48493,29 @@ gvU gvU gvU gvU -uuJ -uuJ -uuJ -uuJ -sEh -ejP -gce -oLS -uuJ -sEh -uuJ -uuJ -uuJ -uuJ +kWj +oJT +upG +upG sEh +ntR +baF +njw +kWj +kvR +sdn +msa aZH aZH -aZH +rRJ +fjh +mPi +uOB kvR aZH +xYx aZH -aZH -boX +iLc hts hts hts @@ -46213,35 +48632,35 @@ lOl lOl dXu jZi -dWX -kDu -pzf -jBe -jBe -dXq +ecb +tIc +tIw +hvV +hvV +aVx mYo mYo mYo mYo mYo mYo -cfF -tjx -tjx -tjx +vdV +vdV +evJ +evJ gvU bnA jES mfd -vre -vUC -nxV -oDh +poW +jJO +izI +qIl tPq tGw paB -sxk -sxk +fmt +fHH sxk eXV tGw @@ -46254,43 +48673,43 @@ srv tIW duL duL -jmn -jmn +eGg +mIP mnn -oDw -pFe -pFe +fyf +jLH +eeX ePy mnn jYD -qRL -uuJ -uuJ +vIU +aoz +bHI uuJ sEh -uuJ -uuJ -uuJ -uuJ +xre +oqS +kHm +fVs sEh -qxf -bEC -pUB -uuJ -sEh -uuJ -uuJ -uuJ +iqQ +kWj +oEn uuJ -sEh -aZH +kvR +qCZ aZH aZH +dbE +qCZ +qCZ +mPi +uOB kvR aZH +xYx aZH -aZH -boX +iLc hts hts hts @@ -46412,25 +48831,25 @@ uws hIi tjx tjx -cfF -jZp -tjx -tjx tjx -kjG bbR -cfF -tjx +evJ +evJ tjx +kjG +pze +vdV +vdV +ltM tjx gvU bnA jES mfd -vre -iGY -xLA -phC +poW +xCh +rHc +mHE eri eri oLz @@ -46444,22 +48863,22 @@ anh srv aQy chl -srv +asH gvU bGg -jmn -jmn -jmn +uCJ +nzH +llM +mnn +elK +mnn +mnn mnn -fyf -jLH -eeX -pFe mnn wtk -qRL -uuJ -uuJ +vIU +aoz +kWj uuJ sEh sEh @@ -46478,13 +48897,13 @@ xQE xQE xQE kvR -kvR -kvR +eRT +tDc kvR aZH +xYx aZH -aZH -boX +iLc hts hts hts @@ -46583,11 +49002,11 @@ hts aNJ fvO gQr -tqn -kqG -kqG -kqG -tqn +lfV +uJd +uJd +flg +lfV ePr dZW ijK @@ -46601,35 +49020,35 @@ wiv ehw ebx boa -wmH +umS uws hIi tjx gGr -cfF -cfF -cfF -cfF -cfF -cfF -ndw -cfF -cfF -cfF tjx +lWh +vdV +vdV +vdV +vdV +vdV +vdV +vdV +vdV +vdV gvU dUc jES egA -hHg -nUu -trS -oDh +sfr +kmF +qeo +qIl lSm knG stM -cid -cid +wxN +kAD cid qwI tGw @@ -46641,26 +49060,26 @@ oQW wTr gvU bGg -jmn -jmn -jmn -mnn -elK -mnn -mnn -mnn -mnn -uuJ -qRL -uuJ -uuJ -uuJ -uuJ -uuJ +jyB +uee +jfN sEh +wKk +aoz +aoz +aoz +aoz +aoz +vIU +aoz +fbe uuJ uuJ -aRq +kWj +sEh +bHH +gWj +qBZ vir jSx kIt @@ -46672,13 +49091,13 @@ jIs ehL xQE aZH -aZH -aZH +mPi +uOB kvR aZH +xYx aZH -aZH -boX +iLc hts hts hts @@ -46777,11 +49196,11 @@ hts aNJ fvO gQr -kqG -bRO -bRO -bRO -kqG +uJd +ePr +ePr +ePr +uJd qoG aDN ijK @@ -46801,24 +49220,24 @@ scC xLF koJ tjx -jZp -tjx -tjx -tjx -tjx -bbR -tjx -tjx cfF -tjx +vdV +vdV +toB +vdV +vdV +vdV +vdV +vdV +vdV gvU mpH qvi vmh -rEo -oaf -sxa -oDh +qIl +mAU +jbt +qIl eJJ wWB pjx @@ -46827,36 +49246,36 @@ tGw tGw tGw tGw -tGw +jsB seT gvU gos gvU gvU gvU -jmn -jmn -jmn -jmn -sEh -ycY -uuJ -mrc -uuJ -iIC -uuJ -qRL -uuJ -uuJ -uuJ +vAK +nzH +uee +llM +bdk +wKk +aoz +bAt +mNS +pJp +aoz +vIU +aoz +meA +drV uuJ uuJ sEh +uLe uuJ -uuJ -aRq +kWj ycY -pYL +sqC wEO xQE jJi @@ -46865,13 +49284,13 @@ jPH jIs tAR xQE -aZH -aZH -aZH -kvR -aZH -aZH -aZH +hex +ryu +rRx +wip +qLM +dYc +fbv boX hts hts @@ -46971,11 +49390,11 @@ hts aNJ rQs gDB -kqG -bRO -bRO -bRO -xAr +uJd +ePr +ePr +ePr +kru lUg ijK ijK @@ -47002,17 +49421,17 @@ oEJ oEJ oEJ oEJ -tjx +bbR cfF -tjx +vem gvU dUc jES egA -wKl -jmu -mZV -oDh +qIl +czI +eus +qIl nET gzJ fpe @@ -47023,34 +49442,34 @@ tGw tGw tGw hKb -vao -wVX -bDD -cLo -umt -bDD -bDD -bDD -bqz -oWs -vZk -aAo +eLL +pWH +aQv +oxF +fYa +gtv +wUX +wUX +smH +mBM +jWN +msI czE mqE -lQK -mqE -ezu -uuJ -uuJ -uuJ -uuJ -uuJ -sEh -uuJ -uuJ -aRq +uMl +eKi +vWD +aoz +aoz +aoz +aoz +aoz +hnr +bEC +bEC +bEC ycY -gLm +nud dWm xQE lPt @@ -47059,12 +49478,12 @@ jQS jPH lPt xQE -aZH -aZH -aZH +xbc +qHn +uOB kvR aZH -aZH +kzM aZH boX hts @@ -47165,11 +49584,11 @@ hts aNJ fPn gQr -kqG -bRO -bRO -bRO -xAr +uJd +ePr +ePr +ePr +kru lUg ijK ijK @@ -47196,17 +49615,17 @@ xpR xpR ezV oEJ -tjx -cfF -tjx +psc +xSx +hCU gvU bnA jES mfd -eLM -oDh -oDh -oDh +rwl +qIl +qIl +qIl seT seT jgk @@ -47217,34 +49636,34 @@ mbJ jCI jCI seT -vGL -ppz -jmn +iJX +sQK +llM duL -qXn -jmn -kce -jmn -cbU +qrd +oxb +bmn +oxb +xdj lEO -bEC -bEC -bEC -bEC -bEC -bKZ -pDn -pDn -pDn -pDn -pDn +kWj +uuJ +uuJ +uuJ +qBZ +xDT +adq +adq +adq +adq +adq +adq pDn -lTl pDn quC fVD ycY -hTA +rlE dCu xQE huZ @@ -47253,9 +49672,9 @@ diK orw lPt xQE -aZH -aZH -aZH +vPA +mPi +xle kvR kvR kvR @@ -47359,11 +49778,11 @@ hts aNJ fPn gQr -kqG -bRO -bRO -bRO -kqG +uJd +ePr +ePr +ePr +uJd xRG upw ijK @@ -47390,15 +49809,15 @@ ryW wtR kOt oEJ -tjx -cfF -tjx +rcw +uxd +tpv mOg bnA suR pFE ctG -nGt +bxZ nTA qer eDv @@ -47411,9 +49830,9 @@ hcm htM ejn wxj -vGL -vHM -mMA +sRC +rAL +idR qJj qJj qJj @@ -47423,16 +49842,16 @@ qJj qJj jYD wtk -pUB -uuJ -uuJ -gnV -uuJ -uuJ -uuJ -uuJ -uuJ +oEn +puD +lkp +lGX +aoz +kWj +kWj uuJ +puD +kWj mSp mSp mUM @@ -47447,9 +49866,9 @@ dRL uTM gew xQE -aZH -aZH -aZH +not +btA +uOB kvR aZH aZH @@ -47550,14 +49969,14 @@ rSz cPC flY hts -aNJ +tZg fPn gQr -tqn -kqG -kqG -kqG -tqn +lfV +uJd +uJd +flg +lfV ePr dZW ijK @@ -47584,9 +50003,9 @@ rhW bzl ecv oEJ -tjx -cfF -cfF +bfD +onn +ayP gvU aBQ ovT @@ -47605,9 +50024,9 @@ hcm dvv wbN wxj -vGL -jSg -neY +sRC +nxj +tCH qJj tAa ewS @@ -47641,14 +50060,14 @@ qXZ npD eRO xQE -aZH -aZH -aZH -kvR -aZH -aZH -aZH -boX +fVk +ryu +rRx +wip +qLM +qfm +fbv +iLc hts hts hts @@ -47744,7 +50163,7 @@ hts hts hts hts -aNJ +tZg fPn gQr fPn @@ -47778,8 +50197,8 @@ tnA dho ukE oEJ -tjx -cfF +bfD +ffC wmH gvU qKi @@ -47799,9 +50218,9 @@ tMB wjP eJU wxj -vGL -nbs -jTq +sRC +uzS +mNU qJj xhx hak @@ -47810,7 +50229,7 @@ uWP nlf wcM mBg -sEE +otZ bCi rXS uad @@ -47835,14 +50254,14 @@ fTQ ekC jPH xQE -kvR -kvR -kvR -kvR aZH +mPi +uOB +kvR aZH +xYx aZH -boX +iLc hts hts hts @@ -47938,7 +50357,7 @@ hts hts hts hts -aNJ +tZg fPn gQr gQr @@ -47972,8 +50391,8 @@ lWl sEw kra oEJ -tjx -cfF +bfD +ffC kug gvU mfb @@ -47993,9 +50412,9 @@ sXb jNW tJO wxj -vGL -lIK -jmn +sRC +qiR +rzX qJj dGm hak @@ -48029,14 +50448,14 @@ xbV jPH jPH xQE -aZH -aZH -aZH +kvR +eRT +tDc kvR aZH -aZH -aZH -boX +bZB +jMc +iLc hts hts hts @@ -48132,7 +50551,7 @@ hts hts hts hts -aNJ +tZg fPn fPn wCD @@ -48166,9 +50585,9 @@ oEJ qRB oEJ oEJ -tjx -cfF -tjx +rcw +svp +pIV gvU srv srv @@ -48176,10 +50595,10 @@ srv gvU dTI nGt -twy -jmn -jmn -jmn +afH +fKg +tkF +ivQ wxj dwG uLV @@ -48187,9 +50606,9 @@ hRp gWM hAM wxj -vGL -lIK -xyS +wtd +llM +sgF nkk uOf hak @@ -48197,10 +50616,10 @@ wmv tJR aNf wcM -qje -oYL -jyc -dKj +prJ +rcT +wwa +xMv mow yfI oYL @@ -48223,11 +50642,11 @@ xQE xQE xQE xQE -aZH -aZH -aZH +qCZ +mPi +uOB kvR -aZH +fMC aZH boX boX @@ -48360,9 +50779,9 @@ ovn lcP nHf xcp -cfF -cfF -ojG +xEu +gAu +sgI gvU afs afs @@ -48370,10 +50789,10 @@ afs gvU duL nmD -wHJ -jmn -jmn -jmn +eMN +fKg +rzB +fjV wxj xlM aFc @@ -48381,45 +50800,45 @@ qGs uVe kRx wxj -vGL -lIK -cWD +sRC +llM +wxl qJj vww oBO lXo oZc -saC +dAp qJj -poO -rDL -qTw +fhT +jlQ +wBH xMv -mBg +rcy ado -tqn -nnS -nnS -kqG -qtm +nCc +gLP +gLP +fRK +nCc tRb tRb -aZH -aZH -baW -jJQ -jJQ -iOK -jJQ -foE -jJQ -jJQ +wZP +wZP +sUz +kBr +oqO +ciF +dSo +bCs +dSo +ndz aFW kvR -aZH -aZH -aZH -aZH +fMC +hkF +aVu +uOB kvR aZH aZH @@ -48524,7 +50943,7 @@ aNJ fPn fPn wCD -iVx +maq rTe ngW uBL @@ -48537,7 +50956,7 @@ bcK nSw rqL dAV -qJx +ceE tDH sZQ qXw @@ -48564,10 +50983,10 @@ gvU gvU kcD vcc -nle -jmn -jmn -jmn +sFw +rzB +rzB +rSX wxj nDl aqk @@ -48575,9 +50994,9 @@ vtG tAT hYi wxj -gRV -duL -duL +fNy +dSr +dSr qJj qJj qJj @@ -48585,35 +51004,35 @@ qJj qJj qJj qJj -lkt -liy -xJo +poO +rDL +qTw xMv wek tcJ -ggs -bRO -bRO -bRO -bKr -aZH -aZH +fRK +foC +foC +foC +fRK +wGP +seJ gli dln iqZ xJE -gUQ -tmY -aZH -xjy -aZH -aZH -aZH -kvR -aZH -aZH -aZH -aZH +bCf +uEc +iho +jFP +iho +uEL +xtc +nWv +fpZ +fpZ +iFb +xle kvR aZH aZH @@ -48730,10 +51149,10 @@ rrR rYi bnI rqL -hIa -spg -kKv -bda +nPv +lxS +xKM +dGr qXw vQt eLI @@ -48741,7 +51160,7 @@ yky jhD qXw dlV -tsx +lzB agJ gsb rZl @@ -48758,10 +51177,10 @@ qva duL byt kgi -hIZ -jmn -jmn -jmn +udK +rzB +rzB +rSX wxj wxj wxj @@ -48769,45 +51188,45 @@ wxj wxj wxj wxj -vGL -duL -hal -cNa -aLS -aLS +sRC +dSr +daq +pmh +hUa +hUa xMv dTF jJf xMv -xMv -xMv -xMv -xMv +aHm +mjr +mjr +fha coC rjC -ggs -bRO -bRO -bRO -jfV -aZH -aZH +cWu +foC +foC +foC +fRK +wGP +seJ gli hwM rZB oaW -aZH -fdb -aZH -xjy -aZH -aZH -aZH -jTc -aZH -aZH -aZH -aZH +cpq +dZD +iho +jFP +iho +iho +uOB +nog +iho +nIL +mDm +tNc boX boX boX @@ -48909,12 +51328,12 @@ hts hts hts hts -kLI -kLI +vKm +vKm wCD wCD vuh -aDW +qJK eXp wCD uNX @@ -48935,8 +51354,8 @@ hSH ohk eaQ ohk -pXl -pbq +ohk +fUz cBv iTq ske @@ -48952,59 +51371,59 @@ anz uIg tzk sBW -omf -hHl -hHl -hHl -duL -jmn -jmn -jmn -jmn -jmn -jmn -vGL +iif +mKw +mKw +mKw duL -qMk -bFh -lIK -vaX +vAK +gOZ +urK +jXZ +imJ +jXZ +ycQ +dSr +pgc +nky +sPB +vfH xMv xlg ozO fha -fxF -nIc -gRG -nIc +gvn +cnQ +cnQ +cnQ ivA wwF -ggs -bRO -bRO -bRO -bKr -aZH -aZH +gLP +foC +foC +foC +kwZ +wGP +seJ gli gEI oyt aey -aZH -fdb -aZH -xjy -aZH -aZH -aZH +cpq +dZD +iho +jFP +iho +iho +uOB kvR -aZH -aZH +eln +rRJ boX boX boX -kLI -kLI +vKm +vKm hts hts hts @@ -49103,10 +51522,10 @@ hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm wCD wCD wCD @@ -49150,55 +51569,55 @@ aIX les les les -kKS -les -les -jRZ -les -les -les -kud -duL -uht -lIK -frN -vyv +qBl +wSV +sQu +rPS +sQu +sQu +sQu +wZD +xdU +qPr +sPB +lDC +xhs xMv ozO ozO ozO lHr -aCC -wYf +ohj +uur wQZ wOQ xrU -tqn -kqG -kqG -kqG -qtm -aZH -aZH +nCc +fRK +fRK +fRK +nCc +wGP +seJ gli gli gli gli -pkG -dzb -aZH -xjy -aZH -aZH -aZH +iTu +crA +iho +nFx +cUW +cUW +tNc boX boX boX boX -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -49297,14 +51716,14 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm bxl bxl bxl @@ -49341,19 +51760,19 @@ mkf eBS lIK nSu +xKC lIK lIK lIK -bxt -lIK -lIK -nkK -iQg -hWi -lIK -lIK -duL -uht +cLR +sQR +mBu +kbD +kdb +oxb +rzX +dSr +mJs dSr dSr dSr @@ -49367,32 +51786,32 @@ xMv xMv qje klp -sWM -gWB -gWB -gWB -gWB -gWB -gWB -gWB -gWB -lpG -jPu -gWB -rly -qLM -mWP -boX +gBt +qgQ +iQM +qgQ +qgQ +pSx +pbS +wjI +dpW +tLI +jPh +fkD +iBN +lGn +nfi boX +iLc +iLc boX -boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -49491,17 +51910,17 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm bxl bxl bxl @@ -49540,14 +51959,14 @@ eeE eeE eeE eeE -jmn -yeQ -qXn -nNl +cLR +wuV +mVr +iww dSr dSr dSr -fdR +yku dSr aeM aeM @@ -49567,8 +51986,8 @@ boX boX boX boX -aZH -aZH +vOZ +kvR kvR kvR kvR @@ -49577,16 +51996,16 @@ nSY boX boX boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -49685,168 +52104,106 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -ajb -ajb -kKe -iDj -puw -kKv -jce -rNx -gxy -uvG -soB -aPu -kqv -jHh -qmQ -oAc -wFz -aaz -wFz -cdB -rqO -nhA -nhA -nhA -nhA -nhA -iHT -mkf -sFw -eeE -fEL -pWj -sOl -vsg -itp -eeE -duL -qgT -duL -duL -dSr -wJc -wJc -boW -wNv -aeM -aeM -xMv -buh -fMj -aoH -rel -wdV -eSZ -lCR -wJN -wFH -uxB -qyp -kLI -kLI -kLI -boX -aZH -aZH -kvR -aZH -jsj -hvz -rot -boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -hts -hts -hts -hts -hts -hts -hts -hts -hts -"} -(104,1,1) = {" -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +ajb +ajb +kKe +iDj +puw +kKv +jce +rNx +gxy +uvG +soB +aPu +kqv +jHh +qmQ +oAc +wFz +aaz +wFz +cdB +rqO +nhA +nhA +nhA +nhA +nhA +iHT +mkf +sFw +eeE +fEL +pWj +sOl +vsg +itp +eeE +duL +qgT +duL +duL +dSr +gNl +gNl +iTv +wNv +aeM +aeM +xMv +buh +fMj +aoH +rel +wdV +eSZ +lCR +wJN +wFH +uxB +qyp +qLK +qLK +qLK +boX +aZH +aZH +kvR +qCZ +fTd +lsr +bSN +boX +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +hts +hts +hts +hts hts hts hts @@ -49854,6 +52211,15 @@ hts hts hts hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +hts hts hts hts @@ -49862,6 +52228,14 @@ hts hts hts hts +"} +(104,1,1) = {" +hts +hts +hts +hts +hts +hts hts hts hts @@ -49880,18 +52254,63 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +hts +hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +hts +hts +hts +hts +hts +hts +hts +hts +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm ajb jzo lBf @@ -49908,7 +52327,7 @@ snz wFz deo ebW -duQ +oKH pWE vjK cdB @@ -49928,14 +52347,14 @@ dlM eyC okn eeE -gZp -ooG -jmn +fOh +agS jmn +xOQ dSr -bcI -bcI -boW +iNF +iNF +iTv jVl iNF iNF @@ -49951,29 +52370,29 @@ nJy kSy don qyp -kLI -kLI -kLI +qLK +qLK +qLK boX aZH aZH kvR qUd -bcZ -aZH -aZH +cbT +qCZ +qCZ boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -50031,16 +52450,17 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH qVH qVH qVH -xPj +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50075,17 +52495,16 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm ajb aOc iaY @@ -50114,7 +52533,7 @@ oDY mkf mkf mkf -sfl +eGv eeE akq jPv @@ -50122,14 +52541,14 @@ tPg dHJ ukx eeE -jmn -yeQ -jmn +cLW +lUO +xOQ neY dSr iNF vjz -jzL +ern iNF qSS iNF @@ -50145,7 +52564,7 @@ cis xSH cis sEr -kLI +qLK mRB mRB boX @@ -50153,19 +52572,19 @@ aZH aZH kvR gUQ -tmY -aZH -aZH -boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +oqK +qCZ +qCZ +iLc +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -50225,12 +52644,13 @@ hts hts hts hts -hts -hts -hts qVH qVH -jKj +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50271,22 +52691,21 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm ajb oYt sic iDj puw mYy -kLI +qLK mRB mRB mRB @@ -50300,30 +52719,30 @@ upo eTw rrk kqv -sZU +pko sZU rdE jSS -sjV -sZU -sZU -kbi -gFh +cDs +gZB +jro +gho +uoU eeE haJ nuU uGl fFC okn -eeE +cZw jmn -hGh -vYS -vYS +deU +aEx +aEx cxc nzi feJ -kRs +xFb bXy vZE hCF @@ -50339,25 +52758,25 @@ hJT lFA iOu sEr -kLI +qLK mRB mRB boX boX boX boX +vbC +wSD +qCZ aZH -bcZ -aZH -aZH -boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI +iLc +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -50419,9 +52838,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50468,21 +52888,20 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm ajb ajb bha iDj puw mYy -nqw -hYb -hYb +gcu +hmr +hmr mRB mRB bRO @@ -50492,17 +52911,17 @@ lKY upo nJI pWE -vjK +nLw kqv -sZU +nUF sZU gQE jSS -upY -pyY -pyY -pyY -mvW +ngM +gnK +epT +gnK +jCm eeE jjq pWj @@ -50510,16 +52929,16 @@ kWr lGL ljd eeE +xOQ +lUO +nyD jmn -yeQ -duL -duL dSr gyX hCF +sXU bpe hCF -hCF gyX xMv foC @@ -50537,19 +52956,19 @@ rgm mRB mRB mRB -tAx -hYb +vly +hmr boX pkG -qfW +riD aZH aZH -boX -kLI -kLI -kLI -kLI -kLI +iLc +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -50613,9 +53032,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50663,23 +53083,22 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm mYy kKv gaL xKM kup mYy -tAx -kLI -tAx -hEu -kLI -kLI +vly +vKm +ofc +stR +qLK +qLK cdB eTw qLm @@ -50688,15 +53107,15 @@ wFz aaz wFz kqv -sZU -nRU -tjA +nUF +qFn +nUF jSS -mbT +rlm sZU -sZU -vKw -vFZ +nUF +iYj +ikB eeE iDV eeE @@ -50704,11 +53123,11 @@ eeE eeE eeE eeE -hBW -rGd -kKS -les -mpR +het +cUX +cIV +yei +usF dSr dSr dSr @@ -50728,21 +53147,21 @@ xEX ajJ vjy sgm -kLI -kLI -kLI -tAx -kLI +qLK +qLK +qLK +vly +vKm boX -paT -bcZ +aZH +cbT aZH aZH boX -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -50807,9 +53226,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50857,23 +53277,22 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm mYy kKv kKv kKv puw mYy -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK cdB upo rrk @@ -50884,29 +53303,29 @@ qMT kqv jSS jSS -eiy +gYG jSS -hAB sZU sZU sZU -hzg -pCZ -vCf +nUF +dhF +czC +fQU eIt -pPp -pPp -pPp -pPp -pPp -oUm -bRv -pPp -sKs -xWO -jmn -jmn +sLY +sLY +sLY +sLY +sLY +cdw +sLY +sLY +axi +weB jmn +vxb +xOQ jmn jmn xMv @@ -50921,22 +53340,22 @@ bmr knD lHw vjy -kLI -kLI -kLI -kLI -kLI -yfj +qLK +qLK +qLK +qLK +qLK +uec boX eNw -bcZ -aZH +cbT aZH +qCZ boX -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -51001,9 +53420,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51051,23 +53471,22 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm mYy -kKv +utU kKv kKv puw mYy -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK cdB kqv snz @@ -51076,17 +53495,17 @@ kqv kqv kqv kqv +bCj +bCj sZU -sZU -tjA -sZU +aZe +nUF sZU sZU -sZU -sZU -sjV -rCK -jGV +xzS +dvX +sFF +sEm ykb ykb ykb @@ -51096,16 +53515,16 @@ ykb ykb ykb ykb -cAj -dBD -cfP -cfP -cfP -cfP -eLJ -ghD +uOE +gIq +sYe +hyf +hyf +bvi +npB +oYE jmn -vIf +exM aoH rel wdV @@ -51115,22 +53534,22 @@ dWR dIL dWR jOy -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK boX mJJ -bcZ -aZH -aZH +cbT +qCZ +qCZ boX -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -51195,9 +53614,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -51213,7 +53629,11 @@ qVH qVH qVH qVH -cbd +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51246,60 +53666,59 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH sNN sNN sNN xHm iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB hfN -tjA -tjA -tjA -tjA -tjA +sZU +sZU +svt +sZU +sZU eiy -tjA -tjA -tjA -tjA -tjA -vhr -hKO -hKO -ubz +ruP +ruP +ruP +ruP +ruP +meq +rIp +rIp +kOM pNZ -hfN +pWo ykb qRq dKd -eNo +apQ clx eTm jYW vsH ckt -hMg -wqV -duL -dPp -eFg -xgk -lIK +iKz +wwM +rzB +rzB +rzB +hhL +rzB dlT mMA -vIf +exM aoH rel mWn @@ -51309,21 +53728,21 @@ omr tVp ruU jOy -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz gkA aks gkA gkA qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -51389,9 +53808,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51440,25 +53860,24 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH gSn hbs qWZ lCr iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB jGV -tjA +sZU sZU sZU sZU @@ -51479,7 +53898,7 @@ ykb anf inF iMN -iMN +mSU mur hTc xof @@ -51490,10 +53909,10 @@ hcs hcs hcs hcs -lIK +rzB kaA jmn -vIf +exM aoH bsN xxR @@ -51503,21 +53922,21 @@ dWR dWR dWR jOy -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz aIl hyj gQY bId qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -51583,9 +54002,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -51597,7 +54013,11 @@ qVH qVH qVH qVH -fJR +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51634,28 +54054,27 @@ hts hts hts hts -hts -kLI -kLI -kLI -iTH +vKm +vKm +vKm +iHt gSn hbs qWZ wEL iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB -kbi -gWH +gMX +nYU +nYU sZU sZU -eiY fRg qbF maL @@ -51663,7 +54082,7 @@ trr lEx brA fRg -pQT +hyv ogP nnd uDq @@ -51684,7 +54103,7 @@ fNA tWH nWJ hcs -lIK +rzB kaA duL mvV @@ -51697,21 +54116,21 @@ ufQ dKO jmB kMa -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz fMc ePF gQY bId -qUz -kLI -kLI -kLI +lZb +vKm +vKm +vKm hts hts hts @@ -51777,9 +54196,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51829,35 +54249,34 @@ hts hts hts hts -hts -kLI -kLI -iTH +vKm +vKm +iHt qWZ qWZ qWZ qWZ iTH -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK dOB -sZU -gxA +llF +nYU +nYU sZU sZU -eiY fRg -rkT +mgF fST kXb jHp uXT fRg -pQT +hyv ogP nnB kSB @@ -51876,12 +54295,12 @@ wbh rVy rVy tWH -jjl +iVI hcs -lIK +rzB kaA jmn -jmn +xOQ aoH vNL rEO @@ -51891,20 +54310,20 @@ tWn qMJ lxh kMa -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK qUz hkE jqL cRv cRv -qUz -kLI -kLI +lZb +vKm +vKm hts hts hts @@ -51971,12 +54390,13 @@ hts hts hts hts -hts -hts -hts qVH qVH -tvN +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52023,24 +54443,23 @@ hts hts hts hts -hts -kLI -kLI -iTH +vKm +vKm +iHt qWZ qWZ qWZ qWZ iTH -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK dOB -sZU -gxA +wvi +hRe sZU rBj rBj @@ -52051,7 +54470,7 @@ iaq dIo xPl fRg -pQT +hyv ogP lKv bzk @@ -52072,10 +54491,10 @@ ciy uiO lBE hcs -lIK +rzB vbN jTq -jmn +xOQ aoH rel wdV @@ -52085,20 +54504,20 @@ oEd boo oEd fMb -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK qUz ezh ocU cRv cRv -qUz -kLI -kLI +lZb +vKm +vKm hts hts hts @@ -52165,9 +54584,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52217,24 +54637,23 @@ hts hts hts hts -hts -kLI -kLI +vKm +vKm iTH iTH qOK qWZ qWZ iTH -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK dOB -sZU -gxA +eiY +noG xuL rBj jpm @@ -52245,7 +54664,7 @@ vjg kXb xPl fRg -pQT +wvI ogP ogP ikv @@ -52266,10 +54685,10 @@ woy vuM jLZ qpu -dIv -nqj -jmn +sAe +rtm jmn +egB aoH rel wdV @@ -52279,20 +54698,20 @@ aeR kxX qRn fMb -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK qUz cRv cRv mxh qUz qUz -kLI -kLI +vKm +vKm hts hts hts @@ -52359,9 +54778,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52412,24 +54832,23 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH qWZ qWZ iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB -gZV -gxA -tjA +eiY +noG +sZU rBj jpm fRg @@ -52439,11 +54858,11 @@ fRg muu muu fRg -pQT -gfI -sgT -gqh -tFl +hyv +slf +dQg +mIZ +eOH woz lnQ ofn @@ -52455,12 +54874,12 @@ maT qwv qjX wbh -vXV +oIh eoL tKk eZY hcs -lIK +rzB bxu jmn jmn @@ -52473,19 +54892,19 @@ oEd oEd oEd fMb -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz bNf bNf qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -52553,9 +54972,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52606,23 +55026,22 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH hfr hfr iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB -sZU -gxA +gsq +noG uaw rBj ixX @@ -52633,11 +55052,11 @@ jVR ahT nZd rBj -eZW -rTc -wUU -bfO -rfS +xju +wAO +jSS +jSS +jSS ykb ykb ykb @@ -52654,7 +55073,7 @@ oEH aDY lnO hcs -qgu +kgM duL duL duL @@ -52667,19 +55086,19 @@ iPo lvs vQx hmh -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz uKh uKh qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -52747,9 +55166,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -52767,17 +55183,21 @@ qVH qVH qVH qVH -vnE qVH qVH qVH -fSl qVH qVH qVH qVH qVH -vnE +qVH +qVH +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52800,23 +55220,22 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH iTH iTH iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB vKw -xMr +fOw rdq rBj jTh @@ -52827,12 +55246,12 @@ rBj rBj rBj rBj -tjA -eLj -jSS -jSS -jSS +ruP +oWU jSS +dnN +waB +hZB aUc aUc aUc @@ -52848,7 +55267,7 @@ hcs hcs hcs hcs -sxY +jue mMA bGg xvb @@ -52861,19 +55280,19 @@ bIt wMe rib hmh -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz qUz qUz qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -52941,9 +55360,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -52954,7 +55370,11 @@ qVH qVH qVH qVH -dwL +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52995,22 +55415,21 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm +vKm +vKm +vKm +vKm dOB sZU -ovF +muP jSS rBj nNS @@ -53018,15 +55437,15 @@ rBj rBj rBj rBj -sZU -sZU -sZU -tjA -hie +jDQ +nWb +nJT +ruP +aQM jSS -dnN -waB -hZB +xvV +sZU +xeW aUc aUc aUc @@ -53037,12 +55456,12 @@ aUc aUc aUc jUZ -gCq -jmn -jmn -jmn +rca +rzB +bAM +rzB duL -iqJ +fnS jmn bGg blj @@ -53055,18 +55474,18 @@ iFr nTC iFr gmv -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm hts hts hts @@ -53135,9 +55554,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53189,38 +55609,37 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm +vKm +vKm +vKm +vKm dOB sZU -rHw -pJI +xok +hhm wWg -hxA -wNx -bwO -wNx +bxe +aHG +oLx +aHG eZF -wNx -wNx -wNx -wNx -uSU +bCQ +lKg +ecO +bCQ +nXi jSS +jOi xvV -sZU -xeW +cIf aUc aUc aUc @@ -53231,15 +55650,15 @@ aUc aUc aUc jUZ -gCq -jmn -jmn -jmn +rca +rzB +rzB +rzB duL -iqJ -lIK -lIK -xgk +fnS +rzB +rzB +hhL aoH rel wdV @@ -53249,18 +55668,18 @@ sWt hOD gWY gmv -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm hts hts hts @@ -53329,9 +55748,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53383,19 +55803,18 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +qLK mRB mRB -kLI -kLI -kLI -kLI -kLI -kLI -kLI +qLK +vKm +vKm +vKm +vKm +vKm +vKm dOB dOB dOB @@ -53403,35 +55822,35 @@ dOB dOB sZU sZU -jWH +fDM ulZ -dOB -dOB -dOB -dOB -ppi -lTJ jSS -jOi -xvV -cIf -flI +jSS +jSS +jSS +ruP +way +jSS +jSS +jSS +jSS +hpi aac -flI -flI -flI -flI -flI +hpi +hpi +hpi +hpi +hpi aac -flI +hpi duL -ryt -pHr -vYS -sAd -sUr -eWN -jTq +xwn +wER +aEx +kWq +kqX +cNB +etH jmn aoH aoH @@ -53443,18 +55862,18 @@ gmv gmv gmv gmv -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +qLK mRB mRB -kLI -kLI -kLI +qLK +vKm +vKm hts hts hts @@ -53523,9 +55942,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53577,78 +55997,77 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +qLK mRB mRB -kLI -kLI -kLI -kLI -hts -kLI -kLI -kLI -kLI -kLI -kLI +qLK +vKm +vKm +vKm +hts +vKm +vKm +vKm +vKm +vKm +vKm dOB +gsq sZU -sZU -jWH +fDM xuL -dOB -kLI -kLI -vYd -thb -mJX -non -non -non -non -aUc -aUc -aUc -aUc -aUc -aUc -aUc -aUc -aUc -jUZ -sFw -cbU -jmn -qXn +jSS +mdN +oWw +rDv +qQa +dGE +qQa +qzk +qQa +pzY +rop +rop +rop +rop +rop +rop +rop +rop +rop +jzn +eEe +aWF +gsc +tKs duL mYR -kce -jmn +yjY +xOQ jzV rui mAb cQJ dPv fkN -kLI -kLI -kLI -kLI -kLI -kLI -hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +hts +vKm +vKm +vKm +qLK mRB mRB -kLI -kLI -kLI +qLK +vKm +vKm hts hts hts @@ -53717,9 +56136,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -53731,7 +56147,11 @@ qVH qVH qVH qVH -gAR +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53771,51 +56191,50 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm hts hts hts -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm dOB sZU vKw -exX +doK hfN -dOB -kLI -kLI -vYd -thb -mJX -oWw -oWw -oWw -non -aUc -aUc -aUc -aUc -aUc -aUc -aUc -aUc -aUc -jUZ -sFw -kce -cjs +jSS +mdN +mdN +rDv +qQa +dGE +qQa +qQa +qQa +qQa +rop +rop +rop +rop +rop +rop +rop +rop +rop +rzB +eEe +yjY +dGK qGT sVu sVu @@ -53827,22 +56246,22 @@ mAb rui kRB fkN -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm hts hts hts @@ -53911,9 +56330,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53967,47 +56387,46 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +vKm hts hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm dOB sZU -kbi -eLY +wvi +mwQ jGV -dOB -kLI -kLI -jmt -thb -mJX +jSS oWw +mdN +mKW oWw -iOy +iDw +xWg +snV +dhy non -flI +nEo aac -flI -flI -flI -flI -flI +nEo +nEo +nEo +nEo +nEo aac -flI +nEo duL -sFw +eEe svf svf svf @@ -54021,20 +56440,20 @@ gXV xxC kRB fkN -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts hts hts -kLI -kLI -kLI -kLI -kLI +vKm +qLK +qLK +qLK +qLK hts hts hts @@ -54105,9 +56524,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -54139,7 +56555,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -54162,10 +56581,10 @@ qVH qVH qVH hts -kLI +qLK mRB mRB -kLI +qLK hts hts hts @@ -54173,23 +56592,23 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm dOB jSS jSS fKs jSS -dOB -kLI -kLI -jmt -thb -hEd -tuk -vOB -tXw +jSS +non +oWw +xeG +oWw +gQD +kbP +bIg +fWc non aUc aUc @@ -54201,7 +56620,7 @@ aUc aUc aUc jUZ -sFw +eEe svf kQm bmj @@ -54215,9 +56634,9 @@ cvn rui wmT fkN -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -54225,10 +56644,10 @@ hts hts hts hts -kLI +vKm mRB mRB -kLI +vKm hts hts hts @@ -54299,12 +56718,8 @@ hts hts hts hts -hts -hts -hts qVH qVH -ccc qVH qVH qVH @@ -54314,26 +56729,30 @@ qVH qVH qVH qVH -clr qVH qVH qVH qVH qVH -dwL qVH qVH qVH qVH -dwL qVH qVH qVH qVH -dwL qVH qVH -hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -54356,10 +56775,10 @@ qVH qVH qVH hts -kLI +qLK mRB mRB -kLI +qLK hts hts hts @@ -54367,23 +56786,23 @@ hts hts hts hts -kLI -kLI -kLI -dOB -sZU -sZU -jWH -sZU +vKm +vKm +vKm dOB -kLI -kLI -vYd -thb -thb +mWs +lfC +dQn +xQx +ulZ +non +oWw +rDv +mdN +oWw jjn lnZ -mJX +dGE non aUc aUc @@ -54395,7 +56814,7 @@ aUc aUc aUc jUZ -sFw +eEe svf kQm bmj @@ -54409,9 +56828,9 @@ nnx sHu tTX fkN -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -54419,10 +56838,10 @@ hts hts hts hts -kLI +vKm mRB mRB -kLI +vKm hts hts hts @@ -54493,9 +56912,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -54527,7 +56943,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -54550,10 +56969,10 @@ qVH qVH qVH hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -54561,18 +56980,18 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm dOB +dNL +sZU +sZU sZU sZU -jWH -ulZ -dOB -kLI -kLI -goG +nkE +nkE +nkE nkE nkE nkE @@ -54589,7 +57008,7 @@ aUc aUc aUc svf -wNj +xor wjd kQm bmj @@ -54603,9 +57022,9 @@ rui mWO sNY fkN -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -54613,10 +57032,10 @@ hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -54687,9 +57106,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -54721,7 +57137,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -54744,10 +57163,10 @@ qVH qVH qVH hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -54756,20 +57175,20 @@ hts hts hts hts -tAx -kLI +ofc +vKm dOB -sZU -vKw -dkZ -xuL -dOB -kLI -kLI -goG +uGx +nYU +nYU +nYU +nYU nkE cOp cOp +cOp +cOp +cOp nkE mJX non @@ -54797,8 +57216,8 @@ oce dMZ mBy fkN -kLI -xQM +vKm +eoW hts hts hts @@ -54807,10 +57226,10 @@ hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -54881,9 +57300,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -54915,7 +57331,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -54939,8 +57358,8 @@ qVH qVH hts hts -kLI -kLI +vKm +vKm hts hts hts @@ -54950,18 +57369,18 @@ hts hts hts hts -tAx -kLI +ofc +vKm dOB -sZU -kbi -eqX -sZU -dOB -kLI -kLI -goG +lqL +oNH +wqf +vFR +hFb +nkE mRV +cOp +cOp tCN rBy nkE @@ -54991,8 +57410,8 @@ flG xjK ayM fkN -kLI -xQM +vKm +eoW hts hts hts @@ -55002,8 +57421,8 @@ hts hts hts hts -kLI -kLI +vKm +vKm hts hts hts @@ -55075,12 +57494,8 @@ hts hts hts hts -hts -hts -hts qVH qVH -ejw qVH qVH qVH @@ -55109,7 +57524,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -55133,8 +57552,8 @@ qVH qVH hts hts -kLI -eDd +vKm +inW hts hts hts @@ -55144,18 +57563,18 @@ hts hts hts hts -tAx -jDF -dOB -gZV -vhr -orC -bEU +ofc +mbj dOB -kLI -kLI -bCc +bym +svA +gaG +tqh +aoB +nkE sxM +cOp +cOp bFx nYN nkE @@ -55163,11 +57582,11 @@ jno sAl svf wXZ -tAJ +wau xXH svf aMb -uCD +npl acH svf svf @@ -55185,8 +57604,8 @@ flG xjK jKN fkN -kLI -xQM +vKm +eoW hts hts hts @@ -55196,8 +57615,8 @@ hts hts hts hts -kLI -kLI +vKm +vKm hts hts hts @@ -55269,9 +57688,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -55281,7 +57697,6 @@ qVH qVH qVH qVH -sop qVH qVH qVH @@ -55303,7 +57718,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -55327,8 +57746,8 @@ qVH qVH hts hts -kLI -frk +vKm +qGi hts hts hts @@ -55339,16 +57758,16 @@ hts hts hts uDM -kLI -dOB -sZU -hNQ -sZU +vKm dOB -dOB -kLI -kLI -bCc +tFN +aEL +gaG +tqh +nYU +nkE +rEy +cOp cOp ncn nrk @@ -55368,18 +57787,18 @@ svf amt rTF pia -nMd +tkA fTa -kLI -kLI -kLI +vKm +vKm +vKm fkN fkN flG xjK xHC fkN -kLI +vKm fqv hts hts @@ -55390,8 +57809,8 @@ hts hts hts hts -frk -kLI +qGi +vKm hts hts hts @@ -55463,9 +57882,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -55482,22 +57898,25 @@ qVH qVH qVH qVH -pwo qVH qVH qVH qVH qVH -xuZ qVH qVH qVH -pwo qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -55533,22 +57952,22 @@ hts hts hts uDM -kLI +vKm dOB sZU -gOz -sZU -cxK -kLI -kLI -hts -goG -rEy +svA +gaG +tqh +nYU +nkE +cOp +cOp +cOp gLT cOp nkE lTx -kcG +sFU svf svf prg @@ -55564,16 +57983,16 @@ iNH pia aNs fTa -kLI +vKm hts -kLI -kLI -vGw +vKm +vKm +pvA wzB xjK rvz fkN -kLI +vKm fqv hts hts @@ -55657,9 +58076,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -55691,7 +58107,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -55727,47 +58146,47 @@ hts hts hts uDM -kLI +vKm dOB sZU -gOz -sZU +svA +gaG +dOB cxK -kLI -kLI -hts goG +bCc +bCc goG cOp wXY nkE thb -thb +fKM rgK lkz -tOR -cpc -cpc -cpc -tOR -rgM -cpc -cpc -cpc -cpc -fnG +fax +iPj +uny +iPj +cCQ +ijB +nZT +uHf +iPj +uEV +gnx nMd fTa -kLI +vKm hts -kLI -kLI -vGw +vKm +vKm +pvA oQC vfD dkc fkN -kLI +vKm fqv hts hts @@ -55851,9 +58270,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -55885,7 +58301,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -55921,14 +58340,14 @@ hts hts hts uDM -yfj +gIC dOB dOB dOB dOB dOB -kLI -kLI +vKm +vKm hts hts goG @@ -55938,30 +58357,30 @@ nkE thb thb svf -lMi -ofO -tAX -vHR -tAX -qZb -tAX -tAX -vHR -tAX -nGg -eZP -nMd +dHe +qgS +jdt +vNA +jdt +jdt +jdt +jdt +vNA +jdt +odi +dCT +aKS fTa hts hts -kLI -kLI +mRB +mRB fkN fkN fkN fkN fkN -eNC +oTr fqv hts hts @@ -56045,9 +58464,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -56072,14 +58488,17 @@ qVH qVH qVH qVH -xPj qVH qVH qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -56115,14 +58534,14 @@ hts hts hts uDM -kLI -kLI -tZK +vKm +vKm +eNd dOB dOB -kLI -kLI -kLI +vKm +vKm +vKm hts hts goG @@ -56132,30 +58551,30 @@ nkE vYd thb svf -dHe -qgS -jdt -vNA -jdt -jdt -jdt -jdt -vNA -jdt -odi -dCT -aKS +svf +svf +svf +svf +svf +svf +svf +svf +svf +svf +svf +mNk +fTa fTa hts hts -kLI -kLI -kLI mRB +vKm +vKm mRB -cil -kLI -kLI +mRB +ykn +vKm +vKm fqv hts hts @@ -56239,16 +58658,11 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH -scc qVH qVH -fLc qVH qVH qVH @@ -56263,7 +58677,6 @@ qVH qVH qVH qVH -xWA qVH qVH qVH @@ -56273,7 +58686,13 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -56309,14 +58728,14 @@ hts hts hts hts -cIh -cIh -cIh +pAq +pAq +pAq dOB dOB -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -56325,79 +58744,31 @@ lxL lxL vYd thb -svf -svf -svf -svf -svf -svf -svf -svf -svf -svf -svf -svf -mNk -fTa -fTa +oWw +non +cGt +oKu +lcs +uOu +uOu +oWC +non +oWw +dYk +oWw +oWw +vYd +vYd hts hts -kLI -kLI -kLI mRB +vKm +vKm mRB -cIh -cIh -cIh -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +mRB +pAq +pAq +pAq hts hts hts @@ -56405,8 +58776,6 @@ hts hts hts hts -"} -(138,1,1) = {" hts hts hts @@ -56436,6 +58805,57 @@ hts hts hts hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +"} +(138,1,1) = {" +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -56467,7 +58887,6 @@ qVH qVH qVH qVH -hts hts hts hts @@ -56504,13 +58923,13 @@ hts hts hts hts -kLI -kLI +vKm +vKm dOB dOB -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -56521,12 +58940,12 @@ vYd thb thb gGO -thb -vOl -vlS -uwR -uwR -mfc +ocZ +wch +qlX +bLg +bLg +ybY tNT fFt fFt @@ -56536,13 +58955,13 @@ vYd hts hts hts -kLI -kLI -kLI mRB mRB -kLI -kLI +mRB +mRB +mRB +vKm +vKm hts hts hts @@ -56627,9 +59046,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -56661,7 +59077,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -56698,11 +59117,11 @@ hts hts hts hts -kLI -kLI -hEu -kLI -kLI +vKm +vKm +syA +vKm +vKm hts hts hts @@ -56711,16 +59130,16 @@ hts vYd oWw fmX -mRB -uJw -mRB -mRB -mRB -lnZ -cKL -oWw -oWw -jjn +vYd +fEg +vYd +vYd +vYd +aHC +ixk +fmX +fmX +vYy vYd oWw oWw @@ -56732,11 +59151,11 @@ hts hts hts hts -kLI -kLI -hEu -kLI -kLI +vKm +vKm +syA +vKm +vKm hts hts hts @@ -56821,9 +59240,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -56834,7 +59250,6 @@ qVH qVH qVH qVH -vnE qVH qVH qVH @@ -56855,7 +59270,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -56892,11 +59311,11 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -56905,16 +59324,16 @@ hts vYd oWw fmX -ezJ -yao -jJz -bGD -mRB -gDQ -mLk -ikx -rnp -iOy +gwK +oWw +fmX +dLT +vYd +ocZ +bMq +wQL +lsc +usn vYd xVc xVc @@ -56926,11 +59345,11 @@ hts hts hts hts -frk -kLI -kLI -kLI -kLI +qGi +vKm +vKm +vKm +vKm hts hts hts @@ -57015,9 +59434,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -57049,7 +59465,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -57087,22 +59506,22 @@ hts hts hts hts -kLI -kLI -frk +vKm +vKm +qGi hts hts hts hts hts hts -jmt +jsZ fmX aZT -lHF -jJz -jJz -bGD +mZw +fmX +fmX +dLT hpx hpx rtC @@ -57121,9 +59540,9 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -57209,9 +59628,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -57227,7 +59643,6 @@ qVH qVH qVH qVH -kUE qVH qVH qVH @@ -57243,7 +59658,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -57291,12 +59710,12 @@ hts hts hts vYd -jmt +jsZ vYd -mRB -eSE -hpx -hpx +vYd +jsZ +xqa +xqa hpx laL hKm @@ -57403,9 +59822,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -57437,7 +59853,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -57486,9 +59905,9 @@ hts hts hts hts -kLI -hEu -kLI +vKm +syA +vKm hpx lMM hpx @@ -57499,8 +59918,8 @@ aPf hpx yao oDh -kLI -hEu +vKm +syA hts hts hts @@ -57597,9 +60016,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -57679,10 +60099,9 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm hpx ebT hpx @@ -57693,8 +60112,8 @@ cqS wii xRi oDh -kLI -kLI +vKm +vKm hts hts hts @@ -57791,9 +60210,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -57873,10 +60293,9 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm hpx byF hpx @@ -57887,8 +60306,8 @@ hpx hpx oDh oDh -kLI -kLI +vKm +vKm hts hts hts @@ -57985,9 +60404,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -58067,10 +60487,9 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm hpx dPl vwu @@ -58079,10 +60498,10 @@ wBN hmk pBx hpx -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -58179,9 +60598,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -58263,8 +60683,7 @@ hts hts hts hts -hts -kLI +vKm hpx dKA hpx @@ -58273,8 +60692,8 @@ ghL rgO qEO hpx -kLI -kLI +vKm +vKm hts hts hts @@ -58373,15 +60792,16 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH qVH qVH -kYz +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -58457,8 +60877,7 @@ hts hts hts hts -hts -kLI +vKm hpx hpx hpx @@ -58467,8 +60886,8 @@ hpx hpx hpx hpx -kLI -kLI +vKm +vKm hts hts hts @@ -58567,9 +60986,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -58653,13 +61073,12 @@ hts hts hts hts -hts -whH -rlY +oee +igf aQU oNf -rlY -ilo +igf +ccq hts hts hts @@ -58761,16 +61180,12 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH qVH qVH qVH -hFk qVH qVH qVH @@ -58795,7 +61210,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -58955,9 +61374,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -58969,7 +61385,6 @@ qVH qVH qVH qVH -bUR qVH qVH qVH @@ -58989,7 +61404,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -59149,9 +61568,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -59183,7 +61599,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -59343,9 +61762,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -59377,7 +61793,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -59537,9 +61956,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -59625,9 +62045,8 @@ hts hts hts hts -hts -hEu -gyk +syA +efw hts hts hts @@ -59731,9 +62150,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -59819,9 +62239,8 @@ hts hts hts hts -hts -kLI -gyk +vKm +efw hts hts hts @@ -59925,9 +62344,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -60013,9 +62433,8 @@ hts hts hts hts -hts -frk -lHx +qGi +fIL hts hts hts @@ -60119,9 +62538,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -60153,7 +62569,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -60313,9 +62732,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -60347,7 +62763,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -60507,9 +62926,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -60541,7 +62957,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts diff --git a/maps/euthenia/levels/deck3.dmm b/maps/euthenia/levels/deck3.dmm index 96121a5110..87705be7a2 100644 --- a/maps/euthenia/levels/deck3.dmm +++ b/maps/euthenia/levels/deck3.dmm @@ -5,20 +5,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) -"aaO" = ( -/obj/machinery/door/airlock{ - name = "Pilot's Office"; - req_one_access = list(67) - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/tether/exploration/pilot_office) "abz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -63,6 +49,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"adR" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "aen" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -70,6 +66,22 @@ /obj/structure/table/marble, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"aeD" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 2; + icon_state = "pdoor0"; + id = "engsec_ld_c"; + name = "CE Office Blast Doors"; + opacity = 0 + }, +/obj/effect/paint_stripe/sun, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/chief) "aeP" = ( /obj/structure/railing/grey{ dir = 1 @@ -105,6 +117,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"agk" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/medical/medbay3) "agK" = ( /obj/structure/closet/secure_closet/pilot, /obj/effect/floor_decal/borderfloorblack{ @@ -115,10 +131,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) -"ahp" = ( -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/reinforced, -/area/space) "ahG" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -127,6 +139,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "ahI" = ( @@ -141,6 +154,15 @@ "aje" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"ajw" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/welding/superior, +/obj/structure/closet/hydrant{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "akn" = ( /obj/structure/table/rack/shelf, /obj/effect/floor_decal/spline/fancy/wood{ @@ -180,6 +202,16 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/sleep/cryo) +"amo" = ( +/obj/machinery/door/window/brigdoor/northright{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ana" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -189,6 +221,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"anH" = ( +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "aoh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -231,6 +266,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"arh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/girder, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "aro" = ( /obj/structure/table/standard, /obj/item/aiModule/oxygen, @@ -255,23 +301,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/port) -"ass" = ( -/obj/machinery/air_alarm/server{ - dir = 4; - pixel_x = -21 +"asc" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 }, -/turf/simulated/floor/bluegrid{ - initial_gas_mix = "n2=100;TEMP=80"; - name = "Mainframe Base" +/obj/machinery/camera/network/cargo{ + dir = 1 }, -/area/tcommsat/chamber) +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "asC" = ( /obj/machinery/holopad, /turf/simulated/floor/wood, /area/tether/exploration/pilot_office) -"asI" = ( -/turf/simulated/floor/tiled/techfloor, -/area/space) "ath" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -285,6 +327,7 @@ /obj/structure/sign/deck3{ pixel_y = -32 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "atE" = ( @@ -366,6 +409,12 @@ icon_state = "techmaint" }, /area/security/brig) +"awi" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/chapel/office) "awI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -382,10 +431,6 @@ /obj/machinery/computer/arcade, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"awX" = ( -/obj/machinery/holoplant, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "awY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -393,8 +438,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -417,8 +461,7 @@ /obj/item/storage/firstaid/toxin{ pixel_y = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/blue, @@ -435,6 +478,18 @@ /obj/item/beach_ball/holoball, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/brig) +"ayC" = ( +/obj/landmark{ + name = "lightsout" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "azA" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -447,15 +502,24 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"azN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "aAa" = ( /turf/simulated/floor/wood, /area/hydroponics/garden) +"aAu" = ( +/obj/structure/largecrate, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) +"aAx" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"aAJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) +"aBc" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/hydroponics/garden) "aBh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -463,15 +527,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"aBp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "aBU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -486,6 +541,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"aCu" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"aDc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "aDu" = ( /turf/simulated/wall/prepainted/science, /area/rnd/rdoffice) @@ -496,7 +568,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "aED" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -508,7 +583,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "aFl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -520,6 +595,12 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled, /area/medical/virology) +"aFm" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/hand_labeler, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "aFG" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -539,6 +620,14 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) +"aHl" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/landmark/spawnpoint/job/mime, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "aHN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -603,7 +692,6 @@ }, /obj/structure/railing, /obj/structure/lattice, -/obj/machinery/door/firedoor, /turf/simulated/open, /area/main_map/maintenance/deck_three/forward/port) "aMR" = ( @@ -626,12 +714,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/exploration/pilot_office) -"aNP" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "aOa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -648,6 +730,13 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"aOu" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "aPr" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/nifsofts_medical, @@ -676,6 +765,22 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"aQi" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) +"aQt" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "aQw" = ( /obj/machinery/light/no_nightshift, /obj/structure/cable/green{ @@ -683,6 +788,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"aQX" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/medical/psych) "aSy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -692,6 +803,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"aTe" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "aTj" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -706,10 +821,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"aTt" = ( -/obj/structure/sign/hangar/three, -/turf/simulated/wall, -/area/main_map/Hangar_bay/deck2) "aTB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -722,6 +833,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/security/brig) +"aTI" = ( +/obj/structure/cable/blue{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "aUl" = ( /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/wood, @@ -729,6 +846,11 @@ "aUy" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/pilot_office) +"aVb" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "aVt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -745,12 +867,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"aVx" = ( -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "aVF" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 4 @@ -763,14 +879,6 @@ /obj/item/glass_jar, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"aVO" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "aWO" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -778,6 +886,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"aXg" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "aXJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -785,7 +900,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "aYm" = ( /obj/machinery/camera/network/security{ @@ -871,6 +986,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"baF" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/chapel/main) "baM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -891,8 +1015,7 @@ /obj/effect/floor_decal/industrial/loading{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/manifold/hidden/black, @@ -924,6 +1047,15 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"bbH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "bcl" = ( /obj/item/toy/plushie/farwa, /turf/simulated/floor/reinforced, @@ -945,6 +1077,33 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"bdy" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) +"bdD" = ( +/obj/structure/cable/green{ + icon_state = "32-8" + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/machinery/door/firedoor, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/port) "bdO" = ( /obj/machinery/vending/wallmed1/public{ pixel_y = 28 @@ -976,6 +1135,12 @@ /obj/structure/table/rack/shelf, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"beO" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "beU" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1079,25 +1244,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"blw" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/floodlight{ - anchored = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/space) "bmd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1108,23 +1254,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/triumph/surfacebase/sauna) -"bmG" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"bmJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/space) -"bmN" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/space) "bnj" = ( /obj/machinery/holopad, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -1140,17 +1269,8 @@ }, /turf/simulated/floor/tiled, /area/medical/virologyaccess) -"boh" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) "boD" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -1182,15 +1302,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) -"bsb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "bsl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -1201,29 +1312,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"bsz" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 +"bsC" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/space) +/turf/simulated/floor/carpet/bcarpet, +/area/chapel/main) "bsW" = ( /turf/simulated/wall, /area/tether/exploration/pilot_office) -"btL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) -"btT" = ( -/obj/machinery/disposal, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "bua" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1231,25 +1328,37 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"bve" = ( +"bus" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"buJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/borderfloorwhite/corner, -/obj/effect/floor_decal/corner/beige/bordercorner, -/turf/simulated/floor/tiled/white, -/area/medical/psych) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"buX" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) "bvj" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/white, /area/medical/resleeving) "bwF" = ( /obj/machinery/recharge_station, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light/no_nightshift{ dir = 8 }, @@ -1289,13 +1398,17 @@ /obj/structure/table/woodentable, /turf/simulated/floor/carpet, /area/medical/psych_ward) -"bzA" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 8 - }, -/turf/simulated/open, +"bzp" = ( +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"bzx" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "bzD" = ( /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) @@ -1305,6 +1418,12 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) +"bAt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "bAz" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -1355,14 +1474,24 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three/starboard) -"bCw" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plating, -/area/space) +"bDa" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 4 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/test_area) "bDk" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward) +"bDr" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/medical/psych) "bDB" = ( /obj/item/trash/candle, /turf/simulated/floor/plating, @@ -1401,34 +1530,54 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"bEV" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 8 +"bEM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) +"bEU" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) +/obj/landmark/spawnpoint/job/chief_engineer, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "bFs" = ( /obj/machinery/telecomms/processor/preset_one, /turf/simulated/floor/tiled/dark{ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"bFt" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "bFK" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck3) +"bFU" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"bGp" = ( +/obj/machinery/door/airlock/maintenance/command, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward) "bHh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "bHk" = ( /turf/simulated/floor/tiled/techmaint, @@ -1446,6 +1595,12 @@ "bHz" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/chapel/main) +"bHI" = ( +/obj/structure/cable/blue{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "bHT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1514,6 +1669,12 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/vacant/vacant_shop) +"bJm" = ( +/obj/machinery/door/airlock/glass_external, +/obj/item/barrier_tape_segment/engineering, +/obj/structure/fans/tiny, +/turf/simulated/floor/airless/ceiling, +/area/space) "bJx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1526,6 +1687,27 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"bJU" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) +"bKz" = ( +/obj/landmark/spawnpoint/latejoin/station/cryogenics, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "bLA" = ( /obj/structure/table/standard, /obj/structure/bedsheetbin, @@ -1540,13 +1722,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"bLS" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "bLY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -1554,21 +1729,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) -"bMF" = ( -/obj/machinery/door/airlock/glass{ - name = "Garden" +"bNk" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/hydroponics/garden) -"bMK" = ( -/obj/structure/ladder, -/obj/structure/largecrate, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +/area/main_map/maintenance/deck_three/port) "bOc" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/port) +"bOE" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "bOG" = ( /obj/machinery/cryopod, /turf/simulated/floor/tiled/techfloor/grid, @@ -1592,21 +1767,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"bPF" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/turf/simulated/floor/plating, -/area/space) "bQc" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -1621,6 +1781,14 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"bQK" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/cafeteria) "bQR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -1652,6 +1820,18 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/security/brig) +"bRB" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"bRF" = ( +/obj/effect/floor_decal/grass_edge, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "bRL" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; @@ -1670,6 +1850,27 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) +"bRW" = ( +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) +"bRZ" = ( +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/turf/simulated/floor/plating, +/area/chapel/office) +"bSR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "bTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1692,7 +1893,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/medical/virology) "bTM" = ( @@ -1711,6 +1912,7 @@ /area/hydroponics/garden) "bUa" = ( /obj/machinery/light/small, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "bUj" = ( @@ -1744,10 +1946,26 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"bVj" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"bWB" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/table/steel_reinforced, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) +"bXr" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/camera/network/cargo, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"bXy" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "bXA" = ( /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) @@ -1787,6 +2005,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"bZB" = ( +/obj/structure/closet/crate/biohazard, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/surgeryroom1) "bZH" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -1802,17 +2024,6 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"cao" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "caq" = ( /obj/structure/railing{ dir = 4 @@ -1844,15 +2055,6 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"cdq" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/obj/machinery/shield_diffuser, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "cdt" = ( /obj/machinery/door/blast/regular{ id = "xenobiovs"; @@ -1861,6 +2063,10 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"ceE" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/surgeryroom1) "ceK" = ( /obj/random/cutout, /obj/structure/sign/deck3{ @@ -1902,11 +2108,13 @@ }, /turf/simulated/floor/wood, /area/chapel/main) -"cgK" = ( -/obj/structure/bookcase, -/obj/structure/ladder, +"cgY" = ( +/obj/structure/cable/blue{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +/area/rnd/xenobiology) "chE" = ( /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/theatre) @@ -1939,10 +2147,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/rdoffice) -"ciN" = ( -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/space) "cja" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 1 @@ -1977,6 +2181,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "ckD" = ( @@ -1998,21 +2205,34 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) -"clW" = ( -/obj/machinery/telecomms/receiver/preset_right, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) "cmh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/cafeteria) -"cmq" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, +"cmv" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 1 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"cmw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "cnL" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -2035,19 +2255,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"coQ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "coZ" = ( /obj/effect/floor_decal/grass_edge, /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"cpy" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "cpz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2075,6 +2294,10 @@ /obj/random/cigarettes, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"cqE" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/medical/psych_ward) "crx" = ( /turf/simulated/floor/outdoors/dirt, /area/hydroponics/garden) @@ -2114,6 +2337,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"cuN" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "cvg" = ( /turf/simulated/floor/tiled/techmaint, /area/maintenance/library) @@ -2179,7 +2408,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "cAH" = ( /obj/structure/bed, @@ -2197,7 +2426,8 @@ dir = 1 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "cBa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2215,19 +2445,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, /area/rnd/test_area) -"cBg" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/space) -"cBh" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "cBC" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -2240,19 +2457,6 @@ }, /turf/simulated/floor/carpet, /area/medical/psych_ward) -"cCp" = ( -/obj/machinery/light_switch{ - pixel_y = -25 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/space) -"cDU" = ( -/obj/item/flame/candle/candelabra/everburn, -/turf/simulated/floor/tiled/techfloor, -/area/space) "cEf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -2302,12 +2506,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/prison) -"cHo" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/space) "cHQ" = ( /turf/simulated/floor/tiled/techmaint, /area/security/prison) @@ -2315,16 +2513,47 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/airless/ceiling, /area/space) -"cIP" = ( -/obj/machinery/door/airlock{ - name = "Chapel Office" +"cIZ" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/chapel/main) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) "cKv" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/aft/port) +"cLa" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/aft/port) +"cLs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) +"cLz" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 8 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/test_area) "cLD" = ( /obj/structure/simple_door/hardwood, /turf/simulated/floor/carpet, @@ -2336,12 +2565,11 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"cMh" = ( -/obj/machinery/door/airlock/glass{ - name = "Garden" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) +"cLQ" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "cNd" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -2358,10 +2586,6 @@ "cNP" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/port) -"cOG" = ( -/obj/machinery/light/fairy, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) "cOM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2374,11 +2598,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) -"cPA" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/space) "cQd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -2389,33 +2608,30 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"cQy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "cQB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) -"cRe" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-8" - }, +"cRm" = ( /obj/structure/cable/heavyduty{ - icon_state = "0-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"cRw" = ( -/obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/power/apc/critical/south_bump, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" }, -/area/tcommsat/chamber) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "cRQ" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologyisolation) @@ -2426,8 +2642,7 @@ /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) "cSm" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/reagent_dispensers/watertank, @@ -2466,17 +2681,10 @@ }, /turf/simulated/floor/tiled, /area/medical/morgue) -"cTM" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/effect/floor_decal/techfloor{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +"cSL" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/port) "cUh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/bcarpet, @@ -2495,11 +2703,25 @@ icon_state = "techmaint" }, /area/tcommsat/chamber) -"cUp" = ( -/obj/structure/catwalk, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) +"cUr" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/xenobiology) +"cUG" = ( +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "cUK" = ( /obj/machinery/air_sensor{ frequency = 1445; @@ -2520,6 +2742,14 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"cUV" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/recharger, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "cVW" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -2556,6 +2786,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rnd/rdoffice) +"cXQ" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"cYl" = ( +/turf/simulated/wall, +/area/medical/psych) "cYJ" = ( /turf/simulated/floor/bluegrid, /area/ai) @@ -2569,10 +2808,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"cZD" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/space) "cZF" = ( /obj/machinery/smartfridge/secure/extract, /obj/structure/window/reinforced{ @@ -2580,10 +2815,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"cZP" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) "dak" = ( /turf/simulated/floor/tiled/white, /area/medical/psych) @@ -2633,17 +2864,24 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"dbO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 5 - }, -/turf/simulated/wall/r_wall/prepainted/science, -/area/rnd/rdoffice) "dcR" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/security/brig) +"ddj" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/wood, +/area/tether/exploration/pilot_office) +"ddA" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "dec" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2661,7 +2899,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/medical/medbay3) "dfa" = ( @@ -2677,14 +2915,24 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "dfd" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai) -"dff" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) +"dfp" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "dfu" = ( /obj/structure/morgue{ dir = 8 @@ -2695,12 +2943,19 @@ /obj/structure/railing/grey, /turf/simulated/open, /area/ai_upload) -"dfU" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 9 +"dge" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"dhi" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck3) "dhv" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/robotics/surgeryroom1) @@ -2745,14 +3000,15 @@ "dks" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "dky" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "dkO" = ( /obj/structure/cable/green{ @@ -2762,9 +3018,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/security/brig) -"dlc" = ( -/turf/simulated/wall/r_wall, -/area/main_map/maintenance/deck_three) +"dlk" = ( +/obj/effect/floor_decal/grass_edge{ + dir = 1 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "dll" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -2775,16 +3037,14 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "dlL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "dma" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -2815,11 +3075,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"doQ" = ( -/obj/structure/ladder, -/obj/structure/barricade/cutout, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "dpj" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) @@ -2830,18 +3085,37 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"dpX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) +"dqt" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"dqG" = ( +/obj/machinery/door/window/brigdoor/northleft{ + req_access = null; + req_one_access = list(55); + name = "Containment Pen" + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "dqQ" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward) -"drw" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "drB" = ( /obj/structure/curtain/black{ anchored = 1; @@ -2872,12 +3146,33 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"dsi" = ( +/obj/machinery/door/airlock{ + name = "Pilot's Office"; + req_one_access = list(67) + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/tether/exploration/pilot_office) "dsp" = ( /obj/structure/sign/deck/third{ pixel_y = 32 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"dsL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "dsR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2929,22 +3224,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "duk" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass, /area/medical/psych_ward) -"duF" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced, -/turf/simulated/floor/reinforced/airless, -/area/rnd/test_area) "duH" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -2959,6 +3245,13 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) +"dvH" = ( +/obj/landmark/spawnpoint/latejoin/station/cryogenics, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "dvX" = ( /turf/simulated/floor/tiled/old_cargo/blue, /area/security/brig) @@ -2984,6 +3277,12 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"dwL" = ( +/obj/machinery/telecomms/server/presets/service/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "dxw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -2997,6 +3296,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"dxC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "dyu" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -3011,12 +3320,6 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/maintenance/deck_three) -"dyP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 9 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "dze" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3057,24 +3360,28 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"dAz" = ( +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "dAP" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10 - }, -/obj/machinery/air_alarm{ - pixel_y = 30 - }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "dAV" = ( /turf/space/basic, /area/space) +"dAZ" = ( +/obj/machinery/telecomms/hub/preset/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "dBh" = ( /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay recovery room door."; @@ -3105,6 +3412,13 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck3) +"dCv" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "dDp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3113,7 +3427,8 @@ dir = 8 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "dDq" = ( /obj/structure/sign/deck/third{ @@ -3129,6 +3444,13 @@ /obj/machinery/door/airlock/maintenance/rnd, /turf/simulated/floor/tiled/techmaint, /area/rnd/research) +"dEA" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "dFe" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 @@ -3140,9 +3462,16 @@ /obj/item/stool/padded, /turf/simulated/floor/tiled/steel, /area/security/brig) -"dFJ" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/main_map/maintenance/deck_three/aft/port) +"dFl" = ( +/obj/machinery/power/emitter{ + dir = 4; + anchored = 1 + }, +/obj/structure/cable/blue{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "dGQ" = ( /obj/structure/bed/psych, /turf/simulated/floor/wood, @@ -3171,14 +3500,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"dJS" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) -"dKj" = ( -/obj/structure/dogbed, -/obj/item/toy/plushie/squid/pink, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +"dIS" = ( +/turf/simulated/wall/r_wall, +/area/maintenance/substation/flight_deck) "dKw" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -3187,6 +3511,15 @@ /obj/machinery/computer/telecomms/server, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) +"dLd" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/brig) "dLA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -3203,20 +3536,28 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"dMB" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "dNe" = ( /obj/structure/table/marble, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"dNp" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(18,47) - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) "dNC" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/sleep/cryo) +"dND" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "dOb" = ( /turf/simulated/open, /area/main_map/hallway/deck3) @@ -3232,12 +3573,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/security/prison) -"dPc" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "dPy" = ( /turf/simulated/floor/glass/reinforced, /area/crew_quarters/cafeteria) @@ -3251,9 +3586,10 @@ /turf/simulated/floor/tiled, /area/medical/resleeving) "dPN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ +/obj/structure/railing{ dir = 4 }, +/obj/structure/railing, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "dQv" = ( @@ -3304,24 +3640,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/prison) -"dTq" = ( -/obj/structure/barricade, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/plating, -/area/space) -"dTL" = ( -/obj/machinery/light/fairy{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) -"dTX" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "dUa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -3344,6 +3662,10 @@ /obj/structure/bed/chair/sofa/black/right, /turf/simulated/floor/wood, /area/library) +"dUw" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "dVc" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -3357,6 +3679,12 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"dVK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "dVM" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -3380,12 +3708,16 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"dWI" = ( -/obj/structure/railing{ - dir = 8 +"dXq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/borderfloorwhite/corner, +/obj/effect/floor_decal/corner/beige/bordercorner, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "dXJ" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -3419,12 +3751,29 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"dYT" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck3) "dYU" = ( /obj/structure/closet/crate/bin{ anchored = 1 }, /turf/simulated/floor/tiled/steel, /area/security/brig) +"dZg" = ( +/obj/machinery/telecomms/receiver/preset_right/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) +"dZq" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "dZu" = ( /turf/simulated/floor/tiled, /area/medical/morgue) @@ -3432,13 +3781,9 @@ /obj/structure/sign/warning/nosmoking_2, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/workshop) -"eap" = ( -/obj/structure/cable/heavyduty, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) +"dZZ" = ( +/turf/simulated/wall/r_wall, +/area/medical/psych) "eaE" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -3452,6 +3797,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"ebF" = ( +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "ecG" = ( /turf/simulated/open, /area/main_map/maintenance/deck_three/aft/starboard) @@ -3474,6 +3823,24 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"edw" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"edY" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_three/starboard) +"eei" = ( +/obj/machinery/computer/security/mining{ + dir = 1; + name = "xenobiology camera monitor"; + network = list("Xenobiology") + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "eeo" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -3487,6 +3854,22 @@ "eey" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_three/aft/starboard) +"efb" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "efy" = ( /obj/machinery/computer/aifixer, /turf/simulated/floor/tiled/techfloor, @@ -3519,6 +3902,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"ehU" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/chapel/office) "eia" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -3532,6 +3923,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"eju" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "elp" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3582,6 +3977,29 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/techfloor, /area/engineering/gravity_gen) +"eou" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/security/brig) +"eoC" = ( +/obj/structure/table/reinforced, +/obj/machinery/camera/network/engineering{ + dir = 8 + }, +/obj/item/storage/box/snakesnackbox, +/obj/machinery/button/remote/blast_door{ + id = "engsec_ld_c"; + name = "Access Lockdown"; + pixel_x = 25 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "eoD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3591,6 +4009,29 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"epn" = ( +/obj/machinery/smartfridge/secure/extract{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"epr" = ( +/obj/structure/stairs/spawner/south, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) +"epJ" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/catering/bar_soft{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "epN" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, @@ -3625,8 +4066,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) +"eqL" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/xenobiology) +"err" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Elevator Shaft Access"; + req_one_access = null + }, +/turf/simulated/floor/plating, +/area/medical/medbay3) "erC" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -3647,18 +4107,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/storage) -"erV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) "esJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -3669,6 +4117,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"etj" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "etJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -3699,6 +4153,12 @@ }, /turf/simulated/wall/r_lead, /area/engineering/gravity_gen) +"ewo" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "exf" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -3727,18 +4187,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) -"eym" = ( -/obj/structure/sign/deck3{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/space) "eyF" = ( /obj/structure/bed/chair/sofa/black/right{ dir = 4 @@ -3748,6 +4196,10 @@ "eyN" = ( /turf/simulated/wall/prepainted/science, /area/rnd/workshop) +"ezx" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ezE" = ( /obj/effect/floor_decal/borderfloorblack, /obj/machinery/suit_cycler/pilot, @@ -3776,6 +4228,13 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"eBy" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "eCf" = ( /obj/structure/table/woodentable, /obj/machinery/computer/med_data/laptop, @@ -3791,10 +4250,19 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"eCW" = ( -/obj/structure/barricade, -/turf/simulated/floor/reinforced, -/area/space) +"eCt" = ( +/turf/simulated/wall/r_wall, +/area/main_map/hanger_cafe) +"eDc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "eDE" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -3808,13 +4276,6 @@ "eDH" = ( /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"eDJ" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/direction_bump/east, -/turf/simulated/floor/tiled/monotile, -/area/rnd/xenobiology) "eEb" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -3835,15 +4296,6 @@ }, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"eEn" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/obj/machinery/camera/network/cargo{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/space) "eEA" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -3903,20 +4355,34 @@ /obj/structure/morgue, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"eHm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"eHp" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) "eHK" = ( /obj/landmark/spawnpoint/latejoin/station/cyborg, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) -"eHY" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/chapel/main) "eIu" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/medical/psych_ward) +"eIx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "eIH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3972,6 +4438,13 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"eJQ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) "eKb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -3994,26 +4467,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_monitoring) -"eKZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/beige/border, -/turf/simulated/floor/tiled/white, -/area/medical/psych) -"eLa" = ( -/obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) +"eKp" = ( +/obj/machinery/holopad, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "eLh" = ( /obj/structure/railing{ dir = 8 @@ -4042,6 +4499,23 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/security/brig) +"eMv" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) +"eMG" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/senior_engineer, +/turf/simulated/floor/tiled, +/area/engineering/engine_monitoring) "eMN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4051,10 +4525,30 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"eNj" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"eNA" = ( +/obj/structure/curtain/black{ + anchored = 1; + icon_state = "open" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/chapel/main) "eNE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "eOO" = ( @@ -4070,13 +4564,18 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"eQf" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "eQh" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"eQQ" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/space) "eRb" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, @@ -4098,17 +4597,32 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"eRZ" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/cargo_shelter_dock) "eSK" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/starboard) "eSO" = ( /turf/simulated/floor/tiled/techfloor, /area/chapel/main) -"eTk" = ( -/obj/structure/ladder, -/obj/structure/bookcase, +"eTA" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/chapel/main) +"eTK" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +/area/main_map/maintenance/deck_three/port) "eTL" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -4124,17 +4638,8 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"eVa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2) "eVd" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4145,6 +4650,13 @@ /obj/item/storage/box/cups, /turf/simulated/floor/wood, /area/medical/medbay3) +"eXb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "eXz" = ( /obj/structure/table/standard, /obj/machinery/computer/atmoscontrol/laptop{ @@ -4160,6 +4672,30 @@ "eXF" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/main_map/maintenance/deck_three/aft/starboard) +"eXQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) +"eXV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hydroponics/garden) +"eYt" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "eYF" = ( /obj/machinery/air_alarm{ dir = 8; @@ -4167,6 +4703,30 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"eYR" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/port) +"eYX" = ( +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(55); + name = "Containment Pen" + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"faG" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + req_one_access = list(31); + name = "Cargo" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) "faU" = ( /obj/machinery/air_alarm{ dir = 1; @@ -4219,6 +4779,16 @@ /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_three) +"fdh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "fdz" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/grass_edge{ @@ -4236,25 +4806,16 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"feM" = ( -/obj/machinery/door/airlock/multi_tile/glass/polarized{ - dir = 2; - id_tint = "saunatint"; - name = "Sauna" - }, -/turf/simulated/floor/tiled, -/area/triumph/surfacebase/sauna) "ffa" = ( /obj/structure/railing, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"ffr" = ( -/obj/machinery/door/airlock{ - name = "Hydroponics"; - req_one_access = list(35) +"ffL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, -/area/hydroponics) +/area/main_map/maintenance/deck_three/port) "ffQ" = ( /obj/machinery/camera/network/cargo{ dir = 8 @@ -4319,10 +4880,10 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) -"fkB" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/steel, -/area/security/brig) +"fjW" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "fkM" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/structure/railing, @@ -4336,12 +4897,27 @@ /obj/machinery/cell_charger, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"flF" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) "flO" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"fmo" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck2) "fmq" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 10 @@ -4365,10 +4941,6 @@ /obj/item/stock_parts/subspace/treatment, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) -"fnD" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/floor/tiled/techmaint, -/area/space) "foe" = ( /obj/structure/fence/door, /obj/machinery/door/firedoor{ @@ -4403,6 +4975,10 @@ }, /turf/simulated/floor/carpet, /area/security/brig) +"foV" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "fpr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4437,6 +5013,23 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/theatre) +"fqF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) +"fqJ" = ( +/obj/structure/table/bench/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "fqY" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/wood, @@ -4444,6 +5037,11 @@ "frn" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) +"frM" = ( +/obj/machinery/computer/atmos_alert, +/obj/machinery/camera/network/engineering, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "frV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4452,15 +5050,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"frY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) "fsf" = ( /obj/structure/table/standard, /obj/machinery/librarypubliccomp, @@ -4502,12 +5091,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/entrance) -"fud" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 +"ftM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled/steel_ridged, +/area/hydroponics/garden) "fuh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4557,6 +5147,24 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"fvT" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"fwR" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) +"fxt" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "fxw" = ( /obj/effect/floor_decal/industrial/danger{ dir = 1 @@ -4566,13 +5174,10 @@ "fxX" = ( /turf/simulated/open, /area/ai) -"fyY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three/starboard) +"fyg" = ( +/obj/structure/railing/grey, +/turf/simulated/open, +/area/rnd/xenobiology) "fzo" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4583,12 +5188,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"fzE" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three/forward/starboard) "fAH" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -4597,13 +5196,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"fBa" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "fBl" = ( /obj/machinery/porta_turret/ai_defense, /turf/simulated/floor/tiled/techfloor, @@ -4614,6 +5206,13 @@ }, /turf/simulated/floor/wood, /area/library) +"fBD" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/obj/machinery/camera/network/cargo, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "fCd" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -4630,6 +5229,10 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_three) +"fDt" = ( +/obj/machinery/atmospherics/pipe/simple/insulated, +/turf/simulated/floor/reinforced/overhang, +/area/space) "fDA" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -4711,7 +5314,7 @@ req_access = list(39) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -4723,6 +5326,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"fFz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "fGi" = ( /obj/machinery/holoplant, /obj/effect/floor_decal/spline/fancy/wood, @@ -4791,6 +5404,10 @@ name = "Cold Room Base" }, /area/rnd/xenobiology) +"fHc" = ( +/obj/structure/bed/chair/sofa/black/corner, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "fHn" = ( /turf/simulated/wall/prepainted/medical, /area/medical/psych/psych_2) @@ -4819,43 +5436,18 @@ "fHR" = ( /turf/simulated/floor/wood, /area/medical/psych_ward) -"fIj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/techfloor/orange{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/engineering/engine_monitoring) +"fIa" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "fIR" = ( /obj/structure/railing, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) -"fJt" = ( -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) -"fJB" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "fJO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -4871,9 +5463,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"fKs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "fKv" = ( /turf/simulated/wall/prepainted/medical, /area/medical/virologyaccess) +"fKO" = ( +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "fLa" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -4906,13 +5510,9 @@ "fMH" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/cryo) -"fNv" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) +"fMZ" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_three/port) "fNU" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -4955,6 +5555,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"fQi" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "fRt" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -4966,16 +5570,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) -"fRy" = ( -/obj/structure/closet/crate/bin{ - desc = "A large bin for medical and other personnel that deals with bio-grade waste."; - icon_closed = "biohazard"; - icon_opened = "biohazardopen"; - icon_state = "biohazard"; - name = "biohazard bin" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/surgeryroom1) "fRL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -5013,25 +5607,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"fSH" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/obj/structure/closet/crate/bin{ - desc = "A large bin for medical and other personnel that deals with bio-grade waste."; - icon_closed = "biohazard"; - icon_opened = "biohazardopen"; - icon_state = "biohazard"; - name = "biohazard bin" - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/medical/virology) "fTu" = ( /obj/structure/window/reinforced, /obj/machinery/disposal, @@ -5056,12 +5631,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"fUh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/reinforced, -/area/space) +"fUm" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/skills, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "fUz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -5078,13 +5652,28 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) -"fUX" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced/airless, -/area/space) +"fUQ" = ( +/obj/machinery/door/airlock/atmos{ + name = "Civilian Atmospherics Backup"; + req_access = list(24) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) +"fVo" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/holofloor/tiled/dark, +/area/medical/medbay3) +"fVq" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/brig) "fVG" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/warning, @@ -5096,6 +5685,14 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"fWa" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "fWF" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -5104,6 +5701,10 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled, /area/rnd/test_area) +"fXn" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "fXp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -5111,8 +5712,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"fXv" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/cryo) +"fXD" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "fXE" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -5138,20 +5749,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"fYC" = ( -/obj/effect/floor_decal/industrial/loading, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/prison) -"fYM" = ( -/obj/machinery/vending/hydronutrients, -/turf/simulated/floor/tiled, -/area/hydroponics) "fZf" = ( /obj/machinery/door/airlock/medical{ id_tag = "mentaldoor"; @@ -5220,6 +5817,9 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) +"gaO" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/maintenance/deck_three/aft) "gaS" = ( /turf/simulated/floor/tiled, /area/medical/psych) @@ -5249,10 +5849,40 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) +"gcJ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"gcT" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/surgeryroom1) +"gdg" = ( +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"gdu" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck3) "gdO" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/brig) +"ger" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/quartermaster/cargo_shelter_dock) "gev" = ( /obj/landmark/spawnpoint/latejoin/station/cryogenics, /obj/effect/floor_decal/techfloor{ @@ -5271,12 +5901,6 @@ }, /turf/simulated/floor/wood, /area/medical/medbay3) -"gfE" = ( -/obj/structure/bed/chair/sofa/black/left{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "ggL" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -5286,10 +5910,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"ghj" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/space) "ghr" = ( /obj/item/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ @@ -5297,34 +5917,36 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"ghw" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/simulated/floor/carpet/sblucarpet, -/area/medical/psych/psych_1) "ghy" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ppflowers, /obj/machinery/light/flamp, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"ghY" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 4 +"gjj" = ( +/obj/structure/bed/chair/wood{ + dir = 8 }, -/obj/machinery/camera/network/cargo, -/turf/simulated/floor/reinforced, -/area/space) +/obj/effect/floor_decal/spline/fancy/wood, +/obj/landmark/spawnpoint/job/clown, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) +"gjx" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "gjF" = ( /turf/simulated/floor/tiled/old_cargo/red, /area/security/brig) -"gks" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/west, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/storage) +"gjG" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "gkv" = ( /obj/structure/table/steel_reinforced, /obj/machinery/camera/network/research{ @@ -5359,6 +5981,12 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) +"gmN" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "gnr" = ( /obj/machinery/vending/loadout/uniform, /obj/machinery/air_alarm{ @@ -5374,6 +6002,12 @@ /obj/structure/lattice, /turf/simulated/open, /area/space) +"gok" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "goY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -5382,7 +6016,8 @@ dir = 8 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "gpO" = ( /obj/machinery/light/small{ @@ -5390,23 +6025,43 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) -"gqr" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) -"gqu" = ( +"gpT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"gqm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) +"gqn" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck3) "grs" = ( /turf/simulated/floor/carpet/bcarpet, /area/security/brig) +"grH" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/rnd/xenobiology) "gsh" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -5422,13 +6077,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) -"gsM" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 32 - }, -/obj/structure/filingcabinet/tall, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "gsR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5445,18 +6093,32 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"gvc" = ( +"guB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /obj/structure/cable/green{ - icon_state = "0-8" + icon_state = "1-4" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-2" }, -/obj/machinery/power/apc/direction_bump/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/surgeryroom1) +/turf/simulated/floor/tiled, +/area/engineering/engine_monitoring) +"guS" = ( +/obj/item/storage/fancy/whitecandle_box, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "gvK" = ( /obj/machinery/ntnet_relay, /obj/machinery/camera/network/tcomms, @@ -5482,17 +6144,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/security/prison) -"gxi" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/landmark/spawnpoint/job/pathfinder, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 +"gxJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "gyL" = ( /obj/structure/railing, /obj/structure/railing{ @@ -5553,6 +6210,26 @@ /obj/item/slime_extract/grey, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"gAS" = ( +/obj/structure/table/steel, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) +"gBi" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/port) "gBr" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/red, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5566,9 +6243,6 @@ /obj/machinery/biogenerator, /turf/simulated/floor/outdoors/dirt, /area/hydroponics/garden) -"gDb" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/tether/exploration/pathfinder_office) "gDo" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -5586,13 +6260,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"gEA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +"gEn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) "gFr" = ( @@ -5606,16 +6280,15 @@ /obj/structure/bed/chair/sofa/black/left, /turf/simulated/floor/wood, /area/library) -"gGt" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 +"gGy" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"gHo" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/obj/structure/table/wooden_reinforced, -/obj/item/flame/candle/candelabra/everburn, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/port) "gHG" = ( /obj/structure/closet/firecloset, @@ -5627,6 +6300,10 @@ }, /turf/simulated/open, /area/rnd/research) +"gHN" = ( +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/tiled, +/area/hydroponics) "gIe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -5681,6 +6358,16 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) +"gKB" = ( +/obj/structure/table/reinforced, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/photocopier/faxmachine{ + department = "CMO's Office" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "gKP" = ( /obj/machinery/light/flamp, /obj/effect/floor_decal/grass_edge{ @@ -5699,18 +6386,26 @@ }, /turf/simulated/floor/tiled/techmaint, /area/security/prison) +"gLb" = ( +/obj/structure/bed/chair/sofa/black/left{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/psychiatrist, +/turf/simulated/floor/carpet, +/area/medical/psych) "gLg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) -"gLk" = ( -/obj/structure/railing{ - dir = 1 +"gLB" = ( +/obj/machinery/door/airlock/atmos{ + name = "Civilian Atmospherics Backup"; + req_access = list(24) }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "gLW" = ( /obj/structure/table/bench/wooden, /obj/machinery/light/no_nightshift{ @@ -5731,29 +6426,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/library) -"gMT" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/structure/table/wooden_reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/port) -"gMZ" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft/port) "gNU" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/tcommsat/chamber) +"gOE" = ( +/obj/structure/cable/heavyduty, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "gOY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -5792,12 +6474,6 @@ /obj/structure/bed/chair/wood/wings, /turf/simulated/floor/wood, /area/medical/psych_ward) -"gQn" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "gQv" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -5825,6 +6501,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"gRy" = ( +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -12 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "gRE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -5842,15 +6525,6 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/hydroponics/garden) -"gSo" = ( -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Pathfinder's Office"; - pixel_x = 2; - pixel_y = 4 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "gSx" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, @@ -5902,6 +6576,16 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"gUP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "gVa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -5949,8 +6633,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"gXZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "gYv" = ( /obj/machinery/light/small{ dir = 8 @@ -5967,10 +6658,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"gYG" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/triumph/surfacebase/sauna) "gYO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -5983,15 +6670,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"gZb" = ( -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/space) "haf" = ( /obj/structure/filingcabinet/chestdrawer{ name = "Medical Forms" @@ -6006,16 +6684,13 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) -"haM" = ( -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/airless/ceiling, -/area/space) "hbf" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "hbl" = ( /obj/structure/noticeboard{ @@ -6033,6 +6708,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) +"hbV" = ( +/obj/structure/closet/secure_closet/engineering_chief, +/obj/item/clothing/accessory/poncho/roles/cloak/ce, +/obj/machinery/requests_console/preset/ce{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "hcc" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -6065,15 +6748,6 @@ /obj/machinery/computer/telecomms/monitor, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) -"hel" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/space) "heB" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/air_alarm{ @@ -6082,22 +6756,24 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"hgb" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) "hgH" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) +"hhj" = ( +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "hhq" = ( /obj/structure/largecrate, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) +"hhu" = ( +/obj/structure/ladder, +/obj/structure/largecrate, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "hiZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -6138,11 +6814,26 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"hjD" = ( -/obj/structure/ladder, -/obj/structure/stasis_cage, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +"hjH" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) +"hjZ" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/grass_edge{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "hkd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -6155,15 +6846,15 @@ "hko" = ( /turf/simulated/wall/durasteel, /area/ai) +"hlg" = ( +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "hlI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/security/brig) -"hmr" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/wood, -/area/space) "hmB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -6213,6 +6904,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"hpg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "hpl" = ( /turf/simulated/floor/wood, /area/rnd/xenobiology) @@ -6232,12 +6928,6 @@ /obj/machinery/light/flamp, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"hqD" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/hallway/deck3) "hqV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -6258,6 +6948,10 @@ /obj/structure/table/rack, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"hrW" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "hsd" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain, @@ -6277,11 +6971,23 @@ /obj/item/mirrortool, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"htm" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"htA" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/clothing/mask/breath, +/obj/item/hardsuit/ce/equipped{ + req_access = list(56) + }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "htN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6294,6 +7000,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"htR" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"hua" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "hug" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6306,6 +7023,10 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"huF" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "huR" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/structure/railing{ @@ -6313,16 +7034,21 @@ }, /turf/simulated/floor/plating, /area/rnd/storage) -"huS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"hvd" = ( +/obj/machinery/door/airlock{ + name = "Hydroponics"; + req_one_access = list(35) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/hydroponics) +"hvh" = ( +/obj/structure/closet/crate/miningcar, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/obj/structure/table/standard, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) +/area/quartermaster/cargo_shelter_dock) "hvn" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -6330,12 +7056,6 @@ }, /turf/simulated/floor/tiled, /area/medical/morgue) -"hwb" = ( -/obj/structure/bed/chair/sofa/black/corner{ - dir = 1 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "hwI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6389,12 +7109,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"hyH" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +"hyP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) +"hyQ" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_three/aft/port) "hyW" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -6419,6 +7149,10 @@ /obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) +"hzS" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "hzZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6448,12 +7182,18 @@ /obj/machinery/librarypubliccomp, /turf/simulated/floor/wood, /area/library) -"hAT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +"hAU" = ( +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "hBM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6465,6 +7205,13 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) +"hBS" = ( +/obj/structure/largecrate, +/obj/item/hardsuit/industrial/old/spring, +/obj/item/hardsuit_module/device/rigwelder, +/obj/random/powercell, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "hCc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -6482,6 +7229,23 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"hCv" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/brig) +"hCW" = ( +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/structure/table/standard, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "hDc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6496,7 +7260,8 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "hEY" = ( -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three) "hFt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6521,6 +7286,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"hGo" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) +"hGu" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) +"hGF" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 6 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "hGG" = ( /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/steel, @@ -6531,6 +7318,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"hHq" = ( +/obj/machinery/light_switch{ + pixel_y = -25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "hHE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -6540,23 +7336,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"hHP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/main_map/maintenance/deck_three) -"hIk" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three/starboard) -"hIN" = ( -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) +"hHL" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "hJe" = ( /obj/effect/floor_decal/corner/green/border{ dir = 1 @@ -6566,13 +7349,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"hJw" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) "hJx" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -6588,6 +7364,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"hKu" = ( +/obj/item/flame/candle/candelabra, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "hLt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6600,28 +7380,14 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) -"hLM" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/zpipe/up{ - dir = 1 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "hLT" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_2) -"hMw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/airlock/glass{ - name = "Garden" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/hydroponics/garden) +"hMB" = ( +/obj/structure/sign/hangar/three, +/turf/simulated/wall/r_wall, +/area/main_map/hanger_cafe) "hMG" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, @@ -6662,6 +7428,10 @@ }, /turf/simulated/floor/reinforced, /area/space) +"hOk" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "hOM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6683,15 +7453,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/hydroponics/garden) -"hQF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "hQS" = ( /obj/structure/filingcabinet/medical{ desc = "A large cabinet with hard copy medical records."; @@ -6735,6 +7496,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"hRB" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) +"hRZ" = ( +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "hSA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -6753,18 +7524,17 @@ "hUd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "hUC" = ( /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck3) -"hVs" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/spline/plain{ - dir = 8 +"hUD" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) "hVt" = ( /obj/structure/sign/deck3{ pixel_y = 32 @@ -6788,28 +7558,39 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"hXp" = ( -/obj/structure/railing{ +"hXc" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"hXt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three) +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"hXV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "hZk" = ( /obj/machinery/air_alarm{ pixel_y = 22 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"hZl" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck3) "hZt" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload) -"hZy" = ( -/obj/random/obstruction, -/turf/simulated/floor/plating, -/area/space) +"hZv" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "hZN" = ( /obj/structure/cable{ icon_state = "2-8" @@ -6857,6 +7638,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"idd" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/space) "idm" = ( /obj/machinery/holoplant, /obj/structure/railing/grey, @@ -6865,12 +7649,29 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/hallway/deck3) +"idH" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "idO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"ieq" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/turf/simulated/floor/plating, +/area/chapel/office) "ieI" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -6887,6 +7688,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three) +"ifo" = ( +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "ifR" = ( /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -6898,6 +7702,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"igF" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "ihc" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor/grid, @@ -6941,12 +7752,38 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology) +"ijC" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "ijD" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"ijR" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) +"ijZ" = ( +/obj/machinery/power/apc/north_mount, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "ike" = ( /obj/structure/railing{ dir = 4 @@ -6960,16 +7797,6 @@ /obj/structure/simple_door/wood, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"iks" = ( -/turf/simulated/wall/prepainted/civilian, -/area/space) -"ikt" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/starboard) "ikJ" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing{ @@ -6977,11 +7804,6 @@ }, /turf/simulated/floor/plating, /area/rnd/research) -"ikZ" = ( -/obj/structure/ladder, -/obj/structure/frame, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "ilQ" = ( /obj/random/junk, /turf/simulated/floor/plating, @@ -7026,29 +7848,29 @@ }, /turf/simulated/floor/plating, /area/ai_upload) -"ioF" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 +"ioT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "ioV" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) -"ipp" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait, -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) "ipw" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"ipG" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "iqq" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research) @@ -7058,6 +7880,11 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"iri" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "irH" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) @@ -7086,9 +7913,48 @@ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/medical/psych) +"itl" = ( +/obj/machinery/door/blast/regular{ + density = 0; + dir = 2; + icon_state = "pdoor0"; + id = "engsec_ld_c"; + name = "CE Office Blast Doors"; + opacity = 0 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/chief) +"itw" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"itK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) +"itS" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) +"itV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "iul" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 1; @@ -7101,16 +7967,16 @@ }, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"iuo" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "ius" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"iuw" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "iuS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -7130,16 +7996,6 @@ /obj/item/toy/plushie/kitten, /turf/simulated/floor/wood, /area/medical/psych/psych_1) -"iwI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/plating, -/area/space) "iwJ" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -7151,6 +8007,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"iwK" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "iwX" = ( /obj/structure/bed/chair/wheelchair, /obj/effect/floor_decal/industrial/outline/blue, @@ -7163,7 +8025,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) "ixl" = ( @@ -7239,6 +8101,7 @@ /area/main_map/Hangar_bay/deck2) "iAl" = ( /obj/structure/ladder/up, +/obj/structure/largecrate, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "iAp" = ( @@ -7254,6 +8117,17 @@ /obj/machinery/door/window/eastleft, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"iAI" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/psychiatrist, +/turf/simulated/floor/carpet/sblucarpet, +/area/medical/psych/psych_1) +"iAT" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "iAX" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck3) @@ -7272,7 +8146,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "iCw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7308,6 +8183,13 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/security/prison) +"iDQ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "iEg" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ external_pressure_bound = 0; @@ -7330,16 +8212,23 @@ /obj/machinery/atmospherics/pipe/manifold/visible/purple, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"iER" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "iFC" = ( /obj/machinery/door/airlock/glass{ name = "Psyche Lobby Room" }, /turf/simulated/floor/tiled, /area/medical/psych) -"iFG" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +"iFS" = ( +/obj/machinery/door/airlock/glass_external, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) "iFT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/bed/chair{ @@ -7362,10 +8251,22 @@ }, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"iGJ" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/starboard) +"iGe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"iGW" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 8 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/test_area) "iHr" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -7415,21 +8316,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/cafeteria) -"iJv" = ( -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor/tiled/techmaint, -/area/space) "iJX" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"iKt" = ( -/obj/item/flame/candle/candelabra, -/turf/simulated/floor/tiled/techfloor, -/area/space) +"iKW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "iLO" = ( /obj/machinery/door/airlock/maintenance/sec, /obj/structure/cable/green{ @@ -7448,6 +8347,9 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"iMk" = ( +/turf/simulated/wall/prepainted/security, +/area/security/brig) "iMM" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/emcloset, @@ -7459,13 +8361,16 @@ dir = 8 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"iMU" = ( -/obj/structure/largecrate, +"iMZ" = ( +/obj/structure/closet/firecloset, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three/starboard) "iNg" = ( /obj/structure/bookcase/legal/sop, /turf/simulated/floor/wood, @@ -7550,6 +8455,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"iPf" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "iPw" = ( /obj/structure/sink{ dir = 4; @@ -7600,6 +8509,16 @@ /obj/item/beach_ball, /turf/simulated/floor/grass, /area/medical/psych_ward) +"iQe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft) "iQH" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor, @@ -7645,20 +8564,16 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) -"iTr" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/hydroponics/garden) +"iTJ" = ( +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "iTP" = ( /turf/simulated/wall/r_wall, /area/maintenance/substation/tcomms) -"iUo" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2) +"iUg" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "iUy" = ( /obj/landmark{ name = "lightsout" @@ -7671,10 +8586,10 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"iVS" = ( -/obj/structure/sign/deck3, -/turf/simulated/wall/r_wall, -/area/engineering/engine_eva) +"iVA" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "iVT" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing/grey{ @@ -7702,6 +8617,18 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"iWW" = ( +/obj/structure/sign/deck3{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "iXA" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled, @@ -7731,6 +8658,13 @@ /obj/structure/railing, /turf/simulated/floor/tiled, /area/crew_quarters/pool) +"iZs" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "iZx" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -7743,15 +8677,6 @@ "jan" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/forward/starboard) -"jap" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-2" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "jaO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -7790,6 +8715,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"jce" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/south_mount, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"jcj" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "jcl" = ( /obj/structure/coatrack, /obj/effect/floor_decal/spline/fancy/wood{ @@ -7806,10 +8742,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/warehouse) -"jds" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/plating, -/area/space) "jdx" = ( /turf/simulated/floor/wood, /area/medical/psych/psych_2) @@ -7833,7 +8765,7 @@ /area/main_map/maintenance/deck_three) "jeM" = ( /obj/machinery/door/blast/regular{ - dir = 4 + dir = 2 }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) @@ -7846,21 +8778,24 @@ "jfJ" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) -"jfR" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/space) "jfY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"jgd" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"jgk" = ( +/obj/random/obstruction, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "jgu" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/item/radio/intercom{ @@ -7873,6 +8808,11 @@ }, /turf/simulated/floor/tiled, /area/medical/virologyaccess) +"jgR" = ( +/obj/machinery/atmospherics/mains_pipe/manifold4w/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "jgY" = ( /obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass/polarized{ @@ -7881,48 +8821,48 @@ }, /turf/simulated/floor/tiled/techfloor, /area/library) +"jhb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/chapel/office) "jhf" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"jhs" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/psychiatrist, +/turf/simulated/floor/carpet/sblucarpet, +/area/medical/psych/psych_2) "jiL" = ( /turf/simulated/floor/tiled, /area/hydroponics) +"jiP" = ( +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology) "jiS" = ( /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"jje" = ( -/obj/structure/ladder, -/obj/structure/barricade, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) -"jjB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) "jkS" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) -"jkY" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/space) "jll" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"jly" = ( +/turf/simulated/wall/r_wall, +/area/chapel/office) +"jlD" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hydroponics/garden) "jmb" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -7934,7 +8874,7 @@ "jmd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "jmq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7972,6 +8912,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three) +"jpo" = ( +/turf/simulated/wall/r_wall, +/area/engineering/engine_gas) +"jps" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "jqn" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/flora/ausbushes/fullgrass, @@ -7990,12 +8939,29 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"jrL" = ( -/obj/structure/sign/deck3{ - pixel_y = 32 +"jrz" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled, +/area/medical/psych) +"jrR" = ( +/obj/structure/table/standard, +/obj/item/folder/blue{ + pixel_x = 5 + }, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/item/clothing/glasses/science, +/obj/item/reagent_containers/syringe, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "jsc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8054,17 +9020,6 @@ /obj/structure/railing, /turf/simulated/open, /area/library) -"jwm" = ( -/obj/structure/table/woodentable, -/obj/item/paper_bin, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) -"jwV" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three) "jyp" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 6 @@ -8083,6 +9038,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"jyJ" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "jyQ" = ( /obj/item/suit_cooling_unit, /obj/item/suit_cooling_unit, @@ -8113,12 +9075,25 @@ "jzH" = ( /turf/simulated/floor/tiled/monotile, /area/security/brig) -"jAM" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 +"jzM" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/reinforced, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) +"jBK" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/old_cargo/white, +/area/security/brig) +"jBN" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "jCp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, @@ -8164,10 +9139,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) -"jEQ" = ( -/obj/structure/table/bench/steel, -/turf/simulated/floor/wood, -/area/space) +"jEA" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "jFi" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing/grey{ @@ -8188,34 +9165,9 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/security/brig) -"jGU" = ( -/obj/machinery/telecomms/server/presets/service, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) "jHl" = ( /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"jHI" = ( -/obj/machinery/door/airlock/maintenance/engi, -/turf/simulated/floor/plating, -/area/engineering/engine_monitoring) -"jHP" = ( -/obj/machinery/door/airlock/atmos{ - name = "Civilian Atmospherics Backup"; - req_access = list(24) - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/wall/prepainted/civilian, -/area/space) "jHS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -8228,16 +9180,18 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"jJp" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/simulated/floor/reinforced; - docking_controller = "cargo_bay"; - landmark_tag = "supply_dock"; - name = "NSV Triumph Cargo Dock" +"jHY" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +"jJE" = ( /turf/simulated/floor/reinforced, -/area/space) +/area/quartermaster/cargo_shelter_dock) "jJZ" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 8 @@ -8255,20 +9209,12 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"jMp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 +"jLZ" = ( +/obj/landmark{ + name = "lightsout" }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) -"jMt" = ( -/obj/effect/floor_decal/grass_edge, -/obj/machinery/seed_storage/garden, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/hydroponics/garden) +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "jMB" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8299,12 +9245,19 @@ "jMZ" = ( /turf/simulated/open, /area/space) +"jNh" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "jNF" = ( /obj/machinery/door/airlock/glass{ name = "Vacant Shop" }, /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) +"jNS" = ( +/turf/simulated/open, +/area/rnd/xenobiology) "jOg" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -8381,16 +9334,33 @@ /area/chapel/main) "jSQ" = ( /obj/structure/closet/firecloset, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "jTJ" = ( /obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, /area/medical/virologyaccess) -"jUd" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"jUl" = ( +/obj/structure/disposalpipe/trunk, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"jUu" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "jUD" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -8430,6 +9400,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) +"jVl" = ( +/obj/structure/bed/chair/sofa/black, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "jVy" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8464,11 +9438,6 @@ "jWM" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/aft) -"jXa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft/port) "jXf" = ( /turf/simulated/floor/tiled/white, /area/medical/psych_ward) @@ -8512,9 +9481,6 @@ }, /turf/simulated/floor/tiled, /area/medical/resleeving) -"jXZ" = ( -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "jYz" = ( /obj/effect/floor_decal/corner/green/border{ dir = 6 @@ -8526,10 +9492,30 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"jYO" = ( +/obj/machinery/atmospherics/mains_pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) +"jYV" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "jYZ" = ( /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) +"jZd" = ( +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "jZC" = ( /turf/simulated/wall/prepainted/science, /area/rnd/robotics/surgeryroom1) @@ -8538,7 +9524,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/machinery/light/no_nightshift{ dir = 4 }, @@ -8561,18 +9547,12 @@ }, /turf/simulated/floor/tiled, /area/hydroponics/garden) -"kce" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ +"kck" = ( +/obj/structure/bed/chair/sofa/black/corner{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/rnd/test_area) +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "kcN" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -8598,16 +9578,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/starboard) -"kdM" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three/starboard) +"kdV" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "kej" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/steel, @@ -8632,10 +9609,6 @@ /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"keQ" = ( -/obj/structure/ladder, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "kfe" = ( /obj/structure/table/rack/steel, /obj/item/instrument/violin, @@ -8667,6 +9640,18 @@ }, /turf/simulated/open, /area/ai_upload) +"kgL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/wall{ + can_open = 1 + }, +/area/main_map/maintenance/deck_three/aft) "kgS" = ( /obj/structure/table/steel, /obj/item/trash/candle, @@ -8688,6 +9673,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"khF" = ( +/obj/item/stool/padded, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/security/brig) "khS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8708,7 +9700,7 @@ dir = 1 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) "kkb" = ( @@ -8720,9 +9712,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"kkq" = ( -/turf/simulated/floor, -/area/main_map/maintenance/deck_three/forward/port) +"kkh" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "kkD" = ( /obj/machinery/vending/medical, /obj/effect/floor_decal/industrial/outline/blue, @@ -8734,16 +9727,6 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) -"klF" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/cable/heavyduty{ - icon_state = "1-4" - }, -/obj/structure/cable, -/turf/simulated/floor/reinforced/airless, -/area/space) "kmq" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 @@ -8819,15 +9802,29 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"kow" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/effect/floor_decal/techfloor{ +"knF" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) +"koN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/area/rnd/research) "koU" = ( /turf/simulated/wall/prepainted/medical, /area/medical/medbay3) @@ -8852,6 +9849,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"kpN" = ( +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kqT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8862,6 +9863,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) +"krr" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"krP" = ( +/turf/simulated/wall/r_wall/prepainted/medical, +/area/main_map/maintenance/deck_three/forward) "ksn" = ( /obj/structure/cryofeed, /obj/effect/floor_decal/corner_techfloor_grid{ @@ -8872,11 +9880,26 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) +"ksq" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"ksA" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "ksH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/port) +"ksU" = ( +/turf/simulated/floor/plating, +/area/maintenance/substation/flight_deck) "ksZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8924,6 +9947,10 @@ "kuX" = ( /turf/simulated/floor/plating, /area/security/brig) +"kvr" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/cargo_shelter_dock) "kwc" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -8942,6 +9969,23 @@ "kxI" = ( /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"kye" = ( +/obj/structure/table/reinforced, +/obj/item/rcd/advanced, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "kyh" = ( /obj/machinery/cryopod/robot, /turf/simulated/floor/tiled/techfloor/grid, @@ -8951,18 +9995,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"kzs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three/starboard) "kzu" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"kzZ" = ( +/turf/simulated/wall, +/area/main_map/maintenance/engineering/deck2/power_line) "kAq" = ( /obj/machinery/light/small{ dir = 8 @@ -8989,6 +10029,11 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"kBd" = ( +/obj/structure/largecrate, +/obj/item/inducer, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "kBs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -9027,7 +10072,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -9035,10 +10079,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) -"kBQ" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "kCv" = ( /turf/simulated/floor/tiled, /area/rnd/xenobiology) @@ -9057,21 +10097,16 @@ /obj/structure/closet/l3closet/virology, /turf/simulated/floor/tiled, /area/medical/virologyaccess) -"kCX" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/purple/border{ +"kDm" = ( +/obj/machinery/computer/station_alert/all, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"kEc" = ( +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/exploration/pilot_office) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "kEk" = ( /obj/structure/cable{ icon_state = "32-1" @@ -9084,11 +10119,9 @@ /obj/structure/bookcase/manuals/engineering, /turf/simulated/floor/wood, /area/security/brig) -"kEO" = ( -/obj/structure/ladder, -/obj/structure/mopbucket, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +"kEZ" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kFk" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/sblucarpet, @@ -9113,11 +10146,14 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/rnd/test_area) -"kGz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three/starboard) +"kGt" = ( +/obj/item/stool/padded, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "kGK" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9148,19 +10184,18 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"kJu" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three) "kKV" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"kLr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "kLO" = ( /obj/structure/sign/department/telecoms, /turf/simulated/wall/r_wall/prepainted/command, @@ -9193,18 +10228,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) -"kMD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) -"kMG" = ( -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/plating, -/area/space) "kMO" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing{ @@ -9212,6 +10235,15 @@ }, /turf/simulated/floor/plating, /area/hydroponics/garden) +"kNp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "kNz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -9232,6 +10264,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"kPy" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "kPN" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, @@ -9249,24 +10285,31 @@ "kQk" = ( /turf/simulated/wall/r_wall, /area/rnd/storage) -"kQy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "kQF" = ( /obj/structure/sign/warning/compressed_gas, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/storage) +"kQR" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/catering/bar_coffee{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "kRY" = ( /obj/machinery/gravity_generator/main/station, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) -"kSx" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/reinforced/airless, -/area/space) +"kRZ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/carpet, +/area/medical/psych_ward) +"kSD" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "kSY" = ( /turf/simulated/floor/plating, /area/main_map/Hangar_bay/deck2) @@ -9289,6 +10332,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"kUY" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 6 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "kVd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -9315,14 +10368,25 @@ }, /turf/simulated/floor/wood, /area/medical/psych_ward) -"kWj" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +"kVJ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) "kWL" = ( /obj/structure/fitness/punchingbag, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"kWO" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/table/steel_reinforced, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "kXf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -9332,6 +10396,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"kYG" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "kZe" = ( /obj/structure/flora/tree/jungle, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -9342,18 +10412,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"kZo" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/cable/heavyduty{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "kZq" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -9366,12 +10424,35 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"kZG" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-8" + }, +/obj/structure/cable/heavyduty{ + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"kZQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass/civilian, +/turf/simulated/floor/tiled/steel_ridged, +/area/hydroponics/garden) "lau" = ( /obj/structure/cable/green{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/substation/tcomms) +"laL" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three) "laT" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "rnd_can_store" @@ -9433,9 +10514,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych_ward) -"lej" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/space) "lek" = ( /turf/simulated/floor/wood, /area/library) @@ -9483,18 +10561,6 @@ /obj/random/maintenance/security, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"lgI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) -"lhq" = ( -/obj/structure/bed/chair/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "lhH" = ( /obj/machinery/porta_turret/ai_defense, /turf/simulated/floor/bluegrid, @@ -9505,15 +10571,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"lhX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"liB" = ( +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/surgeryroom1) "liG" = ( /turf/simulated/wall/prepainted/medical, /area/medical/medbay_primary_storage) @@ -9531,7 +10595,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "ljK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9543,16 +10608,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck3) -"lkj" = ( -/obj/effect/floor_decal/techfloor{ - dir = 9 +"lkb" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/cable/heavyduty{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "llw" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, @@ -9567,10 +10631,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"llG" = ( -/obj/structure/closet/crate/miningcar, -/turf/simulated/floor/tiled/techmaint, -/area/space) "llP" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -9578,15 +10638,9 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel, /area/security/prison) -"llX" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "llY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -9632,11 +10686,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"lqy" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/hydroponics/garden) "lqJ" = ( /obj/machinery/light/small{ dir = 1 @@ -9647,7 +10696,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "lrm" = ( /obj/machinery/cryopod, @@ -9656,7 +10705,7 @@ /area/crew_quarters/sleep/cryo) "lrD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "lrM" = ( /obj/structure/cable/green{ @@ -9684,18 +10733,22 @@ /turf/simulated/floor/wood, /area/chapel/main) "lsy" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/prison) -"lsO" = ( -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "lti" = ( /obj/random/trash, /turf/simulated/floor/plating, /area/security/brig) +"ltr" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) +"ltt" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 9 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "ltA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on, /turf/simulated/floor/plating, @@ -9703,6 +10756,17 @@ "luo" = ( /turf/simulated/floor/plating, /area/crew_quarters/sleep/cryo) +"lup" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "luL" = ( /obj/machinery/door/window/brigdoor/westright{ name = "Containment Pen"; @@ -9729,6 +10793,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"lxb" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) "lya" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -9738,24 +10806,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) -"lyt" = ( -/obj/machinery/door/blast/regular{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "lyz" = ( /obj/structure/sign/deck/third, /turf/simulated/wall, /area/main_map/hallway/deck3) -"lyN" = ( -/turf/simulated/wall, -/area/space) "lyV" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/caution{ pixel_y = -32 }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "lzd" = ( @@ -9797,7 +10862,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "lAH" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -9811,6 +10877,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"lBi" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "lCE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -9823,6 +10894,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"lCF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "lDq" = ( /obj/machinery/atmospherics/component/unary/freezer{ dir = 4; @@ -9849,17 +10929,16 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) -"lEi" = ( -/obj/machinery/door/airlock{ - name = "Chapel Morgue"; - req_access = list(27) - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/forward/port) "lEw" = ( /obj/random/maintenance/cargo, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) +"lET" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/medical/psych) "lFL" = ( /obj/machinery/light/small{ dir = 1 @@ -9883,20 +10962,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"lGE" = ( -/obj/machinery/door/airlock{ - name = "Secondary Janitorial Closet"; - req_access = list(26) - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) "lHC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -9919,19 +10984,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"lHT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" - }, -/obj/structure/curtain/black, -/turf/simulated/floor, -/area/space) -"lIb" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/reinforced, -/area/space) "lII" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet, @@ -9948,15 +11000,42 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/wood, /area/medical/psych/psych_2) +"lKv" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/glass{ + name = "Chapel" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/chapel/office) "lKy" = ( /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) +"lKN" = ( +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) "lLh" = ( /obj/structure/filingcabinet/chestdrawer{ name = "Medical Forms" }, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_2) +"lLn" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/chapel/main) "lMp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -9964,7 +11043,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "lMr" = ( /obj/machinery/bomb_tester, @@ -9974,10 +11056,12 @@ /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled/dark, /area/rnd/robotics/resleeving) -"lMC" = ( -/obj/machinery/door/airlock/maintenance/common, +"lMz" = ( +/obj/machinery/door/airlock/glass_external, +/obj/structure/fans/tiny, +/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/plating, -/area/space) +/area/main_map/Hangar_bay/deck2) "lNT" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -9994,29 +11078,27 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) +"lOo" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) "lOt" = ( /obj/structure/cable{ icon_state = "1-4" }, /obj/structure/cable, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /turf/simulated/floor/plating, /area/ai_upload) "lOD" = ( /turf/simulated/floor/tiled, /area/rnd/test_area) -"lOK" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/rnd/test_area) +"lOF" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/chapel/office) "lPi" = ( /obj/structure/table/wooden_reinforced, /obj/item/reagent_containers/food/drinks/drinkingglass{ @@ -10048,15 +11130,22 @@ }, /turf/simulated/floor/wood, /area/tether/exploration/pilot_office) -"lRl" = ( +"lQw" = ( +/obj/structure/sign/deck3{ + pixel_y = 32 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"lRV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) +/mob/living/simple_mob/animal/passive/snake/noodle, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "lSA" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -10074,21 +11163,12 @@ /obj/structure/table/reinforced, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/cafeteria) -"lST" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) -"lTb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +"lSY" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "lTn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -10115,6 +11195,10 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"lUU" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/chapel/main) "lUV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/holopad, @@ -10123,11 +11207,10 @@ name = "Mainframe Base" }, /area/tcommsat/chamber) -"lVp" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, +"lVD" = ( +/obj/machinery/door/airlock/maintenance/engi, /turf/simulated/floor/plating, -/area/crew_quarters/cafeteria) +/area/engineering/engine_gas) "lVE" = ( /obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/borderfloor{ @@ -10138,6 +11221,10 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) +"lWa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "lWk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -10165,12 +11252,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"lWP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "lXa" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/security/prison) +"lXT" = ( +/obj/item/storage/fancy/candle_box, +/obj/structure/table/wooden_reinforced, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "lYn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10193,10 +11299,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"lYS" = ( -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/reinforced/airless, -/area/space) +"lYM" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "maA" = ( /obj/machinery/computer/rcon{ dir = 4 @@ -10206,10 +11315,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_monitoring) -"maF" = ( -/obj/item/storage/fancy/whitecandle_box, -/turf/simulated/floor/tiled/techfloor, -/area/space) "maP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10231,7 +11336,7 @@ req_access = list(39) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -10240,25 +11345,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"mbE" = ( -/obj/machinery/door/airlock/science{ - name = "Pathfinder"; - req_one_access = list(44) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/tether/exploration/pathfinder_office) -"mcu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 10 - }, -/turf/simulated/wall/r_wall/prepainted/science, -/area/rnd/rdoffice) +"mco" = ( +/turf/simulated/floor/tiled/steel, +/area/main_map/maintenance/deck_three/aft) "mcT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -10274,27 +11363,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"mdq" = ( -/obj/landmark{ - name = "lightsout" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/exploration/pilot_office) -"mej" = ( -/obj/machinery/door/blast/regular{ - dir = 8; - id = "toxin_storage_vent"; - name = "Toxin Storage Vent" - }, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/rnd/storage) "meN" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, @@ -10309,6 +11377,14 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"mfY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "mhx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10333,9 +11409,6 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"miU" = ( -/turf/simulated/floor/tiled/monotile, -/area/space) "mjo" = ( /obj/effect/floor_decal/corner/green/border{ dir = 1 @@ -10345,6 +11418,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"mjq" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "mjr" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/dirt, @@ -10364,6 +11441,11 @@ "mjZ" = ( /turf/simulated/floor/tiled/techfloor, /area/security/prison) +"mke" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "mkf" = ( /obj/effect/floor_decal/corner/green/border{ dir = 10 @@ -10388,12 +11470,58 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/port) +"mlY" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mmk" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/wood, +/area/medical/psych_ward) "mmp" = ( /obj/machinery/air_alarm{ pixel_y = 22 }, /turf/simulated/floor/bluegrid, /area/ai) +"mmO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"mnn" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/floodlight{ + anchored = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/quartermaster/cargo_shelter_dock) "mnq" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -10401,12 +11529,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"mnH" = ( -/obj/structure/bed/chair/sofa/black/left{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/medical/psych) "mnL" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/cafeteria) @@ -10447,6 +11569,22 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) +"mpB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 6 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "mqu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10454,7 +11592,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "mqB" = ( @@ -10477,6 +11615,10 @@ /obj/item/flame/lighter/random, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"mrb" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "mri" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -10498,6 +11640,15 @@ /obj/structure/table/sifwoodentable, /turf/simulated/floor/wood, /area/medical/medbay3) +"mrT" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) "mrY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10516,6 +11667,12 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) +"msH" = ( +/obj/machinery/seed_storage/garden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hydroponics) "msQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10526,7 +11683,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "mtd" = ( /obj/structure/stairs/spawner/east, @@ -10542,7 +11700,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/medical/psych_ward) "mtk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10583,6 +11741,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"mvi" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "mvj" = ( /turf/simulated/floor/wood, /area/chapel/main) @@ -10617,9 +11781,15 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"myG" = ( -/turf/simulated/floor/wood, -/area/space) +"myB" = ( +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "myX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -10666,24 +11836,12 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"mAs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"mBE" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/tether/exploration/pilot_office) -"mAF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/main_map/maintenance/deck_three/starboard) "mBU" = ( /obj/machinery/turnstile/entry, /turf/simulated/floor/tiled/techfloor, @@ -10714,6 +11872,13 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) +"mDE" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/vacant/vacant_shop) "mEU" = ( /obj/effect/floor_decal/corner/green/border{ dir = 4 @@ -10730,15 +11895,22 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"mFY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +"mGc" = ( +/obj/structure/cable/blue{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"mHi" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "mHp" = ( /obj/machinery/light/no_nightshift{ dir = 4 @@ -10761,6 +11933,16 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"mIv" = ( +/obj/structure/marker_beacon/red, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mIJ" = ( +/obj/machinery/camera/network/cargo{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "mIP" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/dark, @@ -10783,6 +11965,10 @@ /obj/machinery/holopad, /turf/simulated/floor/carpet/bcarpet, /area/security/brig) +"mIZ" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "mJk" = ( /obj/structure/table/wooden_reinforced, /obj/item/storage/fancy/cigar/cohiba{ @@ -10795,6 +11981,22 @@ }, /turf/simulated/floor/wood, /area/tether/exploration/pilot_office) +"mJn" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice, +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three) +"mJs" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "mJG" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -10849,17 +12051,6 @@ icon_state = "techmaint" }, /area/security/brig) -"mKB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"mKL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "mKU" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -10883,30 +12074,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"mNf" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) "mNo" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled/steel, /area/security/brig) -"mNy" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "mOb" = ( /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) @@ -10921,15 +12092,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/hydroponics/garden) -"mPf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) "mPm" = ( /obj/structure/table/standard, /obj/item/defib_kit/jumper_kit, @@ -10941,6 +12103,26 @@ /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) +"mQA" = ( +/obj/machinery/button/doorbell{ + id = "funnt" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) +"mRg" = ( +/turf/simulated/floor/plating, +/area/engineering/engine_gas) +"mRT" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/aft/port) +"mRV" = ( +/obj/structure/largecrate, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "mSr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -10948,7 +12130,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "mSL" = ( /obj/structure/table/steel, @@ -10962,7 +12144,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "mTq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10979,8 +12161,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"mTD" = ( +/turf/simulated/open, +/area/medical/medbay3) +"mTF" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/floor/reinforced/outdoors, +/area/quartermaster/cargo_shelter_dock) "mTG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_eva) "mUe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ @@ -10988,6 +12177,15 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"mUH" = ( +/obj/machinery/holoplant, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "mUM" = ( /obj/structure/table/steel, /obj/item/integrated_circuit_printer, @@ -11035,6 +12233,22 @@ }, /turf/simulated/floor/tiled/steel, /area/security/prison) +"mXc" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"mXk" = ( +/obj/landmark/spawnpoint/latejoin/station/cryogenics, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "mXE" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -11087,6 +12301,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"naq" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"nar" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "naB" = ( /obj/structure/bed, /obj/item/bedsheet/ian, @@ -11114,10 +12338,16 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"nbt" = ( +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "nbF" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/carpet/bcarpet, /area/library) +"nbG" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/crew_quarters/heads/chief) "nch" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, @@ -11133,22 +12363,47 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "ndl" = ( /obj/structure/sign/deck/third, /turf/simulated/wall/r_wall, /area/main_map/hallway/deck3) +"ndB" = ( +/obj/machinery/door/airlock/engineering{ + name = "Hangar Substation" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/flight_deck) +"nef" = ( +/obj/machinery/camera/network/research{ + network = list("Xenobiology") + }, +/turf/simulated/floor/glass/reinforced, +/area/rnd/xenobiology) "neC" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/starboard) -"nff" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) +"neX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "nfG" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11173,6 +12428,20 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/security/brig) +"nhx" = ( +/obj/machinery/door/airlock{ + name = "Secondary Janitorial Closet"; + req_access = list(26) + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "nhK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -11249,8 +12518,30 @@ dir = 8 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/medical/medbay3) +"njL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/brig) +"njQ" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/stamp/ce, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "nku" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -11260,16 +12551,19 @@ "nkZ" = ( /turf/simulated/open, /area/chapel/main) -"nlf" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/space) "nlA" = ( /obj/structure/table/standard, /obj/item/aiModule/reset, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"nlK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) "nlM" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -11303,6 +12597,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"npq" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "npx" = ( /obj/machinery/conveyor_switch/oneway, /obj/map_helper/conveyor/lever{ @@ -11320,8 +12619,29 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"nqR" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"nqW" = ( +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "nrl" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/borderfloorwhite{ @@ -11351,31 +12671,17 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/theatre) -"nrr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) -"nrM" = ( -/obj/machinery/telecomms/hub/preset, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) "nrT" = ( /obj/machinery/requests_console/preset/research{ pixel_y = -32 }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) +"nsb" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "nsj" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11401,7 +12707,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "ntc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11415,6 +12722,16 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) +"ntB" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) +"ntW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "nuz" = ( /obj/machinery/door/airlock/maintenance/rnd{ name = "Toxins Maintenance Access"; @@ -11443,19 +12760,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled, /area/medical/virologyaccess) +"nwe" = ( +/obj/structure/table/standard, +/obj/machinery/computer/atmoscontrol/laptop{ + monitored_alarm_ids = list("xenopenvent"); + req_one_access = list(47,24,11); + dir = 8 + }, +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "nxV" = ( /obj/structure/cable/green{ icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"nyc" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/machinery/camera/network/cargo, -/turf/simulated/floor/reinforced, -/area/space) "nyq" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -11483,19 +12806,10 @@ "nyX" = ( /turf/simulated/wall/r_wall, /area/ai_upload) -"nzw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) -"nAl" = ( -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) +"nzR" = ( +/obj/machinery/disposal, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "nAx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -11521,21 +12835,6 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"nCv" = ( -/obj/machinery/button/remote/blast_door{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - pixel_y = -26; - req_access = list(31) - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/reinforced, -/area/space) "nCH" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -11560,11 +12859,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) -"nDj" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/port) "nDx" = ( /obj/machinery/newscaster{ pixel_x = 30 @@ -11585,6 +12879,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"nDF" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "nEb" = ( /obj/structure/bed/chair/sofa/black{ dir = 1 @@ -11626,21 +12926,23 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) -"nFh" = ( -/obj/machinery/button/doorbell, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three) "nGw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/rnd/storage) -"nGI" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/effect/floor_decal/grass_edge{ +"nHd" = ( +/obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/hydroponics/garden) +/turf/simulated/open, +/area/medical/psych) +"nHg" = ( +/obj/machinery/door/airlock/maintenance/engi, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_monitoring) "nHu" = ( /obj/structure/sink/kitchen{ name = "sink"; @@ -11672,14 +12974,6 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) -"nJh" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance Access"; - req_one_access = list(28) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/crew_quarters/kitchen) "nJq" = ( /obj/machinery/door/airlock/medical{ name = "Pre-Revival Processing"; @@ -11692,11 +12986,6 @@ "nJC" = ( /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"nKb" = ( -/obj/structure/ladder, -/obj/structure/plasticflaps, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "nKt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -11721,10 +13010,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) -"nMi" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +"nLY" = ( +/obj/structure/table/standard, +/obj/machinery/reagentgrinder, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/item/stack/material/phoron{ + amount = 25 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "nMw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11732,7 +13029,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "nMQ" = ( /obj/structure/bed/chair{ @@ -11785,9 +13085,13 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/medical/resleeving) -"nQj" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/space) +"nQw" = ( +/obj/structure/table/standard, +/obj/item/gun/energy/taser/xeno, +/obj/item/multitool, +/obj/item/melee/baton/slime/loaded, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "nQI" = ( /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/greengrid/airless, @@ -11800,20 +13104,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "nSZ" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_three) -"nTh" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) "nTK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11852,10 +13148,6 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/rnd/test_area) -"nUw" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/space) "nUA" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -11879,6 +13171,12 @@ /obj/item/stool/padded, /turf/simulated/floor/wood, /area/security/brig) +"nVO" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "nVX" = ( /obj/effect/floor_decal/grass_edge, /turf/simulated/floor/outdoors/dirt, @@ -11896,28 +13194,20 @@ /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/steel, /area/security/brig) -"nYm" = ( -/obj/structure/stairs/spawner/south, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 +"nYi" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/obj/structure/closet/crate/bin{ + anchored = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "nYp" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"nZw" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "nZL" = ( /obj/structure/table/woodentable, /obj/machinery/light{ @@ -11951,10 +13241,6 @@ }, /turf/simulated/floor/wood, /area/security/brig) -"oaT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "obA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -11964,6 +13250,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) +"obV" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/medical/psych) +"oce" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/grass_edge, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "ocY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -11982,14 +13285,37 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"odS" = ( +"odZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/bcarpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"oeb" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"oej" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) +"oem" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 10 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "oeC" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/security/brig) +"oeP" = ( +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "oft" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12002,6 +13328,19 @@ "ofE" = ( /turf/simulated/floor/carpet, /area/medical/psych_ward) +"ofI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/mob/living/simple_mob/animal/passive/bird/parrot/polly, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "ogm" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) @@ -12121,7 +13460,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "ojM" = ( /obj/machinery/turretid/stun{ @@ -12131,20 +13471,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) -"ojV" = ( -/turf/simulated/floor/reinforced/airless, -/area/main_map/maintenance/deck_three/aft) "ojZ" = ( /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"okr" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "olv" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled, /area/medical/morgue) +"olE" = ( +/obj/machinery/field_generator, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "olX" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -12152,6 +13498,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"oma" = ( +/obj/machinery/telecomms/relay/preset/triumph/deck_four, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "omL" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12215,11 +13567,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "ooV" = ( /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) +"ooW" = ( +/obj/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "opJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -12245,27 +13604,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/purple, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"opO" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "opU" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/hallway/deck3) -"oqO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) "org" = ( /obj/structure/railing, /turf/simulated/floor/tiled, @@ -12277,31 +13627,34 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virologyaccess) -"osk" = ( -/obj/machinery/door/firedoor{ - dir = 8 +"osC" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/structure/table/wooden_reinforced, +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/tiled, +/area/chapel/office) "osM" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"osY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/medical/psych) "ota" = ( -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/medical/psych/psych_2) -"otp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/zpipe/up, -/obj/machinery/atmospherics/pipe/zpipe/up/aux, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "otq" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -12348,21 +13701,33 @@ /obj/structure/lattice, /turf/simulated/open, /area/maintenance/library) -"ouC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 +"ouI" = ( +/obj/structure/catwalk, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 5 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) +"ouR" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "ovA" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) +"ovP" = ( +/turf/simulated/wall, +/area/main_map/maintenance/deck_three/forward) "owc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -12385,15 +13750,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) -"oxC" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-8" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "oyb" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -12429,19 +13785,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"oyH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"ozb" = ( +/obj/structure/window/reinforced, +/obj/structure/table/standard, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/airlock/glass{ - name = "Garden" +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ozy" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -12470,6 +13825,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"ozX" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "chapel" + }, +/obj/structure/curtain/black, +/turf/simulated/floor, +/area/chapel/office) "oAd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -12557,6 +13921,12 @@ /obj/landmark/spawnpoint/job/ai, /turf/simulated/floor/tiled/techfloor, /area/ai) +"oCx" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "oCE" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) @@ -12608,30 +13978,30 @@ "oGv" = ( /turf/simulated/wall/prepainted/medical, /area/medical/psych_ward) -"oHc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"oGM" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"oIB" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "oIE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"oIF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "oIR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -12648,6 +14018,12 @@ /obj/machinery/holoplant, /turf/simulated/floor/wood, /area/chapel/main) +"oJd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "oJq" = ( /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/bcarpet, @@ -12658,6 +14034,11 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three) +"oKo" = ( +/obj/structure/stairs/spawner/west, +/obj/structure/railing, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_three/port) "oKs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -12687,6 +14068,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "oLB" = ( @@ -12706,7 +14088,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "oOs" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -12714,14 +14097,19 @@ }, /turf/simulated/floor/wood, /area/hydroponics/garden) -"oPo" = ( -/obj/machinery/door/airlock/atmos{ - name = "Civilian Atmospherics Backup"; - req_access = list(24) +"oOY" = ( +/obj/item/storage/fancy/blackcandle_box, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) +"oPl" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Kitchen Maintenance Access"; + req_one_access = list(28) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/kitchen) "oPw" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -12732,18 +14120,48 @@ }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/brig) -"oQa" = ( -/obj/structure/railing{ - dir = 4 +"oPL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/water/deep/indoors, -/area/hydroponics/garden) +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) +"oQc" = ( +/obj/turbolift_map_holder/euthenia_medical, +/turf/simulated/open, +/area/medical/medbay3) "oQn" = ( /turf/simulated/wall/prepainted/civilian, /area/hydroponics) +"oQP" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"oRD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/structure/closet/crate/biohazard, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/virology) "oSv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12754,18 +14172,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"oSU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "oTn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -12796,7 +14208,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "oUm" = ( /obj/machinery/door/airlock/glass{ @@ -12818,22 +14231,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"oVx" = ( -/obj/structure/ladder, -/obj/structure/largecrate, -/turf/simulated/floor/plating, -/area/space) -"oVz" = ( -/obj/structure/bed/chair/wood{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "oVB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "oWg" = ( @@ -12856,7 +14258,7 @@ layer = 2.6 }, /obj/item/storage/toolbox/electrical, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) "oYW" = ( @@ -12873,12 +14275,39 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"oZN" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) "paf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"pbd" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) +"pbQ" = ( +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"pbY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "pcf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -12900,16 +14329,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) -"pdl" = ( -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) +"pcY" = ( +/obj/structure/ladder/updown, +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) "pdt" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -12957,8 +14381,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) "pet" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -12980,6 +14403,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) +"pfo" = ( +/obj/structure/bed/chair/sofa/black/left{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "pfF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black, /turf/simulated/floor/tiled/techmaint, @@ -13009,7 +14438,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "pgd" = ( /obj/structure/window/reinforced{ @@ -13028,6 +14457,16 @@ /obj/machinery/door/window/eastleft, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virologyaccess) +"pgD" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "pgR" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -13038,16 +14477,12 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"pgY" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ +"pia" = ( +/obj/machinery/light/spot/no_nightshift{ dir = 4 }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced, -/turf/simulated/floor/reinforced/airless, -/area/rnd/test_area) +/turf/simulated/floor/wood, +/area/chapel/main) "piv" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -13120,19 +14555,17 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"pld" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "ple" = ( /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"plp" = ( +/obj/effect/floor_decal/industrial/danger/corner, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "plD" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -13144,9 +14577,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/security/brig) +"plG" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "pml" = ( /turf/simulated/wall/prepainted/medical, /area/main_map/maintenance/deck_three/forward/starboard) +"pmA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) +"pmL" = ( +/obj/machinery/door/window/brigdoor/eastright{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "pnf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13166,6 +14621,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"pnY" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 6 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) "poi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -13229,16 +14690,23 @@ /turf/simulated/floor/wood, /area/medical/psych/psych_1) "pqb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"pqm" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "pqp" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -13251,6 +14719,22 @@ /obj/item/integrated_circuit_printer, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"pqT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "prj" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/railing, @@ -13287,12 +14771,32 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"psG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "psP" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/port) +"ptp" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "ptx" = ( /turf/simulated/floor/wood, /area/security/brig) +"ptP" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/chapel/main) "pur" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -13300,13 +14804,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"puJ" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/carpet, -/area/medical/psych_ward) "puL" = ( /obj/structure/railing, /obj/structure/railing{ @@ -13323,12 +14820,6 @@ }, /turf/simulated/floor/outdoors/dirt, /area/hydroponics/garden) -"pvF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/space) "pwi" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 8 @@ -13348,15 +14839,33 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"pwT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) +"pxa" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"pxp" = ( +/obj/machinery/telecomms/relay/preset/triumph/deck_three, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "pxE" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -13379,21 +14888,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) -"pzZ" = ( -/obj/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/tiled, -/area/space) -"pAn" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"pAF" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/space) "pAQ" = ( /obj/structure/holohoop{ dir = 8 @@ -13423,7 +14917,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "pBu" = ( /obj/machinery/door/airlock/glass{ @@ -13461,6 +14956,12 @@ /obj/structure/closet, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"pEd" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "pEp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -13478,6 +14979,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "pFP" = ( @@ -13492,16 +14994,10 @@ }, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"pGl" = ( -/obj/structure/flora/pottedplant/orientaltree, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/port) +"pGb" = ( +/obj/machinery/computer/timeclock/premade/north, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "pGM" = ( /obj/machinery/door/airlock/security{ name = "Observation"; @@ -13531,13 +15027,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"pHG" = ( -/obj/structure/bed/chair/wood{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "pIa" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/borderfloorwhite{ @@ -13557,17 +15046,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/medical/virologyaccess) -"pID" = ( -/obj/structure/stairs/spawner/west, -/obj/structure/railing, -/turf/simulated/floor/reinforced, -/area/space) -"pIF" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2-4" +"pIA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "pIY" = ( /turf/simulated/wall, /area/hydroponics/garden) @@ -13585,24 +15073,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) -"pJd" = ( -/obj/structure/table/steel, -/obj/item/storage/box/lights/mixed, -/obj/item/storage/box/lights/mixed, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) -"pJr" = ( -/obj/machinery/camera/network/cargo{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/space) "pJP" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 @@ -13610,6 +15080,34 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) +"pJY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"pKu" = ( +/obj/structure/table/standard, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen/red{ + pixel_x = -1; + pixel_y = 3 + }, +/obj/item/pen/blue{ + pixel_x = -5; + pixel_y = -1 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "pLE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13642,6 +15140,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/security/brig) +"pMU" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "pNf" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/structure/cable/heavyduty{ @@ -13653,18 +15160,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/medical/psych_ward) -"pNq" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) -"pND" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "pOa" = ( /obj/structure/sign/deck/third{ pixel_y = -32 @@ -13689,12 +15184,12 @@ /obj/structure/morgue, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/surgeryroom1) -"pQd" = ( -/obj/structure/railing{ - dir = 8 - }, +"pPJ" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) +"pRa" = ( /turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) +/area/engineering/engine_eva) "pSP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -13714,12 +15209,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"pTA" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) "pTQ" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"pTX" = ( +/obj/machinery/pda_multicaster, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "pUQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13734,9 +15244,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) -"pVf" = ( -/turf/simulated/floor/tiled/techmaint, -/area/space) "pVn" = ( /obj/structure/cryofeed{ dir = 4 @@ -13749,6 +15256,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) +"pVs" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "pWD" = ( /obj/structure/railing, /obj/structure/railing{ @@ -13768,6 +15281,15 @@ "pWX" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/medbay3) +"pXi" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) +"pXp" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "pXA" = ( /obj/machinery/camera/network/research{ dir = 4; @@ -13798,12 +15320,14 @@ "qaD" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_three/starboard) -"qcI" = ( -/obj/structure/bed/chair/sofa/black/right{ - dir = 4 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) +"qaV" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_three/port) +"qcq" = ( +/obj/structure/closet/largecardboard, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "qdx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -13817,11 +15341,19 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/critical/east_bump, +/obj/machinery/power/apc/critical/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) +"qec" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled, +/area/crew_quarters/pool) "qeA" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ywflowers, @@ -13835,6 +15367,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) +"qfb" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "qfX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -13850,12 +15386,12 @@ }, /turf/simulated/floor/wood, /area/library) -"qhv" = ( -/obj/machinery/telecomms/broadcaster/preset_right, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" +"qgX" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/area/tcommsat/chamber) +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "qhN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -13865,6 +15401,14 @@ }, /turf/simulated/wall/r_wall/prepainted/command, /area/ai) +"qhV" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/port) +"qif" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "qjd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13889,6 +15433,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/rdoffice) +"qkj" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/triumph/surfacebase/sauna) "qkG" = ( /obj/structure/sink/puddle, /obj/effect/floor_decal/grass_edge{ @@ -13896,14 +15447,10 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"qkW" = ( -/obj/structure/stairs/spawner/west, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"qkL" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "qkX" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -13964,10 +15511,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "qoc" = ( /obj/structure/table/standard, @@ -13979,13 +15523,20 @@ /obj/item/melee/baton/slime/loaded, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"qou" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, +"qos" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/medical/psych_ward) +"qoy" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "qoK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13996,6 +15547,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "qoR" = ( @@ -14015,6 +15567,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/library) +"qpl" = ( +/obj/machinery/door/airlock{ + name = "Chapel Morgue"; + req_access = list(27) + }, +/turf/simulated/floor/plating, +/area/chapel/office) "qpI" = ( /obj/structure/flora/pottedplant/tropical, /turf/simulated/floor/wood, @@ -14031,14 +15590,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"qqh" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/industrial/danger{ +"qqu" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/engineering/deck2/power_line) "qqx" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -14046,13 +15608,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"qqU" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/space) "qqX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -14062,15 +15617,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"qrf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/starboard) "qrM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -14087,7 +15633,8 @@ /obj/structure/sign/deck3{ pixel_y = -32 }, -/turf/simulated/wall, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "qth" = ( /obj/structure/disposalpipe/segment{ @@ -14103,17 +15650,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tcommsat/entrance) -"qto" = ( -/obj/structure/table/rack/shelf, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, -/obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration/pathfinder, -/obj/item/clothing/head/helmet/space/void/exploration/pathfinder, -/obj/item/binoculars, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "qtu" = ( /obj/structure/railing/grey, /turf/simulated/open, @@ -14146,14 +15682,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "qup" = ( -/obj/machinery/atmospherics/component/binary/pump/high_power{ - dir = 8; - id = "emg_pump"; - name = "Emergency Pen Flood Manual Switch" - }, -/obj/structure/window/phoronreinforced, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/window/phoronreinforced{ +/obj/machinery/atmospherics/portables_connector{ dir = 4 }, /turf/simulated/floor/plating, @@ -14168,6 +15698,9 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"qvz" = ( +/turf/simulated/floor/plating, +/area/chapel/office) "qvD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14178,14 +15711,6 @@ "qvM" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) -"qvU" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "qxH" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14197,7 +15722,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "qyn" = ( /obj/spawner/window/reinforced/full/firelocks, @@ -14207,10 +15733,10 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/hallway/deck3) -"qyq" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three) +"qyt" = ( +/obj/machinery/holopad, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "qzO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14275,6 +15801,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"qCG" = ( +/obj/machinery/button/remote/driver{ + dir = 4; + id = "enginecore"; + name = "Emergency Core Eject"; + pixel_x = 22 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "qCY" = ( /obj/machinery/ai_slipper, /obj/machinery/turretid/stun{ @@ -14318,27 +15860,45 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"qDO" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "qEk" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/cafeteria) -"qFr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"qEF" = ( +/obj/structure/railing/grey{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/turf/simulated/open, +/area/rnd/xenobiology) +"qER" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access = list(); + req_one_access = list(7,29) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"qFt" = ( -/obj/structure/marker_beacon/red, -/turf/simulated/floor/reinforced/airless, -/area/space) -"qFU" = ( -/obj/effect/floor_decal/industrial/danger/corner, -/turf/simulated/floor/reinforced, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"qFz" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "qGh" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet{ @@ -14346,6 +15906,25 @@ }, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"qGJ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"qHb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/storage) "qHk" = ( /obj/effect/floor_decal/borderfloorblack, /obj/structure/table/standard, @@ -14356,6 +15935,26 @@ /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) +"qHI" = ( +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 2; + icon_state = "pdoor0"; + id = "engsec_ld_c"; + name = "CE Office Blast Doors"; + opacity = 0 + }, +/obj/effect/paint_stripe/sun, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/chief) "qHJ" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 8 @@ -14369,6 +15968,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 1 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "qHW" = ( @@ -14383,19 +15983,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"qIk" = ( -/obj/machinery/seed_storage/garden, -/turf/simulated/floor/tiled, -/area/hydroponics) -"qIt" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced, -/area/space) "qIQ" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -14414,12 +16001,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"qKn" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/chapel/main) "qLg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -14429,22 +16010,16 @@ "qLK" = ( /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"qMu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/holopad, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) -"qNi" = ( -/obj/machinery/light/small{ - dir = 4 - }, +"qMb" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) +/area/main_map/maintenance/deck_three/aft/starboard) +"qNl" = ( +/obj/machinery/door/airlock/external, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) "qOJ" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/light/no_nightshift{ @@ -14452,22 +16027,22 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/storage) +"qPi" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/tiled, +/area/chapel/office) "qPj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) -"qPx" = ( -/mob/living/simple_mob/animal/sif/fluffy/silky, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "qPy" = ( /obj/structure/railing, /obj/structure/railing{ @@ -14475,6 +16050,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) +"qQe" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/hydroponics/garden) "qQA" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 @@ -14502,9 +16081,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"qRx" = ( -/turf/simulated/wall/r_wall/prepainted/medical, -/area/space) "qRF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/glass{ @@ -14526,10 +16102,22 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"qTn" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/space) +"qSW" = ( +/obj/structure/bookcase/legal/corpreg, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/security/brig) +"qTA" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "qTT" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 6 @@ -14545,14 +16133,15 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"qUu" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 +"qUc" = ( +/obj/machinery/door/airlock/glass{ + name = "Cryogenic Storage" }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/surgeryroom1) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/sleep/cryo) "qUw" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ @@ -14567,6 +16156,45 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"qVx" = ( +/obj/machinery/door/airlock/multi_tile/glass/polarized{ + dir = 4; + id_tint = "saunatint"; + name = "Sauna" + }, +/turf/simulated/floor/tiled, +/area/triumph/surfacebase/sauna) +"qVM" = ( +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/main_map/maintenance/deck_three/forward/port) +"qWa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"qWJ" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/obj/machinery/shield_diffuser, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"qWW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "qWY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -14586,6 +16214,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"qXX" = ( +/turf/simulated/floor/airless/ceiling, +/area/engineering/engine_gas) "qYd" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/plating, @@ -14596,10 +16227,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"qZR" = ( -/obj/structure/bed/chair/sofa/black/corner, -/turf/simulated/floor/carpet/bcarpet, -/area/space) +"qZf" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 4 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/test_area) "rah" = ( /obj/structure/lattice, /turf/space, @@ -14614,16 +16253,6 @@ }, /turf/simulated/floor/plating, /area/rnd/storage) -"raD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft/port) "raT" = ( /obj/machinery/door/airlock/maintenance/rnd, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -14662,16 +16291,9 @@ "rbv" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) -"rbU" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/structure/flora/pottedplant/minitree, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/port) +"rdd" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "ref" = ( /obj/structure/morgue/crematorium, /turf/simulated/floor/tiled/techfloor, @@ -14684,16 +16306,14 @@ /turf/simulated/floor/grass, /area/medical/psych_ward) "rgf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "rgg" = ( /obj/machinery/door/airlock/multi_tile/glass/polarized{ @@ -14738,6 +16358,20 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/carpet, /area/medical/psych_ward) +"rix" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) +"rjb" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "rjm" = ( /obj/structure/lattice, /turf/simulated/open, @@ -14756,15 +16390,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"rkJ" = ( -/obj/structure/table/bench/steel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/space) "rlc" = ( /obj/machinery/camera/network/security{ dir = 1 @@ -14777,6 +16404,12 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/security/brig) +"rlB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "rmc" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -14799,6 +16432,14 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"rmr" = ( +/obj/structure/table/woodentable, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/wood, +/area/triumph/surfacebase/sauna) "rmv" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(47) @@ -14820,7 +16461,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "roI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14832,6 +16476,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) +"rpb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "rpv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/dark{ @@ -14842,6 +16496,12 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward) +"rpP" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "rpR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -14868,8 +16528,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"rqW" = ( +/obj/structure/table/woodentable, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/carpet, +/area/medical/psych) "rre" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/brig) "rri" = ( /obj/spawner/window/reinforced/full/firelocks, @@ -14923,24 +16588,31 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "Druma"; - layer = 3.3; name = "Entertainment Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/theatre) +"ruq" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/vacant/vacant_shop) "rva" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"rvn" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "rvG" = ( /turf/simulated/open, /area/main_map/maintenance/deck_three/starboard) +"rvL" = ( +/obj/structure/table/bench/steel, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "rvP" = ( /obj/structure/lattice, /turf/simulated/open, @@ -14960,6 +16632,13 @@ }, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) +"ryr" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "ryJ" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -15013,6 +16692,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) +"rBu" = ( +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "rBv" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/black{ @@ -15025,6 +16710,19 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass, /area/medical/psych_ward) +"rCE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/pool) "rCO" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 4 @@ -15034,6 +16732,16 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) +"rDh" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/structure/cable/heavyduty{ + icon_state = "1-4" + }, +/obj/structure/cable, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rDM" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15044,10 +16752,12 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) -"rFt" = ( -/obj/machinery/atmospherics/pipe/simple/insulated, -/turf/simulated/floor/reinforced/airless, -/area/space) +"rFw" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "rFy" = ( /obj/machinery/atmospherics/valve{ name = "Waste" @@ -15057,12 +16767,14 @@ "rFz" = ( /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) -"rGu" = ( -/obj/structure/railing{ - dir = 4 +"rFF" = ( +/obj/machinery/door/airlock/glass{ + name = "Psychiatric Wing"; + req_one_access = list(5) }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/medical/psych_ward) "rGT" = ( /obj/machinery/air_alarm/monitor/isolation{ alarm_id = "isolation_two"; @@ -15077,6 +16789,10 @@ /obj/item/clothing/ears/earmuffs, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"rIm" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/aft/starboard) "rIo" = ( /obj/structure/closet/secure_closet/genpop, /obj/structure/window/reinforced, @@ -15089,8 +16805,10 @@ /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "rJt" = ( -/obj/structure/sign/deck3, -/turf/simulated/wall, +/obj/structure/sign/deck3{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "rJz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15141,10 +16859,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"rMn" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/turf/simulated/floor/reinforced, +"rLw" = ( +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"rLM" = ( +/obj/structure/stairs/spawner/west, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three) "rMs" = ( /obj/effect/floor_decal/techfloor, /obj/structure/window/reinforced{ @@ -15152,10 +16882,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"rMK" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/space) "rNw" = ( /turf/simulated/floor/airless, /area/space) @@ -15165,10 +16891,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"rNJ" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/crew_quarters/pool) "rNM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15179,7 +16901,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "rNP" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -15200,12 +16923,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"rPh" = ( -/obj/machinery/light/fairy{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) "rPk" = ( /obj/structure/railing, /turf/space, @@ -15225,6 +16942,15 @@ "rPG" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/forward) +"rPP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "rQH" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -15253,18 +16979,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) -"rSy" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 9 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "rSB" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing{ @@ -15279,18 +16993,6 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) -"rTd" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three) "rTH" = ( /obj/machinery/door/airlock{ name = "Bathroom" @@ -15328,9 +17030,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"rWN" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rXJ" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"rXQ" = ( +/obj/machinery/door/airlock{ + name = "Chapel Office" + }, +/obj/machinery/door/firedoor, +/obj/item/barrier_tape_segment/engineering, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "sax" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -15338,6 +17055,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"saJ" = ( +/turf/simulated/floor/glass/reinforced, +/area/rnd/xenobiology) "sbe" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/effect/floor_decal/spline/plain{ @@ -15401,10 +17121,22 @@ /obj/machinery/atmospherics/component/unary/freezer, /turf/simulated/floor/tiled, /area/rnd/test_area) -"sgQ" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +"sfz" = ( +/obj/machinery/vending/hydronutrients{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"sfS" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/tiled, +/area/chapel/office) "shd" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -15412,9 +17144,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"sho" = ( -/turf/simulated/floor/tiled/steel_ridged, -/area/tether/exploration/pathfinder_office) "sij" = ( /obj/structure/table/rack/shelf/steel, /obj/item/radio/off, @@ -15439,6 +17168,12 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/prison) +"siV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "siX" = ( /obj/structure/table/steel, /obj/item/material/minihoe, @@ -15492,6 +17227,16 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"slN" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "cargo_bay"; + landmark_tag = "supply_dock"; + name = "NSV Triumph Cargo Dock" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "smb" = ( /obj/structure/window/reinforced{ dir = 1 @@ -15520,28 +17265,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) -"smy" = ( -/obj/structure/table/woodentable, -/obj/item/folder/yellow{ - pixel_y = 5 - }, -/obj/item/pen, -/obj/item/paper{ - desc = ""; - info = "Central Command greets you, Pathfinder. If you're reading this memo, this is to remind you of your mission. Exploration is not for leisure: Nanotrasen's main interest in the Virgo system is to acquire new specimens of wildlife. Not only this, but the compiling of all Virgo flora is as important as the acquisition of fauna. Most importantly, your mission requires you to leave no crew behind. No discoveres are worth an explorer's life. We wish you a good expedition, Pathfinder."; - name = "Central Command memo"; - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/paper{ - desc = ""; - info = "I greet you, Pathfinder. I hope this message finds you well. I am Kaexae Ke'teq'xum, the first pathfinder to set foot in the very system your Tether is build, Virgo. I am too old to continue my research here, and so, between pathfinders, I only wish to grant you my luck in exploring these planets to depths I could not reach. Yours is a truly advanced shuttle and station, but its jewel is in its crew. Use it well, and discoveries will flow anew. May the stars shine bright to guide you."; - name = "Personal fax from Kaexae Ke'teq'xum"; - pixel_y = 3 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "snm" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -15596,7 +17319,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "spY" = ( /obj/effect/floor_decal/spline/plain{ @@ -15633,6 +17357,13 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"sqV" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "srs" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -15656,12 +17387,22 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) -"sut" = ( -/obj/structure/bed/chair/sofa/black/left{ +"stN" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/carpet, -/area/medical/psych) +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) +"stT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "suv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15676,20 +17417,16 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, /area/security/brig) -"suZ" = ( -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 1 - }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) +"suW" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/engineering/deck2/power_line) "svC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) "svM" = ( @@ -15697,6 +17434,9 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck3) +"svP" = ( +/turf/simulated/wall/prepainted/civilian, +/area/chapel/office) "swu" = ( /obj/machinery/light/small{ dir = 8 @@ -15713,28 +17453,28 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/medical/psych) -"syU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/plating, -/area/space) "syV" = ( /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"sBc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +"szj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) +"szI" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "sCe" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -15757,14 +17497,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/hallway/deck3) +"sDV" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/chapel/office) +"sEg" = ( +/obj/structure/barricade, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "sEC" = ( /turf/simulated/wall/prepainted/medical, /area/medical/resleeving) -"sEO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "sEQ" = ( /obj/structure/table/rack/shelf/steel, /obj/item/roller, @@ -15789,14 +17534,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"sGF" = ( -/obj/machinery/light/fairy{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) "sHF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -15875,7 +17614,7 @@ dir = 4 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -15883,14 +17622,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"sKl" = ( -/obj/machinery/door/airlock/glass{ - name = "Cryogenic Storage" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/sleep/cryo) "sKp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -15931,10 +17662,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) "sLm" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/disease2/diseaseanalyser, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -15944,10 +17672,45 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) +"sMl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/command{ + name = "Chief Engineer"; + req_access = list(10) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"sME" = ( +/obj/machinery/telecomms/bus/preset_two/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "sNb" = ( /obj/structure/railing, /turf/simulated/floor/plating, /area/hydroponics/garden) +"sNQ" = ( +/obj/structure/flora/pottedplant/orientaltree, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/chapel/office) "sPf" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/structure/railing, @@ -16018,7 +17781,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "sQs" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -16090,6 +17854,10 @@ /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"sSQ" = ( +/obj/structure/bookcase, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft) "sSR" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -16126,12 +17894,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"sTW" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "sUa" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, @@ -16196,11 +17958,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"sWu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) +"sXi" = ( +/obj/machinery/door/blast/regular{ + dir = 8; + id = "toxin_storage_vent"; + name = "Toxin Storage Vent" + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/storage) "sXp" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 8 @@ -16247,15 +18016,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"tbw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/space) -"tbJ" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/space) +"tbD" = ( +/obj/machinery/telecomms/relay/preset/triumph/deck_two, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "tbO" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16271,23 +18038,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"tcx" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "tcK" = ( /obj/machinery/telecomms/server/presets/supply, /turf/simulated/floor/tiled/dark{ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"tdl" = ( -/obj/item/storage/fancy/blackcandle_box, -/turf/simulated/floor/tiled/techfloor, +"tdA" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "teQ" = ( /obj/machinery/air_alarm{ @@ -16296,6 +18060,18 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) +"teR" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/structure/cable/heavyduty{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "teS" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 4 @@ -16318,6 +18094,12 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three/aft/port) +"tgt" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/flight_deck) "tgx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16380,22 +18162,27 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) -"tid" = ( -/obj/machinery/door/airlock/engineering{ - name = "Hangar Substation" +"tib" = ( +/obj/structure/cable/green{ + icon_state = "0-8" }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "16-0" }, -/turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) -"tip" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 1 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/theatre) +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "tis" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -16425,6 +18212,14 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) +"tkb" = ( +/obj/machinery/disposal/wall{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "tkG" = ( /obj/effect/floor_decal/corner/green{ dir = 8 @@ -16459,6 +18254,18 @@ }, /turf/simulated/floor/wood, /area/library) +"tne" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"tnu" = ( +/obj/machinery/telecomms/relay/preset/triumph/deck_one, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "too" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -16473,6 +18280,19 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"toF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "toX" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -16507,7 +18327,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/library) "tqI" = ( @@ -16555,9 +18375,17 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"trW" = ( +/obj/structure/largecrate, +/obj/item/hardsuit/industrial/old/spring, +/obj/item/hardsuit_module/foam_sprayer, +/obj/random/powercell, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "tsd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "tsy" = ( /turf/simulated/floor/tiled/white, @@ -16584,6 +18412,9 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) +"ttJ" = ( +/turf/simulated/floor/reinforced/overhang, +/area/space) "ttR" = ( /obj/machinery/holoplant, /turf/simulated/floor/tiled/steel_ridged, @@ -16593,6 +18424,9 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/rnd/xenobiology) +"tug" = ( +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "tux" = ( /turf/simulated/floor/tiled/steel, /area/security/prison) @@ -16608,12 +18442,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) -"tvG" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "tvM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16621,15 +18449,12 @@ /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/monotile, /area/security/prison) -"twq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +"twI" = ( +/obj/machinery/doorbell_chime{ + id_tag = "funnt" }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) +/area/main_map/maintenance/deck_three) "twW" = ( /obj/structure/table/standard, /obj/item/multitool, @@ -16641,22 +18466,20 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "txP" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"tzk" = ( -/obj/structure/railing{ - dir = 1 +"tyR" = ( +/obj/structure/bed/chair/wood{ + dir = 4 }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three) -"tzl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/effect/floor_decal/spline/fancy/wood, +/obj/landmark/spawnpoint/job/clown, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "tzv" = ( /obj/machinery/air_alarm{ dir = 8; @@ -16689,6 +18512,14 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"tCE" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/wood, +/area/chapel/main) "tCW" = ( /obj/structure/table/marble, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -16704,8 +18535,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"tEl" = ( +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/lower/vacant_site) "tEr" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 9 @@ -16730,28 +18565,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"tGv" = ( -/obj/machinery/disposal, -/turf/simulated/floor/wood, -/area/space) -"tHe" = ( -/obj/structure/cable/green{ - icon_state = "32-8" - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/obj/machinery/door/firedoor, -/obj/structure/lattice, -/turf/simulated/open, -/area/space) "tJt" = ( /turf/simulated/wall, /area/rnd/robotics/resleeving) @@ -16778,12 +18591,36 @@ "tLp" = ( /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_2) +"tMt" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/south_mount, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "tMG" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"tMQ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/water/deep/indoors, +/area/hydroponics/garden) "tNp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -16797,14 +18634,11 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) -"tNA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 4 +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "tNE" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/resleeving) @@ -16818,7 +18652,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "tOj" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -16829,6 +18664,12 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"tOU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "tOZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16846,31 +18687,6 @@ "tPC" = ( /turf/simulated/floor/carpet/bcarpet, /area/library) -"tPK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) -"tQb" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/int{ - req_access = list(27); - name = "Chapel Access" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/forward/port) "tQs" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, @@ -16882,10 +18698,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/hydroponics/garden) -"tQt" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/plating, -/area/space) "tQO" = ( /obj/structure/railing{ dir = 8 @@ -16895,10 +18707,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/storage) -"tQR" = ( -/obj/structure/closet/largecardboard, -/turf/simulated/floor/reinforced, -/area/space) "tRh" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -16937,16 +18745,12 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) -"tSJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor{ - dir = 4 - }, +"tSD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/forward/starboard) +/area/main_map/Hangar_bay/deck2) "tTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16990,18 +18794,20 @@ /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) -"tVd" = ( -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) +"tUS" = ( +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "tVn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"tVw" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/medical/medbay3) "tVK" = ( /obj/structure/closet/hydrant{ pixel_x = 32 @@ -17071,11 +18877,15 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck3) -"tZE" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 1 +"tZj" = ( +/obj/structure/largecrate, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"uak" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-4" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/outdoors, /area/space) "ual" = ( /obj/machinery/atmospherics/component/unary/freezer{ @@ -17101,8 +18911,25 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"uaU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"ubc" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/rnd/xenobiology) "ubp" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, @@ -17153,6 +18980,13 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"udq" = ( +/obj/machinery/atmospherics/mains_pipe/manifold/hidden{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "udv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17177,6 +19011,23 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/tiled, /area/rnd/test_area) +"uec" = ( +/obj/effect/floor_decal/techfloor/orange/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"uex" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "ueM" = ( /obj/item/barrier_tape_segment/engineering, /turf/simulated/open, @@ -17209,11 +19060,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"ugh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "ugi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17227,6 +19073,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"ugz" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "ugA" = ( /obj/structure/window/reinforced{ dir = 1 @@ -17260,6 +19113,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"uhs" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "uhz" = ( /obj/machinery/light, /turf/simulated/floor/tiled/white, @@ -17289,19 +19148,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"uig" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/space) "uih" = ( /obj/machinery/telecomms/server/presets/common, /turf/simulated/floor/tiled/dark{ @@ -17317,10 +19163,6 @@ /obj/item/retail_scanner, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"ujK" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) "ujP" = ( /obj/structure/railing/grey{ dir = 8 @@ -17345,12 +19187,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three) -"ukS" = ( -/obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three) +"ukB" = ( +/turf/simulated/open, +/area/quartermaster/cargo_shelter_dock) "ulm" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -17363,6 +19204,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"ulw" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "uly" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4 @@ -17393,22 +19240,43 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) +"unt" = ( +/obj/machinery/button/remote/blast_door{ + id = "qm_warehouse"; + name = "Warehouse Door Control"; + pixel_y = -26; + req_access = list(31) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "unz" = ( /obj/machinery/telecomms/processor/preset_four, /turf/simulated/floor/tiled/dark{ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"unQ" = ( -/obj/structure/railing{ - dir = 8 +"unA" = ( +/obj/structure/railing/grey{ + dir = 1 }, -/obj/structure/catwalk, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/open, +/area/rnd/xenobiology) +"uoA" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "uoR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -17457,6 +19325,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"upP" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/water/deep/indoors, +/area/hydroponics/garden) "upZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 @@ -17481,6 +19358,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) +"urq" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "urs" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -17501,6 +19384,12 @@ }, /turf/simulated/floor/outdoors/dirt, /area/hydroponics/garden) +"usm" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "ust" = ( /turf/simulated/floor/tiled/monotile, /area/security/prison) @@ -17515,8 +19404,26 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"uuJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"uwa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/beige/border, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "uwC" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green{ @@ -17536,24 +19443,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/test_area) -"uwN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/landmark{ - name = "lightsout" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) -"uxE" = ( -/obj/effect/floor_decal/spline/fancy/wood, +"uwT" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, /turf/simulated/floor/wood, -/area/crew_quarters/theatre) +/area/medical/psych_ward) +"uxL" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "uyl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -17562,15 +19463,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"uyO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/reinforced, -/area/space) -"uyU" = ( -/obj/machinery/holopad, -/turf/simulated/floor/reinforced, -/area/space) +"uyI" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "uyV" = ( /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) @@ -17610,17 +19508,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) -"uAG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/wall{ - can_open = 1 - }, -/area/main_map/maintenance/deck_three/aft) "uAJ" = ( /obj/structure/lattice, /obj/structure/railing{ @@ -17635,12 +19522,10 @@ /obj/machinery/camera/network/security, /turf/simulated/floor/plating, /area/security/brig) -"uBz" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/space) +"uBx" = ( +/obj/effect/floor_decal/industrial/loading, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "uBL" = ( /turf/simulated/floor/grass, /area/security/brig) @@ -17665,9 +19550,13 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/test_area) +"uDn" = ( +/turf/simulated/floor, +/area/chapel/office) "uDr" = ( /obj/machinery/light/small, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "uDG" = ( /obj/structure/railing{ @@ -17676,16 +19565,23 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"uEO" = ( +"uEW" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 2 + }, +/turf/simulated/wall/prepainted/security, +/area/security/brig) +"uEY" = ( /obj/structure/stairs/spawner/east, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) -"uFc" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "uFT" = ( /obj/structure/railing{ dir = 4 @@ -17699,20 +19595,6 @@ /obj/item/tool/crowbar, /turf/simulated/floor/plating, /area/security/brig) -"uGJ" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-8" - }, -/obj/structure/cable/heavyduty{ - icon_state = "0-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"uGR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "uHx" = ( /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall/prepainted/science, @@ -17733,14 +19615,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/security/prison) -"uIP" = ( -/obj/structure/bookcase/legal/corpreg, -/turf/simulated/floor/wood, -/area/security/brig) "uJn" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) +"uKh" = ( +/obj/effect/floor_decal/grass_edge, +/obj/machinery/seed_storage/garden, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "uKj" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17785,6 +19669,12 @@ "uMe" = ( /turf/simulated/wall/prepainted/civilian, /area/hydroponics/garden) +"uMi" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "uMP" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -17813,6 +19703,15 @@ /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"uNO" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-2" + }, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "uNX" = ( /obj/structure/railing{ dir = 1 @@ -17841,9 +19740,24 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/robotics/resleeving) +"uOa" = ( +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "uOf" = ( /turf/simulated/wall/prepainted/civilian, /area/triumph/surfacebase/sauna) +"uOi" = ( +/obj/structure/closet/emcloset, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"uOK" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/steel, +/area/security/brig) "uOL" = ( /obj/machinery/telecomms/bus/preset_four, /turf/simulated/floor/tiled/dark{ @@ -17857,7 +19771,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -17866,7 +19780,6 @@ "uPq" = ( /obj/machinery/button/windowtint{ id = "draama"; - layer = 3.3; name = "Mystery Window Tint Control"; pixel_x = -24; range = 10 @@ -17900,15 +19813,23 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) -"uQa" = ( -/obj/machinery/doorbell_chime, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three) "uQp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virology) +"uQs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"uRc" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) "uRh" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/black, @@ -17920,17 +19841,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"uRB" = ( -/obj/structure/catwalk, -/turf/simulated/floor/water/deep/indoors, -/area/hydroponics/garden) -"uRJ" = ( -/obj/structure/closet/secure_closet/pathfinder, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "uSq" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/effect/floor_decal/grass_edge{ @@ -17943,11 +19853,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"uTd" = ( +/obj/structure/bed/chair/sofa/black/right{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "uTy" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, /area/medical/psych_ward) +"uVh" = ( +/obj/spawner/window/reinforced/full/firelocks, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "uVy" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, @@ -17955,7 +19878,7 @@ "uVV" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "uXm" = ( @@ -18005,7 +19928,6 @@ }, /obj/machinery/door/blast/shutters{ id = "Druma"; - layer = 3.3; name = "Entertainment Shutters" }, /turf/simulated/floor/plating, @@ -18014,16 +19936,15 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/security/prison) +"uZc" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "uZt" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/medbay_primary_storage) -"vav" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "vaw" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 1 @@ -18037,7 +19958,9 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) "vbd" = ( -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/light/small, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "vbt" = ( /obj/machinery/door/firedoor, @@ -18055,12 +19978,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck3) -"vcc" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three) "vci" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Medbay Deck 3 Entrance"; @@ -18069,6 +19986,11 @@ /obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/steel_ridged, /area/medical/medbay3) +"vcy" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/cafeteria) "vdC" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/syringegun, @@ -18086,18 +20008,18 @@ "vdM" = ( /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"vei" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/east, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 +"vfd" = ( +/obj/landmark/spawnpoint/job/chaplain, +/turf/simulated/floor/wood, +/area/chapel/main) +"vfG" = ( +/obj/machinery/door/window/brigdoor/southright{ + name = "Containment Pen"; + req_access = list(55) }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck3) +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "vfI" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -18127,12 +20049,6 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"vgG" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/starboard) "vhj" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/surgery, @@ -18158,6 +20074,10 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"vhR" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "vhY" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing{ @@ -18168,18 +20088,44 @@ "vhZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance/common, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"via" = ( +/obj/structure/barricade, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "vie" = ( /turf/simulated/wall/r_wall, /area/tether/exploration/pilot_office) +"viF" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "vjz" = ( /obj/structure/closet/secure_closet/psych, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) +"vjD" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/hanger_cafe) "vkf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -18193,7 +20139,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "vkD" = ( @@ -18217,6 +20163,9 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) +"vmg" = ( +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "vmn" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, @@ -18242,7 +20191,7 @@ /area/main_map/maintenance/deck_three/aft) "vnz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "vnI" = ( /obj/machinery/light/small{ @@ -18293,6 +20242,9 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"vpU" = ( +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/quartermaster/cargo_shelter_dock) "vqr" = ( /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/tiled/techmaint, @@ -18325,12 +20277,40 @@ "vrF" = ( /turf/simulated/floor/grass, /area/medical/psych_ward) +"vsk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "vsl" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 1 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"vsx" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled, +/area/engineering/engine_monitoring) "vsA" = ( /obj/machinery/door/airlock/maintenance/rnd, /turf/simulated/floor/tiled/techmaint, @@ -18389,19 +20369,11 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) -"vwU" = ( -/obj/machinery/door/airlock/glass/mining{ - name = "Cargo Bay"; - req_access = list(31); - req_one_access = list() - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "vwV" = ( /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/rnd/test_area) "vxF" = ( @@ -18447,18 +20419,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) -"vzL" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) "vAf" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -18477,6 +20437,10 @@ /obj/structure/ladder/up, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) +"vAZ" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) "vBa" = ( /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/techmaint, @@ -18503,10 +20467,12 @@ /obj/effect/floor_decal/techfloor/corner, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"vDi" = ( -/obj/machinery/door/airlock/maintenance/command, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/forward) +"vDK" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "vFz" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -18533,6 +20499,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) +"vFY" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "vGi" = ( /obj/structure/table/standard, /obj/item/storage/box/bodybags{ @@ -18553,6 +20526,34 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) +"vHr" = ( +/obj/machinery/door/window/brigdoor/southleft{ + req_access = list(55); + name = "Containment Pen" + }, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"vHS" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"vHY" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"vIZ" = ( +/obj/landmark/spawnpoint/job/xenobiologist, +/turf/simulated/floor/glass/reinforced, +/area/rnd/xenobiology) "vJE" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -18575,18 +20576,13 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) -"vLT" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 +"vLv" = ( +/obj/structure/bed/chair/wood{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) +/obj/landmark/spawnpoint/job/mime, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "vMd" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ @@ -18610,10 +20606,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"vNt" = ( -/obj/spawner/window/reinforced/full/firelocks, +"vNh" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three/port) "vNI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18653,7 +20652,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "vPF" = ( /turf/simulated/wall/r_wall, @@ -18674,12 +20674,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"vQA" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/space) "vQF" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 1 @@ -18703,7 +20697,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -18749,12 +20743,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/prison) -"vTB" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/effect/floor_decal/grass_edge, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/hydroponics/garden) "vUi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18767,15 +20755,23 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"vUn" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced, -/area/space) +"vUw" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/security/prison) "vVb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"vVo" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 5 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) "vVB" = ( /obj/structure/railing{ dir = 1 @@ -18785,12 +20781,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three/starboard) -"vVT" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/carpet/sblucarpet, -/area/medical/psych/psych_2) "vWh" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green{ @@ -18811,37 +20801,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"vWD" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) "vWE" = ( /turf/simulated/floor/plating, /area/space) -"vXa" = ( -/obj/machinery/door/airlock/maintenance/engi{ - name = "Elevator Shaft Access"; - req_one_access = null +"vXf" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/forward/starboard) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck3) "vXr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) -"vXR" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "vYz" = ( /obj/machinery/camera/network/research{ dir = 4 @@ -18864,15 +20838,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/theatre) -"vZR" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/engineering/engine_monitoring) "waf" = ( /obj/structure/railing, /obj/structure/railing{ @@ -18880,12 +20845,9 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three) -"waJ" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three/forward/starboard) +"wbq" = ( +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/main_map/maintenance/deck_three/forward) "wbz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -18915,6 +20877,12 @@ }, /turf/simulated/floor/plating, /area/hydroponics) +"wcF" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "wcY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18928,20 +20896,15 @@ /obj/structure/cable/green{ icon_state = "4-9" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) -"wdG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "2-8" +"wdM" = ( +/obj/machinery/door/firedoor{ + dir = 2 }, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) "weH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18961,6 +20924,19 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"wfs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "wfS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -18990,18 +20966,20 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/maintenance/substation/tcomms) -"wia" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +"whN" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "wiB" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor/tiled, /area/rnd/test_area) -"wjE" = ( -/turf/simulated/wall/r_wall/prepainted/cargo, +"wjA" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_gas) +"wjX" = ( +/obj/structure/catwalk, +/turf/space, /area/space) "wkm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -19015,6 +20993,12 @@ }, /turf/simulated/floor/carpet, /area/security/brig) +"wlW" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "wmo" = ( /obj/machinery/vending/hydronutrients, /obj/effect/floor_decal/corner/green{ @@ -19052,6 +21036,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) +"woO" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "woS" = ( /obj/machinery/button/remote/blast_door{ id = "xenobiovs"; @@ -19093,16 +21083,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/security/brig) +"wqc" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_monitoring) "wqA" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"wqC" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 6 +"wqJ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "wrj" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/closet/emcloset, @@ -19140,13 +21136,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) -"wsf" = ( -/obj/structure/ladder, -/obj/structure/ore_box, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +/area/main_map/maintenance/deck_three/aft/starboard) "wsx" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -19197,7 +21189,8 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "wtr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -19206,7 +21199,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "wtw" = ( /obj/structure/table/rack/shelf, @@ -19215,10 +21209,6 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"wtI" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/space) "wtN" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19227,13 +21217,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) -"wuv" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 +"wtS" = ( +/obj/structure/cable/green{ + icon_state = "16-0" }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/surgeryroom1) +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/flight_deck) +"wuy" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hanger_cafe) "wuL" = ( /obj/structure/closet/crate/hydroponics{ desc = "All you need to start your own honey farm."; @@ -19254,15 +21249,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"wvv" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) "wvZ" = ( /obj/machinery/shower{ dir = 4 @@ -19293,14 +21279,10 @@ icon_state = "techmaint" }, /area/security/brig) -"wwf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, +"wwa" = ( +/obj/machinery/door/airlock/glass_external, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/airless/ceiling, /area/space) "wwF" = ( /obj/effect/floor_decal/spline/plain{ @@ -19308,11 +21290,6 @@ }, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"wwG" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled, -/area/crew_quarters/cafeteria) "wyl" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, @@ -19329,10 +21306,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/hydroponics/garden) -"wzH" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "wAb" = ( /turf/simulated/floor/tiled, /area/hydroponics/garden) @@ -19342,10 +21315,26 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) +"wAU" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/hydroponics) +"wBl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "wBm" = ( /obj/landmark/spawnpoint/job/ai/secondary, /turf/simulated/floor/greengrid, /area/ai) +"wBx" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "wBN" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/bed/padded, @@ -19371,12 +21360,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"wDe" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "wDE" = ( /obj/random/trash, /obj/structure/cable/green{ @@ -19401,6 +21384,19 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three) +"wEr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "wEB" = ( /obj/machinery/computer/atmos_alert{ dir = 4 @@ -19447,6 +21443,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"wFr" = ( +/obj/item/stool/padded, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/theatre) "wFE" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, @@ -19500,6 +21504,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"wHI" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "wHX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19515,6 +21529,10 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) +"wIx" = ( +/obj/effect/floor_decal/industrial/danger/corner, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "wJg" = ( /obj/structure/bed/chair{ dir = 4 @@ -19526,7 +21544,10 @@ /area/security/brig) "wKe" = ( /obj/structure/closet/emcloset, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "wKf" = ( /obj/structure/cable/green{ @@ -19541,8 +21562,30 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"wLy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) +"wLW" = ( +/obj/machinery/door/airlock/glass{ + name = "Chapel" + }, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "wNi" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -19554,14 +21597,16 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"wPd" = ( -/obj/structure/catwalk, -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 +"wOb" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) +"wOe" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "wPh" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled, @@ -19579,6 +21624,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/security/prison) +"wPD" = ( +/obj/machinery/telecomms/broadcaster/preset_right/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "wQd" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, @@ -19587,6 +21638,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "wQr" = ( @@ -19613,6 +21667,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) +"wRf" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "wRg" = ( /obj/machinery/recharger/wallcharger{ pixel_x = -22 @@ -19651,12 +21709,25 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) +"wSn" = ( +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "wSs" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"wSC" = ( +/obj/structure/bed/chair/sofa/black/left{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/psychiatrist, +/turf/simulated/floor/carpet, +/area/medical/psych) "wSK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -19670,25 +21741,17 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"wSZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/glass{ - name = "Chapel" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "1-2" +"wTr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/space) -"wTa" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "wUe" = ( /obj/machinery/pipedispenser, /obj/effect/floor_decal/industrial/warning/full, @@ -19701,19 +21764,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"wUU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/exploration/pilot_office) "wVA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"wVN" = ( +/obj/machinery/door/airlock/medical{ + name = "Morgue"; + req_access = list(6) + }, +/turf/simulated/floor/tiled/techfloor, +/area/medical/morgue) "wVX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -19722,18 +21786,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"wXb" = ( -/obj/structure/table/bench/steel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/space) -"wXh" = ( -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/starboard) "wXJ" = ( /obj/machinery/computer/borgupload, /turf/simulated/floor/tiled/techfloor, @@ -19762,22 +21817,25 @@ }, /turf/simulated/floor/wood, /area/library) -"xad" = ( -/obj/landmark{ - name = "lightsout" +"wYJ" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/effect/floor_decal/grass_edge{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/xenobiology) +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "xae" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"xar" = ( -/obj/structure/bed/chair/sofa/black, -/turf/simulated/floor/carpet/bcarpet, -/area/space) +"xbc" = ( +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "xbw" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/psych_ward) @@ -19787,6 +21845,13 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"xbX" = ( +/obj/structure/table/bench/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "xdf" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) @@ -19802,20 +21867,11 @@ "xdq" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_three/aft) -"xdz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "xdN" = ( /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) "xet" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "xez" = ( @@ -19841,6 +21897,19 @@ }, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) +"xfC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) +"xfO" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/quartermaster/cargo_shelter_dock) "xgq" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -19869,10 +21938,15 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) -"xhR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +"xhP" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -19880,6 +21954,9 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/medical/psych) "xii" = ( @@ -19920,7 +21997,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "xjC" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -19929,15 +22006,18 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"xjO" = ( -/obj/structure/bed/chair/office/light{ +"xjH" = ( +/obj/machinery/light/spot/no_nightshift{ dir = 4 }, -/obj/landmark/spawnpoint/job/xenobiologist, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/techmaint, +/area/security/prison) +"xjJ" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/monowhite, /area/rnd/xenobiology) "xku" = ( /obj/structure/bed/chair/sofa/black/left{ @@ -19966,32 +22046,24 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"xkK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) "xmI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"xnv" = ( +/obj/landmark/spawnpoint/job/bartender, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "xof" = ( /obj/structure/table/sifwoodentable, /obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/wood, /area/medical/medbay3) -"xoM" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/main_map/maintenance/deck_three/forward/starboard) "xpm" = ( /turf/simulated/floor/tiled/techmaint, /area/maintenance/substation/tcomms) @@ -20045,16 +22117,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/surgeryroom1) -"xtt" = ( -/obj/machinery/door/airlock/lift, -/turf/simulated/floor/holofloor/tiled/dark, -/area/space) -"xtN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "xtV" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, @@ -20066,18 +22128,36 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) -"xuE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/hydroponics/garden) "xvc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"xvH" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) +"xvL" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/space) +"xvY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "xwb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -20100,13 +22180,26 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) +"xwh" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"xwm" = ( +/turf/simulated/wall/prepainted/civilian, +/area/main_map/maintenance/deck_three/port) +"xwy" = ( +/obj/machinery/washing_machine, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/brig) "xwK" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"xxo" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/main_map/maintenance/deck_three/forward/starboard) "xyY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -20119,10 +22212,6 @@ /obj/effect/floor_decal/corner/beige/bordercorner, /turf/simulated/floor/tiled/white, /area/medical/psych) -"xzI" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/tether/exploration/pathfinder_office) "xAK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 4 @@ -20145,6 +22234,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"xCe" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "xCx" = ( /obj/machinery/door/airlock/research{ name = "Toxins Lab"; @@ -20218,18 +22311,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) +"xEg" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/main_map/Hangar_bay/deck2) "xEJ" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_monitoring) -"xFo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "xFx" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologyaccess) @@ -20245,6 +22332,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) +"xFQ" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "xFR" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, @@ -20298,6 +22392,14 @@ }, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) +"xJj" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xKX" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple, /obj/machinery/meter, @@ -20324,21 +22426,6 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled/techmaint, /area/security/prison) -"xMz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) "xMD" = ( /obj/structure/fence{ dir = 4 @@ -20348,16 +22435,14 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"xMG" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pilot_office) "xNb" = ( /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) +"xNe" = ( +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xNF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -20389,13 +22474,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"xPi" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/obj/landmark/spawnpoint/job/xenobiologist, -/turf/simulated/floor/tiled/monotile, -/area/rnd/xenobiology) "xPj" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20405,6 +22483,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"xPF" = ( +/obj/machinery/door/airlock/atmos{ + name = "Civilian Atmospherics Backup"; + req_access = list(24) + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/wall/prepainted/civilian, +/area/main_map/maintenance/deck_three/port) "xPL" = ( /obj/machinery/atmospherics/pipe/vent/high_volume{ dir = 4 @@ -20461,6 +22554,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/rdoffice) +"xRo" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "xRW" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -20513,6 +22613,23 @@ /obj/machinery/holoplant, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"xTP" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) +"xTU" = ( +/obj/machinery/door/airlock{ + name = "Chapel Morgue"; + req_access = list(27) + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/port) "xUh" = ( /obj/structure/railing/grey{ dir = 4 @@ -20528,6 +22645,16 @@ "xUy" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) +"xUD" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "xVc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -20538,12 +22665,20 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "xVj" = ( /obj/structure/bed/psych, /turf/simulated/floor/wood, /area/medical/psych/psych_2) +"xVq" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xVC" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; @@ -20570,15 +22705,29 @@ /obj/machinery/pipedispenser, /turf/simulated/floor/tiled, /area/rnd/test_area) -"xVM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"xWi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three/port) +"xWL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "xWX" = ( /obj/structure/closet/secure_closet/genpop, /obj/structure/window/reinforced{ @@ -20595,25 +22744,20 @@ "xXU" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"xYD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft/port) "xYL" = ( /obj/structure/morgue{ dir = 2 }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"xZe" = ( -/obj/item/storage/fancy/candle_box, -/turf/simulated/floor/tiled/techfloor, -/area/space) +"xZb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/light/spot/no_nightshift, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "xZj" = ( /obj/structure/closet/crate/corporate/nanotrasen, /turf/simulated/floor/tiled/techmaint, @@ -20642,6 +22786,11 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"yaw" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) "yaR" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -20661,9 +22810,6 @@ /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled/white, /area/engineering/gravity_gen) -"ybO" = ( -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "ybP" = ( /obj/machinery/computer/power_monitor{ dir = 4 @@ -20680,6 +22826,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"ycb" = ( +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/maintenance/substation/flight_deck) "yce" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -20688,20 +22837,38 @@ /obj/fiftyspawner/steel, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"ycj" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ycp" = ( /obj/structure/table/standard, /turf/simulated/floor/wood, /area/security/brig) +"ycE" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/deck_three/aft) "ycN" = ( /obj/structure/closet/firecloset, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"ydc" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/crew_quarters/cafeteria) "ydr" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/wood, /area/medical/psych/psych_1) "ydK" = ( /obj/structure/closet/emcloset, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "ydS" = ( @@ -20713,27 +22880,19 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) -"yer" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ +"yeC" = ( +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ +/obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "0-2" }, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "yfn" = ( /obj/landmark{ name = "carpspawn" @@ -20750,10 +22909,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) -"ygv" = ( -/obj/machinery/computer/timeclock/premade/north, -/turf/simulated/floor/wood, -/area/space) "ygJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/bluegrid{ @@ -20797,15 +22952,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych_ward) -"yjI" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "yjY" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing{ @@ -20816,15 +22962,8 @@ "ykj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"ykH" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/reinforced, -/area/space) "ylv" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -20843,12 +22982,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"ylN" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/starboard) (1,1,1) = {" vva @@ -21021,28 +23154,28 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva +mUe +opN +opN +xbW +opN +opN +opN +xbW +opN +opN +opN +xbW +opN +opN +opN +xbW +opN +opN +opN +qjY +aje +aje "} (2,1,1) = {" vva @@ -21215,66 +23348,30 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -"} -(3,1,1) = {" -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva +gLg +dwG +aZd +eqa +kpf +aje +dwG +eqa +kpf +aje +eEb +eqa +aZd +cdt +dwG +eqa +kpf +aje +dwG +eqa +kpf +aje +"} +(3,1,1) = {" vva vva vva @@ -21413,26 +23510,8 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva -"} -(4,1,1) = {" vva vva vva @@ -21463,6 +23542,30 @@ vva vva vva vva +gLg +aZd +aZd +aZd +qth +aje +aZd +aZd +qth +aje +qth +aZd +aZd +cdt +aZd +gAi +qth +aje +aZd +gAi +qth +aje +"} +(4,1,1) = {" vva vva vva @@ -21607,26 +23710,8 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva -"} -(5,1,1) = {" vva vva vva @@ -21651,6 +23736,30 @@ vva vva vva vva +gLg +aZd +aZd +aZd +qth +aje +aZd +aZd +qth +aje +qth +aZd +aZd +cdt +aZd +aZd +qth +aje +aZd +aZd +qth +aje +"} +(5,1,1) = {" vva vva vva @@ -21758,17 +23867,6 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -21793,15 +23891,6 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva -dAV dAV dAV dAV @@ -21813,18 +23902,6 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -vva -vva -"} -(6,1,1) = {" -vva -vva -vva -vva vva vva vva @@ -21853,6 +23930,30 @@ vva vva vva vva +gLg +skX +skX +luL +bQc +aje +skX +xrN +bQc +aje +bQc +cxK +skX +aje +skX +too +bQc +aje +skX +bUR +bQc +aje +"} +(6,1,1) = {" vva vva vva @@ -21952,17 +24053,6 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -22006,27 +24096,6 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -"} -(7,1,1) = {" -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva vva vva vva @@ -22055,6 +24124,30 @@ vva vva vva vva +gLg +dyx +jPo +elz +fLa +aje +jPo +elz +fLa +aje +fTu +elz +ugA +aje +aVI +elz +fLa +aje +jPo +elz +fLa +aje +"} +(7,1,1) = {" vva vva vva @@ -22146,17 +24239,6 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -22166,6 +24248,14 @@ vva vva vva vva +nbG +nbG +nbG +nbG +sMl +nbG +nbG +nbG vva vva vva @@ -22200,26 +24290,6 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -"} -(8,1,1) = {" -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva vva vva vva @@ -22248,6 +24318,30 @@ vva vva vva vva +gLg +hMU +hMU +hMU +hMU +gzH +hMU +hMU +hMU +hMU +hMU +hMU +hMU +woS +hMU +hMU +hMU +wRg +hMU +hMU +iHw +aje +"} +(8,1,1) = {" vva vva vva @@ -22340,17 +24434,6 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -22359,6 +24442,14 @@ vva vva vva vva +nbG +hbV +xbc +jYV +mmO +nYi +htA +nbG vva vva vva @@ -22393,16 +24484,8 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva -"} -(9,1,1) = {" vva vva vva @@ -22429,6 +24512,30 @@ vva vva vva vva +gLg +kCv +kCv +kCv +kCv +kCv +kCv +pOc +oTn +kCv +kCv +kCv +kCv +kCv +kCv +kCv +pTh +myX +kCv +kCv +wFN +aje +"} +(9,1,1) = {" vva vva vva @@ -22529,22 +24636,19 @@ vva vva vva vva +nbG +fUm +aAJ +lWa +qoy +vDK +xbc +aeD vva vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -22563,6 +24667,18 @@ vva vva vva vva +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +vva vva vva vva @@ -22576,27 +24692,8 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva -"} -(10,1,1) = {" vva vva vva @@ -22609,6 +24706,34 @@ vva vva vva vva +gLg +kCv +kCv +kCv +kCv +kCv +kCv +kCv +bcP +kCv +kCv +kCv +kCv +kCv +kCv +kCv +hyw +kCv +kCv +kCv +kCv +aje +"} +(10,1,1) = {" +vva +vva +vva +vva vva vva vva @@ -22705,6 +24830,14 @@ vva vva vva vva +nbG +frM +iTJ +iTJ +ofI +wqJ +gKB +qHI vva vva vva @@ -22767,28 +24900,28 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +wUe +ttW +gSP +pfh +hox +kCv +kCv +qKh +xXQ +jHl +jHl +jHl +jHl +jHl +xXQ +akT +kCv +kCv +npx +otG +aje "} (11,1,1) = {" vva @@ -22891,14 +25024,14 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva +nbG +kDm +bEU +qyt +lRV +iTJ +iuo +itl vva vva vva @@ -22961,28 +25094,28 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +uwH +uwH +uwH +uwH +uwH +pMq +kCv +qKh +evz +pWL +qoc +pHd +dRH +cZF +evz +akT +kCv +qWZ +aje +bQc +aje "} (12,1,1) = {" vva @@ -23041,39 +25174,23 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +vva +vva +vva +vva +vva +vva +vva +vva vva vva vva @@ -23100,6 +25217,22 @@ vva vva vva vva +vva +nbG +njQ +pXi +psG +gqm +wcF +pbQ +nbG +vva +vva +vva +vva +vva +vva +vva dAV dAV dAV @@ -23155,28 +25288,28 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +pXA +hpl +pDZ +skX +pgd +fxw +kCv +qKh +iyb +hbl +jHl +jHl +dge +nrT +iyb +akT +kCv +yfv +skX +sQF +aje "} (13,1,1) = {" vva @@ -23279,14 +25412,14 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva +nbG +ouR +cUV +eoC +qCG +ajw +kye +nbG vva vva vva @@ -23349,28 +25482,28 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +fLv +iul +hpl +hpl +gJK +dtT +fxw +rva +bua +khS +khS +khS +khS +khS +vkf +dHQ +uie +mtS +kPN +azA +fGz +aje "} (14,1,1) = {" vva @@ -23444,15 +25577,7 @@ vva vva vva vva -qFt -vva -vva -vva -vva -vva -vva -vva -vva +mIv vva vva vva @@ -23481,6 +25606,14 @@ vva vva vva vva +nbG +nbG +nbG +nbG +nbG +nbG +nbG +nbG vva vva vva @@ -23534,8 +25667,7 @@ vva vva vva vva -qFt -vva +mIv vva vva vva @@ -23544,27 +25676,28 @@ vva vva vva vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +qGh +xje +jmG +mjH +drR +tju +kCv +jHl +ipG +roX +roX +roX +roX +jHS +jHl +jHl +ped +iQI +eRr +jUD +aje "} (15,1,1) = {" vva @@ -23638,7 +25771,7 @@ vva vva vva vva -dff +kEZ vva vva vva @@ -23728,10 +25861,7 @@ vva vva vva vva -dff -vva -vva -vva +kEZ vva vva vva @@ -23740,25 +25870,28 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +aje +aje +aje +aje +aje +aje +rmv +aje +aje +mxF +jHl +jHl +jHl +xFI +jHl +jHl +evl +opM +aje +aje +aje "} (16,1,1) = {" vva @@ -23832,7 +25965,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -23891,56 +26024,45 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -dff -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -dAV +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva dAV dAV dAV dAV dAV dAV +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +kEZ +vva +vva +vva +vva +vva +vva +vva dAV dAV dAV @@ -23951,8 +26073,19 @@ dAV dAV dAV dAV -vva -vva +aje +mxF +ddA +jHl +jHl +xFI +jHl +jHl +eRK +gWu +rBp +ppe +aje "} (17,1,1) = {" vva @@ -24026,7 +26159,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -24116,8 +26249,7 @@ vva vva vva vva -dff -vva +kEZ vva vva vva @@ -24125,14 +26257,6 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV dAV dAV dAV @@ -24143,10 +26267,19 @@ dAV dAV dAV dAV -dAV -dAV -vva -vva +aje +knt +mJM +eXz +jXG +awI +roI +wSl +wSK +kCv +hgH +ual +aje "} (18,1,1) = {" vva @@ -24220,7 +26353,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -24258,21 +26391,21 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -24310,9 +26443,7 @@ vva vva vva vva -dff -vva -vva +kEZ vva vva vva @@ -24320,10 +26451,6 @@ vva vva vva vva -vva -vva -dAV -dAV dAV dAV dAV @@ -24334,13 +26461,19 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +aje +aje +aje +aje +aje +bRL +evz +aje +kCv +kCv +hgH +exK +aje "} (19,1,1) = {" vva @@ -24414,7 +26547,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -24449,27 +26582,27 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -24504,11 +26637,7 @@ vva vva vva vva -dff -vva -vva -vva -vva +kEZ vva vva vva @@ -24533,8 +26662,12 @@ dAV dAV dAV dAV -vva -vva +aje +kCv +kCv +fcv +fOQ +ijo "} (20,1,1) = {" vva @@ -24608,7 +26741,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -24640,33 +26773,33 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ sVT sVT sVT -dWI -dWI -dWI -dPc -dPc -dPc -dWI -dWI -dWI +etj +etj +etj +tne +tne +tne +etj +etj +etj sVT sVT sVT -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -24698,11 +26831,7 @@ vva vva vva vva -dff -vva -vva -vva -vva +kEZ vva vva vva @@ -24727,8 +26856,12 @@ dAV dAV dAV dAV -vva -vva +aje +wPh +wPh +jkS +jkS +aje "} (21,1,1) = {" vva @@ -24801,9 +26934,9 @@ vva vva vva vva -dff -dff -dff +qmG +qmG +qmG vva vva vva @@ -24831,42 +26964,39 @@ vva vva vva vva -dff -dff -dff -dff -dff -ojV +kEZ +kEZ +kEZ +kEZ +kEZ +gaO jWM jWM jWM jWM -dff -dff -wqC -sTW -wqC -rFt -rFt -rFt -sTW -wqC -sTW -dff -dff +ttJ +ttJ +pnY +vVo +pnY +fDt +fDt +fDt +vVo +pnY +vVo +ttJ +ttJ rre rre rre rre -dff -dff -dff -dff -dff -dff -vva -vva -vva +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -24891,13 +27021,12 @@ vva vva vva vva -dff -dff -dff -vva vva vva vva +kEZ +kEZ +kEZ vva vva vva @@ -24921,8 +27050,12 @@ dAV dAV dAV dAV -vva -vva +idd +idd +idd +idd +idd +idd "} (22,1,1) = {" vva @@ -24995,9 +27128,9 @@ vva vva vva vva -dff -dff -dff +qmG +ntB +qmG vva vva vva @@ -25022,12 +27155,12 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ jWM jWM jWM @@ -25035,8 +27168,8 @@ jWM vny vny jWM -dff -dff +ttJ +ttJ dFe dFe dFe @@ -25046,8 +27179,8 @@ bYV dFe dFe dFe -dff -dff +ttJ +ttJ rre sbe iNJ @@ -25055,12 +27188,12 @@ rre gcl xgX rre -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -25085,9 +27218,9 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -25190,13 +27323,13 @@ vva vva qmG qmG +kSY qmG qmG qmG vva vva vva -vva dAV dAV dAV @@ -25213,24 +27346,24 @@ vva vva vva vva -dff -dff -dff -dff -dff -ojV +kEZ +kEZ +kEZ +kEZ +kEZ +gaO jWM jWM jWM jWM vny -vny +mco vny vny vny jWM -dff -dff +ttJ +ttJ mhM urZ urZ @@ -25240,8 +27373,8 @@ gnJ urZ urZ cVW -dff -dff +ttJ +ttJ rre hKm keq @@ -25252,12 +27385,12 @@ rre vAf sqh rre -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -25278,12 +27411,11 @@ vva vva vva vva -sVT -sVT -sVT -sVT -sVT -vva +oCb +oCb +oCb +oCb +oCb vva vva vva @@ -25309,6 +27441,7 @@ dAV dAV dAV dAV +dAV vva vva "} @@ -25383,9 +27516,9 @@ vva qmG qmG qmG -kSY -kSY -kSY +qmG +qmG +qmG qmG qmG qmG @@ -25404,27 +27537,27 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ jWM jWM jWM jWM vny vny +xdq vny -vny -vny +mco vny vny vny jWM -dff -dff +ttJ +ttJ gnJ urZ urZ @@ -25434,28 +27567,27 @@ mhM urZ urZ xDD -dff -dff +ttJ +ttJ rre -aWO +eou bId uBL eRb tpm -hcS +iMk fsf iOQ rre gcl xgX rre -dff -dff -dff -dff -dff -dff -vva +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -25470,17 +27602,16 @@ vva vva vva vva -sVT -sVT -sVT -vWE -vWE -vWE -sVT -sVT -sVT -vva vva +oCb +oCb +oCb +nDe +nDe +nDe +oCb +oCb +oCb vva vva vva @@ -25503,6 +27634,8 @@ dAV dAV dAV dAV +dAV +dAV vva vva "} @@ -25580,8 +27713,8 @@ kSY kSY kSY kSY -kSY -kSY +dEA +ntB qmG qmG vva @@ -25595,30 +27728,30 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ jWM jWM jWM jWM xGX +sSQ +xdq vny vny +xdq vny +mco vny -vny -vny -vny -vny -vny -vny +mco +mco jWM -dff -dff +ttJ +ttJ mhM urZ urZ @@ -25628,15 +27761,15 @@ gnJ urZ urZ cVW -dff -dff +ttJ +ttJ rre rKq uBL uBL uBL tpm -hcS +iMk oia ckD uXY @@ -25646,12 +27779,12 @@ rre gcl xgX rre -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -25663,17 +27796,17 @@ vva vva vva vva -sVT -sVT -vWE -pVf -pVf -pVf -pVf -pVf -pVf -sVT -sVT +oCb +oCb +nDe +nDe +nDe +nDe +nDe +nDe +nDe +oCb +oCb vva vva vva @@ -25771,12 +27904,12 @@ qmG kSY kSY kSY -qmG -cZP -kSY kSY kSY kSY +tug +tug +tug qmG qmG qmG @@ -25786,33 +27919,33 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ jWM +sSQ vny vny vny vny +xdq vny vny +xdq vny vny vny -vny -vny -vny -vny -vny +mco +mco jWM -dff -dff +ttJ +ttJ gnJ jmb jmb @@ -25822,54 +27955,54 @@ mhM jmb jmb xDD -dff -dff +ttJ +ttJ rre kmX uBL dcR bId tpm -hcS -nVL +iMk +khF xgU cUh lNT -hcS -hcS +iMk +iMk xGK awS rre rre rre rre -dff -dff -dff -dff -dff -dff -vva -vva -vva +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva -vva -sVT -sVT -sVT -vWE -vWE -pVf -yjI -nYm -sVT -vWE -pVf -pVf -sVT -sVT -sVT +aje +aje +aje +aje +aje +aje +aje +aje +nDe +eSK +mrT +epr +oCb +nDe +nDe +nDe +oCb +oCb +oCb vva vva vva @@ -25966,47 +28099,47 @@ kSY kSY kSY kSY -pQd -pQd -kSY -kSY -kSY kSY kSY +oej +uxL +uxL +uxL +uxL qmG qmG qmG qmG -sVT -sVT -sVT -sVT -dff -dff +qmG +qmG +qmG +qmG +kEZ +kEZ mVx mVx mVx -dff -bYV -dff +ttJ +ttJ +ttJ jWM +sSQ vny vny vny vny +xdq vny vny +xdq vny vny vny -vny -vny -vny -vny -vny +mco +mco jWM -dff -dff +ttJ +ttJ mhM jmb jmb @@ -26016,56 +28149,56 @@ gnJ jmb jmb cVW -dff -dff +ttJ +ttJ rre nHu uBL uBL ftq tpm -hcS +iMk hMG aTB grs ycp -hcS +iMk khj jCW dFi bIM -bIM +hCv xMD rre rre rre rre -dff -dff -dff -dff -dff -sVT -sVT -sVT -sVT -sVT -vWE -vWE -vWE -vWE -pVf -vWE -vWE -sVT -sVT -sVT -pVf -vWE -sVT -sVT -sVT -sVT +kEZ +kEZ +kEZ +kEZ +kEZ +aje +anH +anH +anH +ifo +jNS +jNS +aje +nDe +eSK +nDe +nDe +nDe +nDe +nDe +nDe +nDe +oCb +oCb +oCb +oCb vva vva vva @@ -26149,7 +28282,7 @@ vva vva vva vva -dff +kEZ qmG qmG kSY @@ -26157,8 +28290,16 @@ kSY kSY kSY kSY +pTA +xTP +qmG kSY kSY +hZv +hZv +hZv +hZv +hZv kSY kSY kSY @@ -26166,24 +28307,17 @@ kSY kSY kSY kSY -kSY -kSY -kSY -kSY -kSY -vWE -vWE -vWE vie mVx pxE mVx uzs mVx -dff -bYV -dff +eHm +eHm +eHm jWM +sSQ vny vny vny @@ -26195,12 +28329,11 @@ vny vny vny vny -vny -vny -vny +mco +mco jWM -dff -dff +ttJ +ttJ gnJ jmb jmb @@ -26210,20 +28343,20 @@ mhM jmb jmb xDD -dff -dff +ttJ +ttJ rre wmo uBL bId uBL tpm -xIG +uEW nVL aTB grs rOe -hcS +iMk nDh aTj kcQ @@ -26236,32 +28369,32 @@ hcS rre rre rre -dff -dff -dff -sVT -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -pVf -pVf -pVf -jMZ -jMZ -sVT -pVf -pVf -fnD -vWE -vWE -bCw -fBa -drw +eHm +eHm +eHm +aje +anH +anH +anH +ifo +jNS +jNS +aje +nDe +eSK +eSK +eSK +eSK +eSK +eSK +eSK +eSK +qNl +nDe +nDe +aCu +ugz +jgd vva dAV dAV @@ -26343,7 +28476,8 @@ vva vva vva vva -dff +kEZ +qmG qmG qmG qmG @@ -26352,7 +28486,7 @@ qmG qmG qmG qmG -aTt +izE kSY kSY izE @@ -26362,8 +28496,7 @@ qmG qmG qmG qmG -qmG -qmG +lxb qmG mVx mVx @@ -26374,27 +28507,27 @@ bZH sbJ bdf mVx -dff +ttJ bYV -dff +ttJ jWM +sSQ vny vny vny vny +xdq vny -bMK -eTk -kEO -keQ +vny +xdq vny vny vny vny vny jWM -dff -dff +ttJ +ttJ mhM urZ urZ @@ -26404,10 +28537,10 @@ gnJ urZ urZ cVW -dff -dff +ttJ +ttJ rre -aWO +eou eRb uBL bId @@ -26417,7 +28550,7 @@ hOM mIX grs hxR -hcS +iMk mNo dVc hcS @@ -26430,32 +28563,32 @@ uzo gjF xSy rre -dff -dff -dff -mUe -opN -opN -xbW -opN -opN -opN -xbW -opN -opN -opN -xbW -opN -opN -opN -xbW -opN -opN -opN -qjY +ttJ +ttJ +ttJ +aje +anH +anH +anH +ifo +ksA +uhs +aje +aje +aje +aje +aje +aje aje aje -cUp +rmv +aje +aje +aje +aje +aje +aje +bzp vva dAV dAV @@ -26537,13 +28670,14 @@ vva vva vva vva -dff +kEZ qmG jhf jhf jhf jhf jhf +kYG jhf jhf jhf @@ -26553,8 +28687,7 @@ jhf jhf jhf jhf -jhf -jhf +kYG jhf jhf jhf @@ -26562,33 +28695,33 @@ jhf mVx lPi pet -xMG +ddj aNF bZH aUy npC mVx -dff +ttJ bYV -dff +ttJ jWM +xdq +xdq +xdq +xdq +xdq +xdq vny vny -vny -vny -vny -wsf -ikZ -keQ -keQ +xdq vny vny vny vny vny jWM -dff -dff +ttJ +ttJ gnJ urZ urZ @@ -26598,8 +28731,8 @@ mhM urZ urZ xDD -dff -dff +ttJ +ttJ rre aWO bId @@ -26611,7 +28744,7 @@ ptx aTB grs kEq -hcS +iMk nXH dVc hcS @@ -26624,32 +28757,32 @@ gjF xSy gjF rre -dff -bYV -dff -gLg -dwG -aZd -eqa -kpf -aje -dwG -eqa -kpf +ttJ +ttJ +ttJ aje -eEb -eqa -aZd -cdt -dwG -eqa -kpf +nef +saJ +saJ +ifo +ifo +pMU +fxt +idH +gjx +unA +jNS +jNS +dqG +gRy +anH +ozb +jNS +jNS +fyg +anH aje -dwG -eqa -kpf -aje -cUp +bzp vva dAV dAV @@ -26731,7 +28864,7 @@ vva vva vva vva -dff +kEZ qmG jhf jhf @@ -26762,27 +28895,27 @@ nQJ aNF aNF mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq +vny +vny vny vny -nKb -keQ -keQ -keQ +xdq vny vny vny vny vny jWM -dff -dff +ttJ +ttJ mhM urZ urZ @@ -26792,8 +28925,8 @@ gnJ urZ urZ cVW -dff -dff +ttJ +ttJ rre siX sjz @@ -26805,7 +28938,7 @@ ptx aTB grs iDM -hcS +iMk bAl dVc kWL @@ -26816,34 +28949,34 @@ xSy gjF xSy gjF -xSy +jBK rre -dff -bYV -dff -gLg -aZd -aZd -aZd -qth +ttJ +ttJ +ttJ aje -aZd -aZd -qth +saJ +saJ +saJ +ifo +ifo +eqL +qEF +grH +anH +unA +jNS +jNS +amo +anH +anH +vHr +jNS +jNS +fyg +ycj aje -qth -aZd -aZd -cdt -aZd -gAi -qth -aje -aZd -gAi -qth -aje -cUp +bzp vva vva vva @@ -26925,7 +29058,7 @@ vva vva sVT sVT -dff +kEZ qmG jhf jhf @@ -26953,48 +29086,48 @@ nnl nnl pfm ogM -ogM +aQi jyQ mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq +vny vny vny -hjD -keQ -keQ -keQ +vny +xdq vny vny vny vny vny jWM -dff -dff -bYV -bsz -bsz -bsz -bYV -bsz -bsz -bsz -bYV -dff -dff +ttJ +ttJ +gnJ +qUw +qUw +cVW +xPL +mhM +qUw +qUw +xDD +ttJ +ttJ rre -hcS -hcS -hcS -hcS -hcS -hcS +iMk +iMk +iMk +iMk +iMk +iMk xCM kmQ uhH @@ -27012,32 +29145,32 @@ gjF xSy gbf rre -dff -bYV -dff -gLg -aZd -aZd -aZd -qth +ttJ +ttJ +ttJ aje -aZd -aZd -qth +saJ +saJ +saJ +ifo +ifo +vIZ +saJ +saJ +anH +eqL +qEF +qEF +pVs +saJ +vIZ +vfG +qEF +qEF +grH +anH aje -qth -aZd -aZd -cdt -aZd -aZd -qth -aje -aZd -aZd -qth -aje -cUp +bzp sVT sVT vva @@ -27116,12 +29249,12 @@ vva vva vva sVT -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ qmG -jhf +bzx jhf mOb mOb @@ -27140,48 +29273,48 @@ mOb mOb mOb jhf -cos +fdh mVx aNF aNF mVx -hbP -bXA +yeC +rFw bXA thw mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq +vny vny vny -jje -doQ -keQ -keQ +vny +xdq vny vny vny vny jWM jWM -sVT -dff -dff -bzA -bzA -bzA -bYV -bzA -bzA -bzA -dff -dff -sVT +ttJ +ttJ +rWN +oem +ltt +ttJ +hXt +ttJ +oem +ltt +rWN +ttJ +ttJ rre rre uAM @@ -27206,35 +29339,35 @@ eJn eFd aYm rre -dff -bYV -dff -gLg -skX -skX -luL -bQc -aje -skX -xrN -bQc -aje -bQc -cxK -skX -aje -skX -too -bQc +ttJ +ttJ +ttJ aje -skX -bUR -bQc +szI +anH +anH +ifo +ifo +saJ +saJ +saJ +jLZ +anH +anH +anH +anH +saJ +saJ +anH +anH +anH +anH +anH aje -cUp -dff -dff -dff +bzp +kEZ +kEZ +kEZ sVT vva vva @@ -27308,12 +29441,12 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ qmG jhf jhf @@ -27335,18 +29468,18 @@ mOb mOb jhf cos -vNt -jMZ -jMZ +eHp +tug +tug aNF fiW -mdq +ayC bXA qHk mVx -dff +ttJ bYV -dff +ttJ jWM vny vny @@ -27356,26 +29489,26 @@ vny vny vny vny -vny +xdq vny vny vny vny jWM jWM -sVT -dff -dff -gQn -gQn -gQn -dff -gQn -gQn -gQn -dff -dff -sVT +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ rre rre fXE @@ -27386,8 +29519,8 @@ wpW nDx iNg atE -uIP -hcS +qSW +iMk dYU nyq hcS @@ -27400,37 +29533,37 @@ xSy dvX oPw rre -dff -bYV -dff -gLg -dyx -jPo -elz -fLa -aje -jPo -elz -fLa +ttJ +ttJ +ttJ aje -fTu -elz -ugA -aje -aVI -elz -fLa -aje -jPo -elz -fLa +saJ +saJ +saJ +ifo +ifo +saJ +saJ +saJ +anH +ijC +fxt +fxt +pVs +saJ +saJ +vHr +fxt +fxt +ubc +anH aje -ciN -fBa -fBa -drw -dff -dff +xNe +ugz +ugz +jgd +kEZ +kEZ vva vva vva @@ -27502,9 +29635,9 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ sVT sVT sVT @@ -27529,59 +29662,59 @@ mOb mOb jhf cos -vNt -jMZ -jMZ +eHp +tug +tug aNF hbP -wUU +gEn bXA ezE mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny -vny -vny -vny -vny -vny -vny -vny -vny +xdq vny vny jWM jWM -sVT -dff -dff -bzA -bzA -bzA -bYV -bzA -bzA -bzA -dff -dff -sVT +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM rre rre wrw -hcS -hcS -hcS -hcS -hcS -hcS -hcS -hcS -hcS +iMk +iMk +iMk +iMk +iMk +iMk +iMk +iMk +iMk bLA nyq hcS @@ -27594,37 +29727,37 @@ dvX xSy dvX rre -dff -bYV -dff -gLg -hMU -hMU -hMU -hMU -gzH -hMU -hMU -hMU -hMU -hMU -hMU -hMU -woS -hMU -hMU -hMU -wRg -hMU -hMU -iHw +ttJ +ttJ +ttJ +aje +saJ +saJ +saJ +ifo +ifo +ijC +fxt +ubc +anH +unA +jNS +jNS +dqG +saJ +saJ +vfG +jNS +jNS +fyg +anH aje sVT sVT sVT -cUp -dff -dff +bzp +kEZ +kEZ vva vva vva @@ -27696,9 +29829,9 @@ vva vva vva vva -qFt -dff -dff +mIv +kEZ +kEZ sVT sVT sVT @@ -27723,27 +29856,27 @@ mOb mOb jhf cos -nQj -dNp -dNp +xEg +fmo +fmo mVx mri -mAs +szj bXA mQs mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq vny vny +jWM vny -cgK -eTk vny vny vny @@ -27751,31 +29884,31 @@ vny vny vny jWM -dff -dff -bYV -dFe -dFe -dFe -bYV -dFe -dFe -dFe -bYV -dff -dff +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny rre pqp xOL uGp -hcS +iMk nhe -hcS +iMk fbj sHT sHT wvZ -hcS +iMk bLA nyq lbn @@ -27786,39 +29919,39 @@ xSy dvX xSy dvX -xSy +jBK rre -dff -bYV -dff -gLg -kCv -kCv -kCv -kCv -kCv -kCv -pOc -oTn -kCv -kCv -kCv -kCv -kCv -kCv -kCv -pTh -myX -kCv -kCv -wFN +ttJ +ttJ +ttJ +aje +saJ +saJ +saJ +ifo +ifo +cUr +qEF +grH +anH +cUr +qEF +qEF +amo +saJ +saJ +xjJ +qEF +qEF +grH +anH aje sVT sVT sVT -cUp -dff -qFt +bzp +kEZ +mIv vva vva vva @@ -27890,9 +30023,9 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ sVT sVT sVT @@ -27917,22 +30050,36 @@ mOb mOb jhf cos -iJv -pVf -pVf +wSn +jhf +jhf aNF -hbP -gEA -bXA +xUD +oPL +hRZ mQs mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq +vny +vny +jWM +vny +vny +vny +vny +vny +vny +vny +jWM +vny +vny vny vny vny @@ -27944,25 +30091,11 @@ vny vny vny vny -jWM -dff -dff -gnJ -urZ -urZ -cVW -bYV -mhM -urZ -urZ -xDD -dff -dff rre qAv wDE vws -hcS +iMk rlk xPW mua @@ -27982,37 +30115,37 @@ dvX xSy dvX rre -dff -bYV -dff -gLg -kCv -kCv -kCv -kCv -kCv -kCv -kCv -bcP -kCv -kCv -kCv -kCv -kCv -kCv -kCv -hyw -kCv -kCv -kCv -kCv +ttJ +ttJ +ttJ +aje +iUg +anH +anH +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +saJ +saJ +anH +anH +anH +anH +anH aje sVT sVT sVT -cUp -dff -dff +bzp +kEZ +kEZ vva vva vva @@ -28084,12 +30217,12 @@ vva vva vva vva -dff -dff -nff -ciN -dff -kSx +kEZ +kEZ +hXc +xNe +kEZ +kpN qmG jhf jhf @@ -28111,21 +30244,35 @@ mOb mOb jhf cos -pVf -pVf -pVf +jhf +jhf +jhf aNF liP -kCX +efb pct agK mVx -dff +ttJ bYV -dff +ttJ +jWM +vny +iQe +vny +xdq +vny +vny +jWM +vny +vny +vny +vny +vny +vny +vny jWM vny -oIF vny vny vny @@ -28138,37 +30285,23 @@ vny vny vny vny -jWM -dff -dff -mhM -urZ -urZ -xDD -bYV -gnJ -urZ -urZ -cVW -dff -dff rre gMD lti oeC -hcS +iMk iPw -hcS +iMk mKh avV fDS iPG -hcS +iMk bIM vwS bIM mUN -mUN +xwy xMD xSy dvX @@ -28176,37 +30309,37 @@ pAQ dvX xSy rre -dff -bYV -dff -gLg -wUe -ttW -gSP -pfh -hox -kCv -kCv -qKh -xXQ -jHl -jHl -jHl -jHl -jHl -xXQ -akT -kCv -kCv -npx -otG +ttJ +ttJ +ttJ aje -dTX -rGu -fJB -wPd -dff -dff +iUg +anH +anH +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +vIZ +saJ +vHr +fxt +fxt +ubc +anH +aje +bRB +mlY +vFY +rLw +kEZ +kEZ vva vva vva @@ -28280,10 +30413,10 @@ vva vva vva sVT -nff -ciN -unQ -dff +hXc +xNe +xJj +kEZ qmG jhf jhf @@ -28305,47 +30438,47 @@ mOb mOb jhf cos -nQj -osk -osk +xEg +fmo +fmo mVx mVx -aaO -aNF +dsi +vie mVx mVx -dff +ttJ bYV -dff +ttJ jWM xdq -uAG +kgL xdq jWM jWM jWM jWM +xdq +vny +vny +vny +vny +vny +vny jWM -jWM -jWM -jWM -jWM -jWM -jWM -jWM -sVT -dff -gnJ -urZ -urZ -cVW -bYV -mhM -urZ -urZ -xDD -dff -sVT +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny rre rre rre @@ -28358,9 +30491,9 @@ rre rre rre rre -hVs -mNf -hVs +dLd +njL +dLd rre rre rre @@ -28370,35 +30503,35 @@ rre rre rre rre -dff -bYV -dff -gLg -uwH -uwH -uwH -uwH -uwH -pMq -kCv -qKh -evz -pWL -qoc -pHd -dRH -cZF -evz -akT -kCv -qWZ +ttJ +ttJ +ttJ aje -bQc +hHL +hHL +jiP +ifo +ifo +jiP +epn +jiP +jiP +kdV +anH +ifo +ifo +saJ +saJ +vfG +jNS +jNS +fyg +ycj aje -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ sVT vva vva @@ -28476,7 +30609,7 @@ vva vva vva sVT -cUp +bzp sVT qmG jhf @@ -28499,97 +30632,97 @@ mOb mOb jhf cos -vNt -pVf -pVf -vNt -pVf -lhX -asI -asI -cmq -dff +eHp +jhf +jhf +eHp +jhf +uaU +cKv +hyQ +bXy +ttJ bYV -dff +ttJ cKv cNP -xYD +ioT qvM -cKv -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -fUX -dff -mhM -jmb -jmb -xDD -bYV -gnJ -jmb -jmb -cVW -dff -uFc -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff +aLq +qvM +qvM +qvM +aLq +qvM +qvM +qvM +qvM +qvM +qvM +jpo +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +vny +vny +vny +vny +vny +vny +xvL +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ rre sUa wCg bIM rre -dff -dff -dff -dff -dff -dff -dff -dff -dff -bYV -dff -gLg -pXA -hpl -pDZ -skX -pgd -fxw -kCv -qKh -iyb -hbl -jHl -xad -xPi -nrT -iyb -akT -kCv -yfv -skX -sQF +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +aje +anH +anH +anH +ifo +ifo +anH +anH +eei +jiP +kdV +anH +ifo +ifo +saJ +saJ +xjJ +qEF +qEF +dCv +anH aje -dff +kEZ sVT sVT vva @@ -28670,8 +30803,8 @@ vva vva vva rPk -cUp -dff +bzp +kEZ qmG jhf jhf @@ -28693,97 +30826,97 @@ mOb mOb jhf cos -vNt -bmG -bmG -vNt -pVf -lhX -asI -asI -cmq -dff +eHp +oeb +oeb +eHp +jhf +uaU +cKv +hyQ +bXy +ttJ bYV -dff +ttJ cKv cNP -nzw +gUP +qvM +aLq +qvM +qvM +qvM +aLq +qvM cNP -cKv -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -fUX -dff -gnJ -jmb -jmb -cVW -bYV -mhM -jmb -jmb -xDD -dff -uFc -bYV -bYV -bYV -bYV -bYV -bYV +cNP +cNP +cNP +cNP +lVD +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +vny +vny +vny +vny +vny +vny +xvL bYV bYV bYV bYV bYV +kEZ +kEZ rre bAl qjd -uBW +uOK rre -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -dff -fLv -iul -hpl -hpl -gJK -dtT -fxw -rva -bua -khS -khS -khS -khS -khS -vkf -dHQ -uie -mtS -kPN -azA -fGz +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +aje +anH +anH +ifo +ifo +ifo +ifo +anH +fXn +hHL +pMU +idH +ifo +ifo +anH +anH +plp +bus +bus +bus +bus aje -dff +kEZ vva vva vva @@ -28864,8 +30997,8 @@ vva vva vva rPk -cdq -dff +qWJ +kEZ qmG jhf jhf @@ -28886,103 +31019,103 @@ mOb mOb mOb jhf -cos -nQj -nQj -nQj -nQj -pVf -lhX -asI -asI -cmq -dff +fdh +xEg +xEg +xEg +xEg +jhf +uaU +cKv +cNP +bXy +ttJ bYV -dff +ttJ cKv qvM -nzw +gUP qvM -cKv -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -fUX -dff -mhM -jmb -jmb -xDD -bYV -gnJ -jmb -jmb -cVW -dff -uFc -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff +aLq +qvM +qvM +qvM +aLq +qvM +cNP +qvM +qvM +qvM +qvM +jpo +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +vny +vny +ycE +vny +vny +xvL +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ rre bRt rwP -bIM +uBW rre -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -gLg -qGh -xje -jmG -mjH -drR -tju -kCv -jHl -eDJ -roX -roX -roX -roX -jHS -jHl -jHl -ped -iQI -eRr -jUD +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ aje -dff -vva -vva -vva -vva -vva +ifo +aFm +nQw +hCW +pKu +jrR +nwe +nLY +hHL +unA +fyg +ifo +ifo +anH +anH +ezx +dFl +vmg +vmg +dFl +aje +kEZ +wjX +wjX +wjX +wjX +wjX vva dAV dAV @@ -29059,9 +31192,9 @@ vva vva vva rah -dff +kEZ qmG -jhf +bzx jhf mOb mOb @@ -29081,50 +31214,50 @@ mOb mOb jhf cos -iJv -pVf -pVf -pVf -pVf -lhX -asI -asI -dFJ -cKv -cKv -cKv -cKv -hyW -raD -hyW -cKv -cKv +jhf +jhf +jhf +jhf +jhf +uaU cKv +cNP cKv cKv cKv cKv cKv +hyW +arh +hyW +aLq +aLq +qFz +aLq +aLq +aLq +okr +aLq iTP iTP iTP iTP -sVT -dff -gnJ -urZ -urZ -cVW -bYV -mhM -urZ -urZ -xDD -dff -sVT -rre -rre -rre +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre rre rre @@ -29149,34 +31282,34 @@ oCb oCb oCb oCb -gLg -aje aje +rmv aje aje aje aje -rmv aje aje -mxF -jHl -jHl -jHl -xFI -jHl -jHl -evl -opM aje aje +ifo +ifo +ifo +ifo +ifo +ifo +tkb +cgY +mGc +aTI +bHI aje rah -vva -vva -vva -vva -vva +wjX +wjX +wjX +wjX +wjX vva dAV dAV @@ -29253,7 +31386,7 @@ vva vva vva rah -dff +kEZ jeM jhf mOb @@ -29274,22 +31407,22 @@ mOb mOb mOb jhf -eVa -tzl -tzl -tzl -qFr -tzl -mFY -mKB -mKB -gMZ -ksH -erV +bFt +tSD +tSD +tSD +dxC +tSD +ptp +eDc +dsL +dsL +gok +toF qvM hyW bOc -huS +aDc hxF aLq qvM @@ -29297,35 +31430,35 @@ qvM qvM qvM rCO -qvM +cNP qvM iTP lKy lKy iTP -dff -dff -mhM -urZ -urZ -xDD -bYV -gnJ -urZ -urZ -cVW -dff -dff +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre bIM bIM +hCv bIM bIM -bIM -bIM -bIM -bIM -fkB +fVq bIM dYU bIM @@ -29340,37 +31473,37 @@ jFV rre nDe nDe -dWB -nDe +eey nDe +edw dPN +kPy +kPy eey nDe -nDe -nDe xAK nDe -eSK nDe +fQi aje -mxF -xjO -jHl -jHl -xFI -jHl -jHl -eRK -gWu -rBp -ppe +ifo +ifo +ifo +ifo +aAx +kSD +aje +olE +cUG +eYX +olE aje rah -vva -vva -vva -vva -vva +wjX +wjX +wjX +wjX +wjX vva dAV dAV @@ -29447,7 +31580,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -29468,22 +31601,22 @@ mOb mOb mOb jhf -cos -gDb -xzI -xzI -mbE -gDb -gDb -asI -nQj -dFJ +eIx +mOb +mOb +mOb +mOb +mOb +mOb +cKv +qvM qvM -lRl -sWu -jXa -gqu -frY +qvM +dpX +dsL +dVK +kNp +jzM mkp ksH ksH @@ -29497,28 +31630,28 @@ wha xpm xpm iTP -dff -dff -gnJ -urZ -urZ -cVW -bYV -mhM -urZ -urZ -xDD -dff -dff +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre bIM iHr kcQ kcQ kcQ -nTh -kcQ -kcQ kcQ kcQ sYE @@ -29534,37 +31667,37 @@ rre rre nDe nDe -dWB +eey ths -nDe +kPy dlL -fNv -ykj -ykj +iGe +iGe +nlK ykj xjj -eSK -eSK -eSK +nDe +nDe +nDe +aje +anH +anH +anH +anH +aAx +ifo +aje +aje +pgD +pmL aje -knt -mJM -eXz -jXG -awI -roI -wSl -wSK -kCv -hgH -ual aje rah -vva -vva -vva -vva -vva +wjX +wjX +wjX +wjX +wjX vva dAV dAV @@ -29641,7 +31774,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -29662,22 +31795,22 @@ mOb mOb mOb jhf -cos -gDb -btT -jXZ -sBc -jXZ -sho -asI -asI -dFJ +eIx +mOb +mOb +mOb +mOb +mOb +mOb +cKv +tfK +tfK lfp rsH bDW qvM dOe -cNP +hzS iDn hyW qvM @@ -29691,26 +31824,26 @@ iTP lKy xpm iTP -dff -dff -mhM -urZ -urZ -xDD -bYV -gnJ -urZ -urZ -cVW -dff -dff +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre bIM eFY jzH -jzH -jzH -qMu dsR dsR dsR @@ -29719,7 +31852,7 @@ tVn hlI ufg bIM -hcS +iMk foM wkm bON @@ -29728,30 +31861,30 @@ rre nDe nDe nDe -dWB +eey msQ -ykj +iGe rgf +kPy +kPy eey -eSK -nDe -qYE +iDQ pwi +fQi nDe nDe -eSK aje aje aje aje aje -bRL +qER evz aje -kCv -kCv -hgH -exK +jUl +gjG +aZd +aZd aje rah vva @@ -29835,7 +31968,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -29856,22 +31989,22 @@ mOb mOb mOb jhf -cos -xzI -wTa -wTa -qPx -jXZ -gDb -asI -asI -dFJ +eIx +mOb +mOb +mOb +mOb +mOb +mOb +cKv +hyQ +hyQ rjm fpS bDW qvM qvM -cNP +kLr cNP aLq eLh @@ -29885,28 +32018,28 @@ iTP oyE lau iTP -dff -dff -gnJ -qUw -qUw -cVW -xPL -mhM -qUw -qUw -xDD -dff -dff +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre bIM cBC baA baA baA -mAF -baA -baA baA baA wJg @@ -29922,32 +32055,32 @@ rre nDe nDe nDe -dWB +eey vPw -nDe -mcu -dbO +kPy +jzz +jzz cXj jzz aDu aDu aDu aDu -eSK +nDe nDe nDe hZU -dKw +qMb iqq -xMz +koN uRt aje -kCv -kCv -fcv -fOQ -ijo -suZ +aZd +aZd +aZd +aZd +aje +kEZ vva vva vva @@ -30029,7 +32162,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30050,20 +32183,20 @@ mOb mOb mOb jhf -cos -xzI -jwm -smy -uwN -nMi -gDb -asI -asI -dFJ +eIx +mOb +mOb +mOb +mOb +mOb +mOb +cKv +rjm +rjm rjm oCJ bDW -aLq +qvM gNU gNU gNU @@ -30081,24 +32214,24 @@ bbl jzg jzg jzg -cBh -tvG -dfU -mTG -wia -mTG -tvG -dfU -cBh -mTG -sVT +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre gaB bIM bIM -bIM -bIM -bIM muL bIM bIM @@ -30107,7 +32240,7 @@ mNo mNo ydS bIM -hcS +iMk cAH xqw naB @@ -30116,9 +32249,9 @@ rre nDe nDe nDe -dWB +pqm vPw -nDe +kPy jzz qup qpM @@ -30127,19 +32260,19 @@ niE nsN cix aDu -eSK -eSK -eSK -eSK -eSK +nDe +fQi +nDe +nDe +nDe dDD wFj rmn aje -wPh -wPh -jkS -jkS +aZd +aZd +aZd +aZd aje rah vva @@ -30223,7 +32356,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30241,19 +32374,19 @@ mOb mOb mOb mOb +jhf +jhf +jhf +eIx mOb mOb -jhf -cos -gDb -gxi -kWj -mKL -dKj -gDb -asI -asI -dFJ +mOb +mOb +mOb +mOb +cKv +hyQ +hyQ rjm fpS bDW @@ -30263,7 +32396,7 @@ tcK sIT iUQ lzd -ass +sIT dTg sIT gTx @@ -30275,18 +32408,21 @@ fRt wbJ oXn jzg -rvn -oaT -oaT -kQy -tNA -fud -iuw -iuw -ioF -mTG -vWE -rre +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy tVU hsO lsy @@ -30294,9 +32430,6 @@ lsy lsy lsy lsy -lsy -lsy -lsy fDD siI suv @@ -30310,9 +32443,9 @@ rre nDe nDe nDe -dWB +eey vPw -nDe +kPy jzz sXp qpM @@ -30325,7 +32458,7 @@ nDe nDe qYE nDe -nDe +fQi iqq wFj rmn @@ -30417,7 +32550,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30435,32 +32568,32 @@ mOb mOb mOb mOb +jhf +rpb +siV +vHS +mOb mOb mOb -jhf -cos -gDb -gsM -uRJ -qto -gSo -gDb -asI -asI -dFJ +mOb +mOb +mOb +cKv +hyQ +hyQ rjm fpS bDW qvM gNU -jGU +dwL sIT -fJt +sME bFs sIT sJr sIT -cRw +tMt jzg pOC ftF @@ -30469,27 +32602,27 @@ dnk exk jPL jzg -ybO -ybO -gLk -hAT -tNA -xdz -sgQ -ybO -ybO -mTG -vWE -sVT +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ kep lsy xWX cHQ rIo -xWX -cHQ -rIo lsy kej tvM @@ -30519,7 +32652,7 @@ jzz jzz jzz jzz -nDe +fQi iqq pAZ rmn @@ -30611,7 +32744,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30629,19 +32762,19 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos -dFJ -dFJ -dFJ -dFJ -dFJ -dFJ -dFJ -dFJ -dFJ +lWP +cKv +cKv +cKv +cKv +cKv +cKv +cKv +cKv +cKv +mRT +mRT ktu dtO bDW @@ -30649,10 +32782,10 @@ qvM gNU irh iNA -fJt -fJt +oma +pxp sIT -qhv +wPD sIT sKP jzg @@ -30663,27 +32796,27 @@ sij exk fot jzg -uEO -uEO -gLk -hAT -tNA -xdz -sgQ -uEO -uEO -mTG -vWE -sVT +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ mjZ lsy xWX cHQ rIo -xWX -cHQ -rIo lsy llP upr @@ -30700,7 +32833,7 @@ teW teS eey vPw -nDe +kPy jzz iOW xKX @@ -30805,7 +32938,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30823,12 +32956,12 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx cKv -cNP +qvM +qvM +aLq cNP cNP cNP @@ -30857,27 +32990,27 @@ omL bHu iRT jzg -mTG -mTG -iVS -hAT -tNA -xdz -iVS -mTG -mTG -mTG -vWE -sVT +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ mjZ lsy gKR cHQ gwQ -gKR -cHQ -gwQ lsy hGG xtV @@ -30885,7 +33018,7 @@ rPn aZc uHP dyu -cHQ +xjH cHQ lsy dKw @@ -30999,7 +33132,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31017,14 +33150,14 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx cKv +aLq +aLq +aLq cNP qvM -qvM bkR qvM qvM @@ -31037,10 +33170,10 @@ cNP gNU cUm sIT -fJt -nrM +tnu +dAZ sIT -clW +dZg iEg rpv qtn @@ -31051,21 +33184,21 @@ cQB exk cyt jzg -lgI -oaT -oaT -dyP -pND -vav -ugh -ugh -ouC -mTG -vWE -sVT -mjZ -mjZ -mjZ +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ mjZ mjZ @@ -31073,7 +33206,7 @@ mjZ mjZ mjZ vuQ -fYC +uBx uYO dTn aZc @@ -31088,7 +33221,7 @@ tja lUr eey vPw -nDe +kPy jzz kPW iEJ @@ -31102,7 +33235,7 @@ kuI kuI kuI dms -vWD +oGM opJ rmn foL @@ -31193,7 +33326,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31211,13 +33344,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx cKv -egQ aLq +cLa +aLq +egQ aLq cKv cKv @@ -31236,7 +33369,7 @@ edl sIT poP sIT -hgb +tbD jzg obA xdN @@ -31245,27 +33378,27 @@ ucc exk cyt jzg -jMp -hLM -ybO -ybO -ybO -ybO -ybO -otp -rSy -mTG -vWE -sVT +qXX +qXX +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ mjZ ust xez xez xez -xez -xez -xez kGK uHY uHY @@ -31282,7 +33415,7 @@ eey eey eey wsT -nDe +kPy jzz nik tEr @@ -31387,7 +33520,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31405,13 +33538,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP -bHk jeo +kJa +jeo +bHk jeo psP jMZ @@ -31430,7 +33563,7 @@ nCu sIT rrN sIT -fJt +pTX jzg vJE wFO @@ -31449,22 +33582,22 @@ xEJ xEJ xEJ xEJ -vWE -sVT -mjZ -mjZ -mjZ -mjZ -mjZ +pRa +mTG +vny +vny +lsy mjZ +vUw mjZ mjZ +vUw dOm mBU ust ust ust -kej +lBi lsy nDe nDe @@ -31581,7 +33714,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31599,13 +33732,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP +jeo bHk jeo +bHk jeo psP jMZ @@ -31645,8 +33778,8 @@ nLn xEJ xEJ xEJ -lsy -lsy +vny +vny lsy lsy lsy @@ -31670,7 +33803,7 @@ ilQ nDe eey vPw -nDe +kPy iqq iqq dvl @@ -31775,7 +33908,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31793,13 +33926,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP -bHk jeo +bHk +bHk +bHk jeo psP sVT @@ -31819,9 +33952,9 @@ fxX fxX fxX dfd -cZD -iMU -oVx +jNh +tZj +hhu xEJ kZq cSu @@ -31829,11 +33962,11 @@ mAg mAg mAg mAg -vZR +vsx mAg -vZR +eMG mAg -vZR +vsx mAg fmq pTQ @@ -31842,13 +33975,13 @@ xEJ oCE oCE nSZ -tpN +fcL tpN fCk dyA dyA -oCE -lzR +mvi +uoA lsy tux tux @@ -31864,7 +33997,7 @@ nDe ilQ eey vPw -nDe +kPy iqq qlk jYZ @@ -31888,7 +34021,7 @@ rFy nUv dnu hBQ -suZ +cmv vva vva vva @@ -31969,7 +34102,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31987,13 +34120,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP -bHk jeo +jeo +tOU +cja bwU psP bYV @@ -32013,7 +34146,7 @@ cYJ lhH fxX dfd -hZy +jgk xEJ xEJ xEJ @@ -32034,15 +34167,15 @@ lSC eKh xEJ oCE -oCE -wSX -pDI +hRB +uVh +mJn pDI uFT dyA dyA -oCE -gHG +ewo +oIB lsy dax dax @@ -32058,7 +34191,7 @@ nDe ilQ eey vPw -nDe +kPy iqq dpj hZT @@ -32163,7 +34296,7 @@ vva vva vva rah -dff +kEZ jeM jhf mOb @@ -32181,12 +34314,12 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +lWP psP -bHk +jeo +jeo +ffL jeo jeo psP @@ -32207,7 +34340,7 @@ fxX cYJ fxX dfd -cZD +jNh xEJ cgd ian @@ -32223,20 +34356,20 @@ mdd snm hWz xTg -fIj -nLn -nLn -jHI -hEY -hEY -dRj +guB +wqc +wqc +nHg +ijR +rpP +bOE dyA dyA dyA dyA dyA -oCE -pdv +ewo +cLQ lsy lsy lsy @@ -32357,12 +34490,10 @@ vva vva vva rah -dff +kEZ qmG +bzx jhf -jhf -mOb -mOb mOb mOb mOb @@ -32378,9 +34509,11 @@ mOb mOb mOb jhf -cos +eIx psP -bHk +jeo +jeo +ffL jeo jeo psP @@ -32401,7 +34534,7 @@ fxX bHo fxX dfd -hZy +jgk xEJ xEJ xEJ @@ -32424,28 +34557,28 @@ xEJ oCE oCE nSZ -oJF +mvB oJF waf dyA +dyA +ewo hEY -hEY -hEY -ujK -eSK +woO +kPy nRV tsd tsd tsd xVc oiL -kMD +bbH iCp wVX -kMD -ipp -kMD -jjB +bbH +pmA +bbH +wfs oNC iqq uMP @@ -32550,8 +34683,8 @@ vva vva vva rPk -qqh -dff +dND +kEZ qmG jhf jhf @@ -32569,12 +34702,12 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP -bHk +jeo +jeo +ffL jeo jeo psP @@ -32595,15 +34728,15 @@ gwi xDS fxX dfd -iMU -vWE -vWE -vWE -lyN -eym -tbw -bmJ -bQV +tZj +rdd +rdd +rdd +kzZ +iWW +odZ +mfY +suW sdT jiS wSL @@ -32618,29 +34751,29 @@ nSZ wyl lzR nSZ -tpN +fcL tpN fCk dyA +dyA +ewo hEY -hEY -hEY -ujK -eSK +nDe +kPy tDD -eSK -eSK -eSK +kPy +kPy +kPy oUk -eSK -eSK +kPy +kPy nsT pBj +kPy eSK -eSK -eSK -eSK -xkK +kPy +kPy +buJ iqq iqq oCe @@ -32654,7 +34787,7 @@ lGh poz aFG jZC -fRy +bZB jVy oWY jZC @@ -32744,7 +34877,7 @@ vva vva vva mMp -ciN +xNe sVT qmG jhf @@ -32756,23 +34889,23 @@ mOb mOb mOb mOb -jhf -jhf -jhf -jhf -jhf -jhf -jhf -jhf -jhf -jhf -cos -nDj -bHk -bHk -jeo +aTe +aTe +aTe +aTe +aTe +aTe +aTe +aTe +qWW +bEM +whN +whN +pbY +iKW +hXV psP -dff +kEZ dfd qtu ujP @@ -32789,15 +34922,15 @@ bHo bHo aeP dfd -tQt -vWE -vWE -vWE -lMC -btL -nlf -vzL -bQV +fjW +rdd +rdd +rdd +wRf +qWa +fvT +dfp +suW uCC uCC wSL @@ -32812,27 +34945,27 @@ nSZ nSZ nSZ nSZ -tpN +fcL tpN fCk diF -hEY -hEY -oCE +dyA +lSY +coQ eey -nDe -pwi +gmN +qTA nDe nDe qtG -jjB -eSK -qYE +wfs +kPy +qGJ ple xae -nDe +gmN eey -dKw +uOi cjM sow qWY @@ -32938,8 +35071,8 @@ vva vva sVT mMp -ciN -ciN +xNe +xNe qmG jhf jhf @@ -32950,6 +35083,7 @@ mOb mOb mOb mOb +aTe jhf jhf jhf @@ -32957,16 +35091,15 @@ jhf jhf jhf jhf -jhf -jhf -jhf -cos +eIx psP +mrb jeo -bHk +jeo +wBl jeo psP -dff +kEZ dfd jXx wBm @@ -32983,15 +35116,15 @@ bHo wBm wBQ dfd -ukS -vWE -vWE -vWE -lyN -xVM -tbw -yer -bQV +vhR +rdd +rdd +rdd +kzZ +pJY +odZ +tib +suW uCC uCC wSL @@ -33010,21 +35143,21 @@ wSX wSX nSZ nSZ -dRj -dRj -eey +bRW +ryr eey eey eey eey eey eey -eSK -eSK eey +kPy +kPy eey eey eey +tUS eey eey eey @@ -33131,9 +35264,9 @@ vva vva sVT sVT -dff -vXR -ciN +kEZ +xVq +xNe qmG jhf jhf @@ -33144,23 +35277,23 @@ mOb mOb mOb mOb -jhf +aTe jhf izE yix yix yix -sVT -lIb -ghj -ghj -pdl +eCt +wuy +cLs psP psP -bHk +psP +psP +wBl jeo psP -dff +kEZ dfd qtu xDS @@ -33184,8 +35317,8 @@ hZt hZt hZt nyX -cao -bQV +qqu +suW xEJ xEJ wSL @@ -33201,11 +35334,11 @@ gYO wSL oCE oCE -hEY -hEY -hEY -hEY -hEY +oCE +oCE +oCE +oCE +oCE eey nDe nDe @@ -33324,10 +35457,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -33338,20 +35471,20 @@ mOb mOb mOb mOb +aTe jhf -jhf -iUo +mke jhf taY hcc -sVT -tGv -myG -myG -hel -myG +eCt +nzR +oeP +oeP +pIA +nzR psP -bHk +wBl jeo psP bYV @@ -33395,11 +35528,11 @@ avv wSL oCE oCE -hEY -hEY -hEY -hEY -hEY +oCE +oCE +oCE +oCE +oCE eey nDe nDe @@ -33431,7 +35564,7 @@ dzu rJE jEd piJ -gvc +gcT qaC quj flC @@ -33518,10 +35651,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -33532,20 +35665,20 @@ mOb mOb mOb mOb +aTe jhf -jhf -iUo +qif jhf wGL olX -sVT -ygv -eQQ -eQQ -bsb -myG +eCt +pGb +hhj +hhj +fqF +nar psP -bHk +wBl jeo psP bYV @@ -33591,9 +35724,9 @@ oCE uqF vnz mSO -qyq -qyq -qyq +eey +eey +eey eey dWB dWB @@ -33624,8 +35757,8 @@ wQr xDZ gnr swR -wuv -jZC +oWY +liB qUa oWY gkv @@ -33712,10 +35845,10 @@ vva vva vva sVT -dff -dff -lYS -ciN +kEZ +kEZ +gGy +xNe qmG jhf jhf @@ -33726,20 +35859,20 @@ mOb mOb mOb mOb +aTe jhf -jhf -izE -lIb -lIb -lIb -sVT -myG -eQQ -eQQ -bsb -myG +hMB +vjD +vjD +vjD +eCt +oeP +hhj +hhj +wEr +hGu psP -bHk +wBl jeo psP bYV @@ -33783,17 +35916,17 @@ avv wSL oCE oCE -hEY -bHh -qyq -oCE oCE +bHh eey nDe -dWB +rIm +rIm nDe nDe nDe +mRV +trW dWB nDe nDe @@ -33818,7 +35951,7 @@ boD kcN kjn swR -wuv +oWY jZC pou lrZ @@ -33832,7 +35965,7 @@ kGg fur fur rwY -nAl +uOa vva dAV dAV @@ -33906,12 +36039,12 @@ vva vva vva sVT -dff -dff -lYS -ciN +kEZ +kEZ +gGy +xNe qmG -jhf +bzx jhf mOb mOb @@ -33920,21 +36053,21 @@ mOb mOb mOb mOb +aTe jhf -jhf -yix -hwb -qcI -eQQ -myG -myG -azN -odS -oHc -myG +vjD +kck +uTd +hhj +oeP +oeP +gXZ +itK +eXQ +oeP xFR -bHk -bwU +bAt +bNk psP bYV dfd @@ -33977,17 +36110,17 @@ fhE wSL lFL oCE -hEY -bHh -qyq -oCE oCE +bHh eey -dWB +nDe +ecG +ecG +nDe eey -dWB -dWB -dWB +nDe +nDe +mRV dWB nDe nDe @@ -34012,7 +36145,7 @@ lMy uNZ jJZ swR -qUu +ceE dhv tTD dhv @@ -34026,7 +36159,7 @@ kGg cUK fur rwY -nAl +uOa vva dAV dAV @@ -34100,10 +36233,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -34114,18 +36247,18 @@ mOb mOb mOb mOb +aTe jhf -jhf -yix -xar -kBQ -eQQ -myG -myG -xtN -aVx -oSU -myG +vjD +jVl +eju +hhj +oeP +oeP +oJd +ooW +rlB +oeP psP bHk jeo @@ -34171,17 +36304,17 @@ avv wSL oCE oCE -hEY -bHh -qyq -oCE oCE +bHh eey nDe -dWB nDe nDe nDe +hBS +mRV +mRV +kBd dWB nDe nDe @@ -34193,13 +36326,13 @@ nDe nDe nDe eey -rXJ +ijZ owc qaD rXJ -rXJ -rXJ -vbd +ulw +ulw +ulw rXJ eHc eHc @@ -34220,7 +36353,7 @@ kGg fur fur rwY -nAl +uOa vva dAV dAV @@ -34294,10 +36427,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -34308,18 +36441,18 @@ mOb mOb mOb mOb +aTe jhf -jhf -yix -qZR -gfE -eQQ -myG -myG -rkJ -jEQ -wXb -jEQ +vjD +fHc +pfo +hhj +oeP +oeP +xbX +rvL +fqJ +rvL psP bHk jeo @@ -34367,8 +36500,8 @@ oCE dMb lrD wUf -qyq -oCE +eey +nDe fMH fMH fMH @@ -34387,7 +36520,7 @@ eey eey eey eey -tNw +itS cAZ vhZ tNW @@ -34395,18 +36528,18 @@ tNW xmI tNW goY -vXr +ntW kdI -vXr -vXr -vXr +ntW +ntW +ntW lAD -vXr +ntW dtY lyV foL -lOK -duF +cLz +iGW poT cwE cBe @@ -34488,10 +36621,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -34502,18 +36635,18 @@ mOb mOb mOb mOb +aTe jhf -jhf -qmG -lIb -lIb -lIb -sVT -myG -hmr -hmr -hmr -hmr +eCt +vjD +vjD +vjD +eCt +oeP +wOb +wOb +wOb +wOb psP bHk jeo @@ -34527,8 +36660,8 @@ bYV bYV bYV bYV -dff -dff +kEZ +kEZ bYV jWc jWc @@ -34541,10 +36674,10 @@ stI vlH eAh hZt -oCE -oCE -dlc -fSs +aAu +aAu +nSZ +lCF oCE wSL xvc @@ -34559,12 +36692,12 @@ avv wSL oCE oCE -hEY +oCE rkx fMH fMH fMH -awX +mUH qAl fMH kyh @@ -34573,34 +36706,34 @@ pVn pVn pVn fMH -rbv +edY bBQ scp qaD wKe -rXJ -rXJ -rXJ +bFU +xRo +itS eNE -qrf -qaD -tNw -rXJ +pwT +itS +itS +ouI pFL -qNi +aXg dDp -rXJ +itS uNX -rXJ -rXJ -rXJ -pld -rXJ -rXJ -jSQ +itS +itS +itS +aOu +itS +itS +iMZ foL -kce -pgY +qZf +bDa dDv tCv shd @@ -34683,9 +36816,9 @@ vva vva sVT sVT -dff -nff -ciN +kEZ +hXc +xNe qmG jhf jhf @@ -34702,12 +36835,12 @@ mOb mOb mOb mOb -lIb -myG -myG -myG -myG -myG +vjD +oeP +oeP +oeP +xnv +nar psP jDJ nLs @@ -34736,8 +36869,8 @@ fuh afn hZt iAl -oCE -dlc +aAu +nSZ aXJ slE wSL @@ -34753,12 +36886,12 @@ idO wSL oCE oCE -hEY +oCE rkx fMH dTd luo -rFz +huF dpu fMH daR @@ -34767,16 +36900,16 @@ ygf ygf kIE fMH -rbv +edY bBQ scp qaD jSQ -twq -sEO -sEO -hQF -dtY +xvY +stT +stT +bSR +wTr pLU pLU pLU @@ -34878,8 +37011,8 @@ vva vva sVT sVT -nff -ciN +hXc +xNe qmG jhf jhf @@ -34896,12 +37029,12 @@ jhf jhf jhf mOb -lIb -myG -myG -myG -myG -myG +vjD +oeP +oeP +oeP +oeP +oeP psP bHk jeo @@ -34929,9 +37062,9 @@ stI ldh mUP hZt +aAu oCE -oCE -dlc +nSZ lqJ rJg wSL @@ -34947,29 +37080,29 @@ wSL wSL nSZ nSZ -vcc +iAp rkx fMH dTd luo -rFz -xFo -sKl -lkj -qvU -kow -kow -cTM -sKl -fyY -kGz -kzs -lsO -sEO -aBp -rXJ -qNi -pld +huF +fFz +qUc +jUu +jHY +mXk +mXk +bKz +qUc +xWL +gpT +itV +dAz +rPP +lup +itS +itS +aOu vbd pLU fPd @@ -34980,7 +37113,7 @@ eqh hBM hBM ohX -gks +qHb kJc qOJ bdZ @@ -35073,29 +37206,29 @@ vva vva sVT mMp -ciN +xNe qmG jhf jhf jhf -jhf +mXc jhf jhf jhf jhf ojZ nku -jhf +mXc jhf jhf jhf mOb -sVT -hmr -hmr -hmr -hmr -tGv +eCt +ebF +kQR +epJ +wOb +nzR psP bHk bHk @@ -35125,23 +37258,23 @@ nlA hZt oCE oCE -dlc +nSZ aED -hEY -hEY -dRj -hEY -hEY -hEY -hEY -hEY -hEY -hEY -hEY -hEY -hEY -dRj -hEY +oCE +oCE +wlW +oCE +oCE +oCE +oCE +oCE +oCE +oCE +oCE +oCE +oCE +wlW +oCE rkx fMH fMH @@ -35159,12 +37292,12 @@ wQg rbv umQ qaD -qaD -qaD -qaD -qaD -qVh -qaD +mBE +uec +nVO +nVO +myB +uuJ pLU pGT bIV @@ -35267,20 +37400,20 @@ vva vva vva mMp -ciN -qmG -qmG -qmG +xNe qmG qmG qmG -hIN qmG qmG qmG -tid -qmG -qmG +iFS +psP +xFR +dIS +ndB +dIS +dIS jhf jhf mOb @@ -35319,26 +37452,26 @@ fBl hZt oCE oCE -dlc +iri mSr -kVk -kVk -siE -kVk -kVk -kVk +aHN +aHN +aHN +aHN +aHN +aHN pfX lrD lrD lrD sFU -hEY -hEY -dRj -hEY -fSs oCE oCE +oCE +oCE +lCF +oCE +kkh fMH otE bkr @@ -35347,17 +37480,17 @@ wsM gev gev gev -aVO +dvH amh +mBE rbv -rbv -rbv +bFU rri -rXJ -rXJ -bBQ -scp -vbd +mBE +iVA +vVB +puL +oCx qsC pLU wFE @@ -35376,11 +37509,11 @@ juz nbl pLU pLU -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -35461,23 +37594,23 @@ vva vva vva rPk -ciN -ciN -ciN -ciN -kMG -vWE -vWE -vWE -sVT -vWE -sVT -cHo -vWE -wjE -vwU -vwU -lIb +xNe +xNe +xNe +xNe +lMz +kSY +kSY +kSY +psP +jeo +dIS +tgt +ksU +vpU +gdg +faG +iPf tXu xgq jeo @@ -35511,30 +37644,30 @@ hZt hZt hZt hZt -dlc -dlc -dlc -fSs -oCE -oCE nSZ +nSZ +nSZ +lCF oCE oCE -hEY -hGW +nSZ oCE oCE oCE +hGW +dyA +dyA +dyA lhN oCE oCE -dlc -dlc +nSZ +oCE mSr -kVk -kVk -siE -rTd +aHN +aHN +fXv +hAU gQv fMH bOG @@ -35543,15 +37676,15 @@ bOG bOG lrm fMH -hIk -rbv +tNw rbv -iGJ -vbd -vbd +bFU +qVh +mBE +iVA hyi iPH -vbd +oCx qaD pLU wFE @@ -35570,10 +37703,10 @@ juz nbl laT pLU -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -35656,22 +37789,22 @@ vva vva vva rJV -dWI -dWI -dWI -sVT -vWE -vWE -vWE -sVT -vWE -sVT -gZb -vWE -wjE -pVf -pVf -wFh +etj +etj +etj +qmG +kSY +kSY +kSY +psP +jeo +dIS +wtS +ksU +vpU +gdg +gdg +jJE tXu piv bHk @@ -35686,7 +37819,7 @@ weH weH vVb hTM -lST +emV emV emV emV @@ -35714,22 +37847,22 @@ ame ame ame ame -vcc +oCE dyA -kJu -oJF -hHP dyA +dyA +dyA +dyA +oCE oCE +nSZ oCE -dlc -dlc rkx oCE pdv -dlc -dlc -dlc +fMH +fMH +fMH fMH ksn ksn @@ -35737,15 +37870,15 @@ ksn ksn ksn fMH +mBE rbv -rbv -rbv +bFU qaD -rXJ -vbd +mBE +bFU wzc wzc -vbd +mBE biY pLU uCq @@ -35763,10 +37896,10 @@ huR juz xNF erR -mej -nAl -dff -dff +sXi +uOa +kEZ +kEZ vva vva vva @@ -35852,20 +37985,20 @@ vva vva vva vva -dff -sVT -sVT -sVT -sVT -sVT -sVT -sVT -sVT -wjE -wjE -pVf -pVf -wFh +kEZ +qmG +qmG +qmG +qmG +psP +vNh +dIS +dIS +ycb +vpU +gdg +gdg +jJE tXu jeo bHk @@ -35901,23 +38034,23 @@ iMc nSZ uqF fXp -kVk +aHN cAq ame wNL wNL wNL ame -jwV +lFL +dyA +dyA +dyA dyA -tzk -tpN -fCk dyA -oCE oCE oCE nSZ +oCE rkx oCE oCE @@ -35931,15 +38064,15 @@ fMH fMH fMH fMH -qaD -qaD -qaD +mBE +rbv +bFU qaD tNw -vbd +bFU wzc wzc -vbd +mBE dky kQk kQk @@ -36046,20 +38179,20 @@ vva vva vva vva -dff -dff -dff -dff -sVT -qTn -vWE -mNy -bVj -bmN -bVj -bVj -pVf -wFh +kEZ +kEZ +kEZ +kEZ +psP +cSL +jeo +nsj +eMv +usm +kVJ +kVJ +gdg +jJE vqr bHk bHk @@ -36074,7 +38207,7 @@ nLs meN aIc hTM -gqr +urq emV gsh mJG @@ -36082,7 +38215,7 @@ mJG mJG dmd emV -iFG +mIZ hTM oCE aVF @@ -36102,39 +38235,39 @@ xdf xdf xdf ame -hEY +iAp +dyA +dyA +dyA dyA -hXp -pDI -uFT dyA -oCE oCE oCE nSZ +oCE rkx -hEY -hEY -hEY -hEY -hEY +oCE +oCE +oCE +oCE +oCE hUd -vbd -vbd -vbd -vbd -vbd -vbd -vbd -vbd -vbd -iGJ -vbd -vbd +uQs +uQs +uQs +uQs +uQs +uQs +iER +rbv +bFU +qaD +mBE +iVA vVB puL -vbd -vbd +oCx +bFU oGv gYv qlA @@ -36147,11 +38280,11 @@ vuD uTy tYw rCx -qRx -dff -dff -dff -dff +xbw +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -36243,19 +38376,19 @@ vva vva vva vva -dff -sVT -qTn -vWE -pVf -jds -wjE -pVf -bVj -llG -wFh -tXu +kEZ +psP +cSL jeo +bHk +eTK +tXu +nqR +pxa +hvh +jJE +tXu +oxh jeo jeo onb @@ -36283,11 +38416,11 @@ yav eia aHN tbO -kVk +aHN ukp nqt siE -kVk +aHN cAq oCE gHG @@ -36296,16 +38429,16 @@ xdf xdf xdf ame -hEY -oCE -oCE -oCE oCE oCE oCE oCE oCE nSZ +nSZ +nSZ +nSZ +oCE pqb nSZ nSZ @@ -36316,18 +38449,18 @@ tNE tNE tNE tNE -rXJ -qNi -rXJ -rXJ -rXJ -rXJ +mHi +gxJ +gxJ +fKs +gxJ +uyI qaD -rXJ -rXJ +mBE +iVA bBQ scp -vbd +oCx uDr oGv cBP @@ -36341,8 +38474,8 @@ vuD rfI vrF iPT -cmq -dff +cqE +kEZ vva vva vva @@ -36438,16 +38571,16 @@ dAV dAV vva vva -sVT -pVf -pVf -pVf -jds -wjE -pVf -bVj -llG -wFh +psP +bHk +bHk +bHk +eTK +tXu +gdg +pxa +hvh +jJE tXu jeo jeo @@ -36473,16 +38606,16 @@ emV emV hTM oCE -nFh -oCE nSZ nSZ -hEY +nSZ +nSZ +oCE lhN hGW nSZ oCE -hEY +oCE uke ups ame @@ -36490,18 +38623,18 @@ svM svM svM ame -hEY +oCE gHG lzR oCE oCE +nSZ oCE oCE oCE oCE -nSZ rkx -hEY +oCE oCE oCE tNE @@ -36521,8 +38654,8 @@ uZt uZt rvG scp -vbd -rXJ +oCx +bFU oGv oGv oGv @@ -36535,8 +38668,8 @@ vuD fDU rfI wQd -cmq -dff +cqE +kEZ vva vva vva @@ -36632,16 +38765,16 @@ dAV dAV vva vva -sVT -vWE -pVf -vWE -jds -wjE -pVf -bVj -pVf -wFh +psP +jeo +bHk +jeo +eTK +tXu +gdg +pxa +dqt +jJE tXu jeo jeo @@ -36667,11 +38800,11 @@ emV emV hTM oCE -uQa -oCE nSZ +twI +nSZ +mQA oCE -hEY fZV oCE nSZ @@ -36691,9 +38824,9 @@ iAX iAX iAX rJt -nSZ -nSZ -nSZ +oCE +oCE +oCE qnP lrD rJg @@ -36729,8 +38862,8 @@ vuD duk dSR rfI -qRx -dff +xbw +kEZ vva vva vva @@ -36826,16 +38959,16 @@ dAV dAV vva vva -sVT -vWE -pVf -vWE -jds -wjE -pVf -bVj -pVf -wFh +psP +jeo +bHk +jeo +wHI +tXu +gdg +pxa +dqt +jJE tXu jeo jeo @@ -36879,17 +39012,17 @@ jll xdf xdf xdf -oDa +flF xdf xdf wQx iAX fMp fMp -hEY -hEY +oCE +oCE bHh -hEY +oCE oCE oCE tNE @@ -36910,7 +39043,7 @@ uZt rvG scp lMp -rXJ +bFU oGv oGv oGv @@ -36923,8 +39056,8 @@ tkG sSR sSR sSR -qRx -dff +xbw +kEZ vva vva vva @@ -37020,16 +39153,16 @@ dAV dAV vva vva -sVT -ukS -pVf -vWE -cHo -wjE -pVf -bVj -pVf -wFh +psP +xgq +bHk +jeo +pbd +tXu +gdg +pxa +dqt +jJE tXu tXu tXu @@ -37073,18 +39206,18 @@ lnf xdf xdf xdf -oDa +wdM xdf xdf wQx iAX oCE -hEY -hEY oCE -vnI oCE oCE +vnI +oCE +fZV oCE tNE bgw @@ -37097,7 +39230,7 @@ uLf huv uLh wrj -xTH +lwa arU ucD uZt @@ -37117,8 +39250,8 @@ fHR fHR fHR fHR -qRx -dff +xbw +kEZ vva vva vva @@ -37214,21 +39347,21 @@ dAV dAV vva vva -sVT -tQt -pVf -vWE -tHe -wjE -nyc -qqU -jAM -jAM -uBz -wFh -tQR -rMn -pJr +psP +piv +bHk +jeo +bdD +tXu +bXr +iZs +oQP +aQt +xwh +jJE +qcq +htR +mIJ ppk eUq ibb @@ -37273,8 +39406,8 @@ sJu sJu sJu jsB -hEY -hEY +oCE +oCE tSn tSn caT @@ -37311,8 +39444,8 @@ fHR mub fHR fHR -qRx -dff +xbw +kEZ vva vva vva @@ -37408,21 +39541,21 @@ dAV dAV vva vva -sVT -sVT -nUw -sVT -sVT -wjE -wFh -rMK -rMK -rMK -rMK -rMK -rMK -rMK -rMK +psP +psP +hOk +psP +psP +tXu +cXQ +iAT +eXb +iAT +iAT +iAT +iAT +iAT +iAT ppk uyV mCP @@ -37463,11 +39596,11 @@ jsB vZb uPq kfe -nZw +bJU ulm ylv vpb -hEY +oCE cFv tSn ref @@ -37505,8 +39638,8 @@ fHR fHR fHR fHR -qRx -dff +xbw +kEZ vva vva vva @@ -37602,21 +39735,21 @@ dAV dAV vva vva -sVT -pID -pVf -dJS -pAF -pAF -pAF -dJS -wFh -wFh -wFh -wFh -wFh -eCW -rMK +psP +oKo +bHk +ger +xfO +xfO +kvr +ger +jEA +jJE +jJE +jJE +jJE +sEg +xZb ppk uyV oho @@ -37626,7 +39759,7 @@ ibb kMi hSA hTM -gqr +urq emV wwF hJx @@ -37634,7 +39767,7 @@ hJx hJx chI emV -iFG +mIZ hTM pDI caq @@ -37647,21 +39780,21 @@ byq byq sDv nuW -hqD +gqn nuW dCm xdf eoD -xdf +ltr jsB -tip +wFr chE fqx rNP tXn -pHG +fwR jsB -hEY +oCE rSB tSn dbl @@ -37686,7 +39819,7 @@ uZt rvG scp lMp -rXJ +bFU oGv rzD ofE @@ -37699,8 +39832,8 @@ lsd fHR fHR oYW -qRx -dff +xbw +kEZ vva vva vva @@ -37796,26 +39929,26 @@ dAV dAV vva vva -sVT -vUn -pVf -pAF -jMZ -jMZ -jMZ -pAF -uyO -uyO -uyO -uyO -uyO -uyO -pvF +psP +qaV +bHk +xfO +ukB +ukB +ukB +xfO +wBx +itw +hpg +hpg +hpg +hpg +cQy kmv tmF lYv aCf -boh +sqV ibb qPy hSA @@ -37893,8 +40026,8 @@ oGv fHR fHR aUl -qRx -dff +xbw +kEZ vva vva vva @@ -37990,21 +40123,21 @@ dAV dAV vva vva -sVT -pVf -pVf -pAF -jMZ -jMZ -jMZ -miU -wFh -wFh -qFU -vQA -jkY -wFh -qIt +psP +bHk +bHk +xfO +ukB +ukB +ukB +eRZ +jJE +jJE +wIx +dMB +jps +jJE +eNj jMM tMG wHX @@ -38044,12 +40177,12 @@ xdf uYB ghr urn -urn +kGt bnj gRI -oVz +aHl jsB -hEY +oCE oCE tSn mOA @@ -38074,7 +40207,7 @@ koU iCi scp lMp -rXJ +bFU xbw xbw xbw @@ -38087,8 +40220,8 @@ oGv fHR fHR gQl -cmq -dff +cqE +kEZ vva vva vva @@ -38184,21 +40317,21 @@ dAV dAV vva vva -sVT -pVf -vWE -pAF -jMZ -jMZ -jMZ -miU -wFh -uyU -ahp -blw -jfR -fUh -nCv +psP +bHk +jeo +xfO +ukB +ukB +ukB +eRZ +jJE +eKp +plG +mnn +gcJ +pEd +unt ppk fow wmK @@ -38216,7 +40349,7 @@ uOf uOf uOf bmd -feM +qVx uOf uOf byq @@ -38243,7 +40376,7 @@ tXn gRI fGi jsB -hEY +oCE oCE tSn xet @@ -38268,7 +40401,7 @@ koU rvG scp lMp -rXJ +bFU vkM ceK rgz @@ -38278,11 +40411,11 @@ ixl jXf uhz oGv -fHR +mmk fHR gQl -cmq -dff +cqE +kEZ vva vva vva @@ -38378,21 +40511,21 @@ dAV dAV vva vva -sVT -pVf -vWE -pAF -jMZ -jMZ -jMZ -pAF -wFh -wFh -tZE -jAM -uBz -wFh -ykH +psP +bHk +jeo +xfO +ukB +ukB +ukB +xfO +jJE +jJE +wOe +aQt +xwh +jJE +jce ppk uyV ffQ @@ -38402,13 +40535,13 @@ ibb tqI iOT hTM -rNJ -vSG +qec +rCE hAr org uOf -uJn -gYG +rmr +qkj hFt dLA eDH @@ -38420,8 +40553,8 @@ dll iAy eEe tXi -qou -xwK +ruq +mDE xwK bdq aTs @@ -38433,11 +40566,11 @@ uYB vqG bZZ bZZ -lhq +vLv gRI -pHG +tyR jsB -hEY +oCE oCE tSn wGn @@ -38462,7 +40595,7 @@ koU rvG scp aDy -uGR +vXr lHP wnp ldj @@ -38475,8 +40608,8 @@ oGv fHR fHR gQl -cmq -dff +cqE +kEZ vva vva vva @@ -38572,21 +40705,21 @@ dAV dAV vva vva -sVT -pVf -vWE -dJS -pAF -pAF -pAF -dJS -wFh -wFh -wFh -wFh -wFh -wFh -wFh +psP +bHk +jeo +ger +xfO +xfO +kvr +ger +jJE +jJE +jJE +jJE +jJE +jJE +hrW ppk ibb ibb @@ -38631,7 +40764,7 @@ nCZ yaj pfV jsB -hEY +oCE oCE tSn xYL @@ -38669,8 +40802,8 @@ oGv fHR fHR gQl -cmq -dff +cqE +kEZ vva vva vva @@ -38766,22 +40899,22 @@ dAV dAV vva vva -sVT -pVf -pVf -jMZ -jMZ -wjE -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -jUd +psP +bHk +bHk +fMZ +fMZ +vpU +cXQ +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +krr bHk bHk bHk @@ -38789,11 +40922,11 @@ bHk nsj bHk bHk -iks -iks -jHP -iks -iks +xwm +xwm +xPF +opU +opU uOf uOf gLW @@ -38802,8 +40935,8 @@ ceR ceR mnq uOf -qkW -vWE +rLM +iMc byq vqV syV @@ -38823,9 +40956,9 @@ rtp rtp jsB gDL -oVz +gjj jsB -hEY +oCE pdv tSn xYL @@ -38859,12 +40992,12 @@ vdM vdM pNj jLy -puJ +ofE fHR fHR aUl -qRx -dff +xbw +kEZ vva vva vva @@ -38960,22 +41093,22 @@ dAV dAV vva vva -sVT -wjE -cPA -wjE -wjE -wjE -ghY -vQA -vQA -vQA -vQA -vQA -vQA -vQA -eEn -wjE +psP +vpU +yaw +vpU +vpU +vpU +fBD +dMB +dMB +dMB +dMB +dMB +dMB +dMB +asc +vpU jeo jeo jeo @@ -38983,12 +41116,12 @@ jeo jeo jeo bHk -lyN -bPF -syU -lyN -pJd -eLa +nLs +nqW +rix +ame +gAS +bdy uOf wqA pur @@ -38996,8 +41129,8 @@ hxC hxC hsd uOf -cpy -wtI +laL +nsb byq sKT syV @@ -39017,9 +41150,9 @@ nuW nuW rgg gDL -wzH +dZq jsB -hEY +oCE oCE tSn xYL @@ -39057,8 +41190,8 @@ ofE fHR fHR xbw -qRx -dff +xbw +kEZ vva vva vva @@ -39154,22 +41287,22 @@ dAV dAV vva vva -dff -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +kEZ +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU jeo jeo jeo @@ -39177,12 +41310,12 @@ jeo jeo jeo bHk -lyN -wdG -iwI -lyN -uig -cCp +gLB +xWi +neX +ame +uex +hHq uOf wqA pur @@ -39190,8 +41323,8 @@ hxC hxC hsd uOf -pVf -vWE +iMc +oCE bIY bYH fLh @@ -39211,9 +41344,9 @@ bQR lot nrp fYa -uxE +igF jsB -hEY +oCE lzR tSn xYL @@ -39247,12 +41380,12 @@ vdM tGc pNj bzh -ofE -fHR -fHR +kRZ +qos +uwT xbw -dff -dff +kEZ +kEZ vva vva vva @@ -39348,22 +41481,22 @@ dAV dAV vva vva -dff -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +kEZ +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU jeo jeo xgq @@ -39371,12 +41504,12 @@ piv leC jeo bHk -lyN -vWE -vWE -lyN -wwf -pzZ +nLs +jeo +jeo +ame +lAc +rBu uOf wqA ieI @@ -39384,30 +41517,30 @@ qqx qqx prU uOf -pVf -vWE +oCE +oCE byq cLO bZK bZK akn byq -nuW +dYT iuS -ame -rPh +nuW +hUC ogm ldF ogm -cOG -ame -nhK +hUC nuW +nhK +gdu jsB jcl afc jsB -hEY +oCE gHG tSn xYL @@ -39419,10 +41552,10 @@ tSn vdM tGc vdM -dJS -vNt -vNt -pAF +fOF +agk +agk +tVw fOF koU koU @@ -39441,11 +41574,11 @@ pBu ugi oGv nZL -ofE +kRZ fHR fqY xbw -dff +kEZ vva vva vva @@ -39542,22 +41675,22 @@ dAV dAV vva vva -dff -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +kEZ +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU ame ame ame @@ -39565,12 +41698,12 @@ ame ame ame bFK -lyN -lyN -oPo -lyN -lGE -lyN +nLs +nLs +fUQ +ame +nhx +ame uOf uOf uOf @@ -39578,8 +41711,8 @@ uOf uOf uOf uOf -htm -iks +bFK +opU byq byq bBI @@ -39588,24 +41721,24 @@ bBI byq hUC bHT -sGF +hUC ttR ldF ldF ldF ttR -sGF +hUC wfS hUC jsB rtp rtp jsB -wEo +npq nSZ tSn tSn -tSn +wVN tSn tSn tSn @@ -39613,11 +41746,11 @@ tSn fsG oAd vdM -xtt -jMZ -jMZ -jMZ -xoM +tVw +mTD +mTD +oQc +tVw ooC ahG oKU @@ -39635,11 +41768,11 @@ sVs wsR oGv jLy -ofE +kRZ fHR fqY xbw -dff +kEZ vva vva vva @@ -39736,24 +41869,24 @@ dAV dAV vva vva -dff -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -jJp -wjE -xdf +kEZ +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +slN +vpU xdf +uZc kBs xdf xdf @@ -39762,20 +41895,20 @@ xdf xdf svM xdf -kBs +stN lAc xdf xdf xdf xdf ogm +vXf ogm -ogm -xdf xdf xdf xdf xdf +qDO xdf kBs xdf @@ -39807,20 +41940,20 @@ vci vdM ius kUM -xtt -jMZ -jMZ -jMZ -vXa +fVo +mTD +mTD +mTD +tVw qoK oVB -jfJ -xXU -jfJ +fXD +fXD +fXD uaO fHn sSb -vVT +jhs tLp etJ dLN @@ -39829,11 +41962,11 @@ ana nEg oGv fHR -fHR +qos fHR fqY xbw -dff +kEZ vva vva vva @@ -39931,21 +42064,21 @@ vva vva vva vva -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU jFO vkD ozy @@ -40001,16 +42134,16 @@ iYL vdM vdM vdM -xtt -jMZ -jMZ -jMZ -xoM +agk +mTD +mTD +mTD +err qoK -jfJ -jfJ -xXU -jfJ +fXD +bWB +kWO +fXD fIR fHn hLT @@ -40020,14 +42153,14 @@ nTK lJM fHn ana -lTb -oUm -fHR -fHR +xvH +rFF +qos +qos fHR fqY xbw -dff +kEZ vva vva vva @@ -40125,21 +42258,21 @@ vva vva vva vva -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU xdf lAc xdf @@ -40153,7 +42286,7 @@ xdf xdf xdf xdf -vei +fWa kFm baM dYO @@ -40195,17 +42328,17 @@ rsr vdM vdM vdM -dJS -pAF -pAF -pAF -xxo +fOF +tVw +tVw +tVw +fOF qoK -xXU -xXU -xXU -xXU -xXU +fXD +jfJ +jfJ +fXD +fXD fHn tLp wsx @@ -40214,14 +42347,14 @@ nTK jdx fHn cFp -mPf +xfC oUm fHR fHR fHR fqY xbw -dff +kEZ vva vva vva @@ -40319,21 +42452,21 @@ vva vva vva vva -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU xdf lAc xdf @@ -40364,21 +42497,21 @@ dCm opU hUC bHT -dTL +hUC ttR ldF ldF ldF ttR -dTL +hUC wfS hUC aZp dHC dHC xii -svM -svM +buX +eJQ lyz arD kzk @@ -40395,10 +42528,10 @@ arD arD arD wKf -xXU -jfJ -jfJ +fXD jfJ +kEc +fXD atr fHn tKI @@ -40408,14 +42541,14 @@ wIs jdx fHn tKH -bve +dXq oGv oGv oGv eIu eIu xbw -dff +kEZ vva vva vva @@ -40513,60 +42646,60 @@ vva vva vva vva -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE +vpU +vpU +vpU +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu xdf lAc xdf ame glo -thH -thH -thH -thH -thH -thH -thH -thH -thH -thH -bFK -tis -ogm -kFm -bFK -pVf -vWE -ukS -iks -vWE -vWE -vWE -iks -nuW +hGF +aVb +aVb +aVb +aVb +aVb +aVb +aVb +aVb +aVb +dhi +jgR +hZl +jBN +dhi +xFQ +fKO +rjb +tEl +fKO +fKO +fKO +tEl +dYT iuS -ame -rPh +nuW +hUC ogm ldF ogm -cOG -ame -nhK +hUC nuW +nhK +gdu aZp hAx mKU @@ -40585,12 +42718,12 @@ bac jVk jVk fzo -jVk +opO qxH -jVk +opO spz -xXU -jfJ +fXD +dUw wGE wGE wGE @@ -40602,8 +42735,8 @@ ota qpI fHn ana -eKZ -sut +uwa +wSC eyF xbw xbw @@ -40707,27 +42840,27 @@ vva vva vva vva -dff -dff -dff -sVT -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -lyN +kEZ +kEZ +kEZ +psP +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +nLs xdf lAc xdf ame qzS -thH +jyJ qzS qzS qzS @@ -40742,14 +42875,14 @@ tis xdf kFm ame -pVf -vWE -tQt -iks -vWE -vWE -vWE -dTq +hua +fKO +qfb +tEl +fKO +fKO +fKO +via nuW ljK lot @@ -40779,10 +42912,10 @@ eIH jfJ jfJ arD -jfJ +fXD ncy -jfJ -jfJ +fXD +fXD wdc wGE wGE @@ -40796,13 +42929,13 @@ fHn fHn fHn ana -eKZ -lII +uwa lII +rqW vYY -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -40902,26 +43035,26 @@ vva vva vva vva -dff -dff -sVT -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -lyN +kEZ +kEZ +psP +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +nLs cry mHY cry ame qzS -thH +jyJ qzS qzS sVT @@ -40936,14 +43069,14 @@ dsX qEk rmc mnL -pVf -vWE -wtI -iks -vWE -vWE -vWE -dTq +hua +fKO +qkL +tEl +fKO +fKO +fKO +via nuW nuW nuW @@ -40982,20 +43115,20 @@ wGE xNJ kNz kNz -bEV +kNz dHw jDq vUi wsC -vLT +viF kNz jDq -eKZ +uwa bPl -mnH +gLb vYY -dff -dff +kEZ +kEZ vva vva vva @@ -41098,29 +43231,29 @@ vva vva vva vva -sVT -sVT -sVT -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -lyN +psP +psP +psP +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +nLs xdf lAc xdf ame qzS -thH +jyJ qzS qzS sVT -uzO -uzO +ttJ +ttJ gbn ooV lSL @@ -41130,18 +43263,18 @@ gmJ ooV uVy mnL -pVf -pVf -pVf -iks -vWE -vWE -vWE -iks -dTq -dTq -iks -iks +lYM +fIa +xFQ +tEl +fKO +fKO +fKO +tEl +via +via +tEl +tEl svM dCm vbt @@ -41166,8 +43299,8 @@ arD vNI vMd jan -tcx -dff +ksq +ttJ jan jan jan @@ -41179,12 +43312,12 @@ cYT uYb xyY aVt -oqO -xhR -nrr -xhR -xhR -tPK +xhP +cmw +pqT +vsk +wLy +mpB vYY vYY vYY @@ -41294,27 +43427,27 @@ vva vva vva vva -sVT -sVT -sVT -sVT -sVT -sVT -sVT -sVT -sVT -lyN +psP +psP +psP +psP +psP +psP +psP +psP +psP +nLs xdf lAc xdf ame qzS -thH +jyJ qzS qzS sVT uzO -uzO +ttJ gbn ooV pIZ @@ -41324,18 +43457,18 @@ pEp nyE uVy mnL -cBg -vWE -pVf -tbJ -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vNt +eBy +fKO +udq +pXp +xCe +fKO +fKO +fKO +fKO +fKO +fKO +mjq xdf xdf nsI @@ -41360,8 +43493,8 @@ ubp eIH jfJ jan -jrL -dff +lQw +ttJ jan jan jan @@ -41491,11 +43624,11 @@ vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ iAX xdf xdf @@ -41503,12 +43636,12 @@ lAc xdf ndl qzS -thH +jyJ qzS qzS sVT cHY -uzO +ttJ gbn lOf dPy @@ -41516,20 +43649,20 @@ dPy dPy cOM ooV -wwG +bQK mnL -kdM -vWE -pVf -iks -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vNt +uEY +fKO +hua +tEl +fKO +fKO +fKO +fKO +fKO +fKO +fKO +mjq jLT ica udD @@ -41554,12 +43687,12 @@ arD oSv jfJ jan -dff -llX -jan -jan -jan -tSJ +ttJ +eYt +dZZ +dZZ +dZZ +obV wGE ana vWB @@ -41568,10 +43701,10 @@ iUy oTq vYY rNw -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -41686,10 +43819,10 @@ vva vva vva vva -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ iAX xdf bpe @@ -41697,12 +43830,12 @@ fiK xdf iAX qzS -thH +jyJ qzS sVT sVT sVT -haM +wwa gbn ooV dPy @@ -41713,10 +43846,10 @@ ooV ooV mnL mnL -vWE -pVf -iks -iks +eQf +hua +tEl +tEl oQn oQn oQn @@ -41748,23 +43881,23 @@ arD lWv jfJ jan -dff -bLS -jan -wXh -ikt -ylN +ttJ +tdA +dZZ +gaS +jrz +osY wGE cFp xrC wbz wbz -wvv +kUY vYY rNw -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -41880,18 +44013,18 @@ vva vva vva vva -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ iAX -xdf +mJs oIE gQI faU iAX qzS -thH +jyJ qzS sVT vWE @@ -41905,20 +44038,20 @@ pIZ fGw msh ooV -ooV +ydc mnL -vWE -pVf -vWE -vWE +fKO +qgX +fKO +fKO oQn nPn bUr -fYM -qIk +sfz +msH fEt oQn -xdf +iwK ldF nsI dHC @@ -41942,12 +44075,12 @@ jfJ fhU nmL jan -dff +ttJ sVT -jan -wXh -wXh -vgG +dZZ +gaS +gaS +lET sxt crZ isT @@ -41956,9 +44089,9 @@ bBm bBm vYY rNw -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -42074,20 +44207,20 @@ vva vva vva vva -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ iAX xdf xdf xdf xdf iAX +gBi +adR qzS -thH -qzS -haM +bJm vWE vWE vWE @@ -42101,13 +44234,13 @@ cmh cmh tXe mnL -vWE -pVf -vWE -wtI +fKO +qgX +fKO +qkL oQn -jiL -jiL +gHN +gHN jiL jiL jiL @@ -42136,12 +44269,12 @@ jVk qeU jfJ jan -dff +ttJ sVT -waJ -waJ -wXh -wXh +aQX +aQX +gaS +gaS kOC ana gJI @@ -42150,9 +44283,9 @@ gaS gaS vYY rNw -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -42269,9 +44402,9 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ iAX xdf xdf @@ -42279,14 +44412,14 @@ xdf xdf iAX qzS -thH +gHo vPF sVT sVT sVT sVT gbn -lVp +vcy mnL irH irH @@ -42295,12 +44428,12 @@ kBJ imQ rSu irH -vWE -pVf -vWE -pVf -ffr -jiL +fKO +uMi +xCe +jYO +hvd +wAU jiL jiL jiL @@ -42330,12 +44463,12 @@ jfJ tNp jfJ jan -dff +ttJ sVT -fzE -fzE -wXh -wXh +nHd +nHd +gaS +gaS kOC ana gJI @@ -42344,8 +44477,8 @@ gaS gaS vYY rNw -dff -dff +kEZ +kEZ vva vva vva @@ -42463,230 +44596,230 @@ vva vva vva vva -dff -dff -dff -iAX -xdf -xdf -xdf -xdf -ame -qzS -thH -vPF -vPF -vPF -qzS -qzS -qzS -qzS -qzS -irH -qDn -skn -skn -skn -llY -irH -vWE -pVf -pVf -pVf -oQn -wuL -jiL -jiL -qae -wcr -oQn -bZm -xdf -nsI -aZp -ceL -wYE -oEl -lek -hzp -jvv -hSF -gMP -nIe -fKv -mjo -oVg -qpV -hGb -mkf -fKv -arD -rUQ -arD -jan -dff -sVT -jan -wXh -wXh -wXh -wGE -ana -gJI -wGE -dQv -ppm -vYY -rNw -dff -dff -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -vva -vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -vva -vva -vva -vva -vva -vva -"} -(113,1,1) = {" -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -dff -dff -dff +kEZ +kEZ +kEZ iAX -aZz -aZz xdf xdf +xdf +foV ame qzS -thH +gHo vPF vPF vPF qzS qzS qzS +thH +qzS +irH +qDn +skn +skn +skn +llY +irH +fKO +nbt +nbt +qgX +oQn +wuL +jiL +jiL +qae +wcr +oQn +bZm +xdf +nsI +aZp +ceL +wYE +oEl +lek +hzp +jvv +hSF +gMP +nIe +fKv +mjo +oVg +qpV +hGb +mkf +fKv +arD +rUQ +arD +jan +ttJ +sVT +dZZ +gaS +gaS +gaS +wGE +ana +gJI +wGE +dQv +ppm +vYY +rNw +kEZ +kEZ +vva +dAV +dAV +dAV +dAV +dAV +dAV +dAV +vva +vva +vva +vva +vva +vva +vva +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +vva +vva +vva +vva +vva +vva +vva +vva +"} +(113,1,1) = {" +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +kEZ +kEZ +kEZ +iAX +aZz +aZz +xdf +xdf +ame +qzS +gHo +vPF +vPF +vPF qzS qzS -nJh +thH +thH +thH +oPl skn skn sPi pTp hcj irH -iks -iks -iks -htm +tEl +tEl +tEl +hjH oQn oQn tWL @@ -42695,8 +44828,8 @@ tWL oQn oQn opU -cMh -oyH +hUC +hyP uMe uMe uMe @@ -42718,12 +44851,12 @@ jfJ tNp jfJ jan -dff -dff -jan -wXh -wXh -wXh +ttJ +ttJ +dZZ +gaS +gaS +gaS wGE nBf jyp @@ -42732,8 +44865,8 @@ mtd qSF vYY rNw -dff -dff +kEZ +kEZ vva dAV dAV @@ -42852,8 +44985,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ iAX ame ame @@ -42861,14 +44994,14 @@ ame bFK ame qzS -thH +gHo +qzS +jvr +qzS qzS qzS +thH qzS -pGl -gGt -rbU -gMT qzS irH hRo @@ -42879,20 +45012,20 @@ bUj irH nkZ nkZ -eHY -qKn +baF +eTA dbk dHu aAa aAa oac qQL -qQL +tMQ gSO aAa iWy spY -iZx +hjZ fdz quW ulN @@ -42912,12 +45045,12 @@ jfJ kkb nmL jan -dff -dff -jan -wXh -wXh -wXh +ttJ +ttJ +dZZ +cYl +cYl +bDr wGE rmB fZf @@ -42926,7 +45059,7 @@ mzk mzk mzk rNw -dff +kEZ vva vva dAV @@ -43046,8 +45179,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF qzS ryJ @@ -43055,13 +45188,13 @@ vmH thH qzS qzS +gHo +thH +jcj +thH +thH +thH thH -qzS -qzS -qzS -qzS -qzS -qzS qzS qzS irH @@ -43074,7 +45207,7 @@ irH nkZ nkZ afh -mvj +ptP cvA jRZ aAa @@ -43102,16 +45235,16 @@ jgu nvU nfG xFx -jfJ +gpO vHe jfJ jan -dff -dff +ttJ +ttJ jan jfJ -xXU -xXU +jfJ +jfJ jfJ rmB smq @@ -43120,7 +45253,7 @@ uAk dGQ mzk rNw -dff +kEZ vva vva dAV @@ -43240,8 +45373,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF qzS qzS @@ -43249,9 +45382,9 @@ qzS thH qzS qzS -thH -qzS +gHo qzS +jvr qzS qzS qzS @@ -43261,14 +45394,14 @@ qzS irH qag irH -tdl -xZe -maF +oOY +lXT +guS dHu cgI cie vYD -mvj +ptP cvA afU aAa @@ -43300,12 +45433,12 @@ dwh vHe jfJ jan -dff -dff +ttJ +ttJ jan jfJ -xXU -xXU +jfJ +jfJ jfJ rmB uOQ @@ -43314,7 +45447,7 @@ ppM dQW mzk rNw -dff +kEZ vva vva dAV @@ -43435,7 +45568,7 @@ vva vva vva vva -dff +kEZ vPF qzS qzS @@ -43447,18 +45580,18 @@ thH vPF vPF vPF -qzS -qzS -qzS -qzS -qzS +jvr +jvr +jvr +jvr +jvr irH sLX irH -asI -asI -asI eSO +eSO +eSO +wLW afh mvj mvj @@ -43467,10 +45600,10 @@ cvA jRZ aAa aAa -uRB -uRB -uRB -uRB +aAa +aAa +aAa +aAa aAa fRL lWk @@ -43478,9 +45611,9 @@ mIV mIV wzz mIV -hMw -xuE -xuE +kZQ +eXV +eXV kui uMe ohL @@ -43494,8 +45627,8 @@ jfJ hqV rhh jan -dff -dff +ttJ +ttJ jan jan jan @@ -43629,15 +45762,15 @@ vva vva vva vva -dff +kEZ vPF -qzS -qzS -qzS -qzS -qzS -qzS -qzS +jvr +jvr +jvr +qhV +jvr +jvr +jvr vPF vPF vPF @@ -43649,22 +45782,22 @@ qzS irH irH irH -asI -iKt -cDU +eSO +hKu +hlg dHu oJb mHS -mHS +lLn mHS urs dHu -iTr aAa -uRB -uRB -uRB -uRB +aAa +aAa +aAa +aAa +aAa aAa aAa oag @@ -43672,7 +45805,7 @@ aAa aAa oOs aAa -bMF +aBc wAb wAb bTe @@ -43688,12 +45821,12 @@ jfJ jfJ jfJ jan -dff -dff +ttJ +ttJ jan jan jan -jfJ +gpO jfJ rmB hdE @@ -43701,7 +45834,7 @@ rTc hdE ydr mzk -dff +kEZ vva vva vva @@ -43823,7 +45956,7 @@ vva vva vva vva -dff +kEZ vPF qzS qzS @@ -43840,16 +45973,16 @@ qzS qzS qzS qzS -qzS -qzS -qzS -qzS -lHT +svP +qvz +svP +svP +ozX dHu dHu dHu drB -drB +eNA dHu dHu dHu @@ -43882,8 +46015,8 @@ jfJ jfJ jfJ jan -dff -dff +ttJ +ttJ jan jan jan @@ -43895,7 +46028,7 @@ hzD kFk dQW mzk -dff +kEZ vva dAV dAV @@ -44034,16 +46167,16 @@ qzS qzS qzS qzS -qzS -qzS -qzS -qzS -wSZ +bRZ +qvz +qvz +qvz +lKv dHu lso toY bzD -bzD +bsC lso toY uRh @@ -44076,8 +46209,8 @@ jfJ jfJ jfJ jan -dff -dff +ttJ +ttJ jan jfJ jfJ @@ -44085,7 +46218,7 @@ jfJ jfJ rmB eCf -ghw +iAI hdE dQW mzk @@ -44226,18 +46359,18 @@ qzS qzS qzS qzS +xTU qzS -qzS -qzS -qzS -qzS -qzS -kkq +svP +qvz +qvz +qvz +uDn dHu mvj mvj bzD -bzD +bsC mvj mvj uRh @@ -44253,9 +46386,9 @@ ghy lbf alV crx -vTB +oce uMe -wAb +jlD wAb mqR cRQ @@ -44270,8 +46403,8 @@ cRQ jfJ jfJ jan -dff -dff +ttJ +ttJ jan jfJ jfJ @@ -44422,20 +46555,20 @@ vPF vPF vPF vPF -vPF -qzS -qzS -lEi -qzS +jly +awi +qvz +qpl +lOF dHu lso toY bzD -bzD +bsC lso toY dHu -hdl +dlk sel bet pIY @@ -44464,13 +46597,13 @@ cRQ jan jan jan -dff -dff -jan +ttJ +ttJ jan jan jan jan +jfJ mzk mzk mzk @@ -44606,26 +46739,26 @@ qzS qzS qzS vPF -dff -dff -dff -vva -dff -dff -dff -dff -dff -dff -vPF -qzS -qzS -qzS -qzS -dHu +kEZ +kEZ +kEZ +vva +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +jly +ehU +jhb +jhb +jhb +rXQ +lUU mvj -mvj -bzD bzD +bsC mvj mvj uRh @@ -44655,22 +46788,22 @@ gzK tsy sPv cRQ -dff -dff -dff -dff -dff -dff -vva -dff -dff -dff -sVT -vWE -vWE -vWE -vWE -sVT +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +vva +jan +jan +jfJ +jfJ +jfJ +jfJ +jfJ +jfJ +jan vva vva dAV @@ -44800,23 +46933,23 @@ vPF qzS qzS vPF -dff -dff +kEZ +kEZ vva vva vva -dff -dff -dff -dff -dff -vPF -qzS -qzS -qzS -qzS +kEZ +kEZ +kEZ +kEZ +kEZ +jly +qvz +jhb +qvz +qvz dHu -mvj +tCE mvj bzD bzD @@ -44849,22 +46982,22 @@ uoT tsy sSk cRQ -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva -dff -dff -sVT -vWE -vWE -sVT -sVT -sVT +jan +jan +jan +jfJ +jfJ +jan +jan +jan vva vva dAV @@ -44994,22 +47127,22 @@ vPF qzS qzS vPF -dff +kEZ vva vva vva vva vva -dff -dff -dff -dff -vPF -qzS -arV -qzS -qzS -cIP +kEZ +kEZ +kEZ +kEZ +jly +qvz +sDV +qPi +sfS +dHu mvj mvj oJq @@ -45031,9 +47164,9 @@ qeA crx qAV uMe -lqy -lqy -lqy +qQe +ftM +aZn cRQ wBN qvD @@ -45043,20 +47176,20 @@ seB jCp hCc cRQ -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ vva vva vva vva vva -dff -sVT -vWE -vWE -sVT +jan +jan +jfJ +jfJ +jan vva vva vva @@ -45195,19 +47328,19 @@ vva vva vva vva -dff -dff -dff -vPF -qzS -arV -qzS -qzS +kEZ +kEZ +kEZ +jly +qvz +sDV +sNQ +osC dHu mvj mvj -mvj -mvj +pia +vfd mvj mvj uRh @@ -45237,9 +47370,9 @@ sQs lAH dxw cRQ -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -45247,10 +47380,10 @@ vva vva vva vva -sVT -vWE -vWE -sVT +jan +jfJ +jfJ +jan vva vva vva @@ -45389,14 +47522,14 @@ vva vva vva vva -dff -dff -dff -vPF -vPF -arV -qzS -qzS +kEZ +kEZ +kEZ +jly +jly +ieq +svP +svP bHz bHz bHz @@ -45431,9 +47564,9 @@ bBu fve cAY cRQ -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -45441,10 +47574,10 @@ vva vva vva vva -sVT -vWE -vWE -sVT +jan +jfJ +jfJ +jan vva vva vva @@ -45583,23 +47716,23 @@ vva vva vva vva -dff -dff -dff -dff +kEZ +jZd +kEZ +kEZ vPF arV qzS -qzS +hUD +pPJ vPF -dff -dff +qzS bHz bHz bHz bHz dHu -nEv +upP uri nbs rJK @@ -45611,23 +47744,23 @@ rQH qIQ txP jQj -qAV +bRF uMe kMO gRL wAb -aZn -dff -dff +oZN +qUN +qUN cAY bTI hjp jOg cAY -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -45635,10 +47768,10 @@ vva vva vva vva -sVT -vWE -vWE -sVT +jan +jfJ +jfJ +jan vva vva vva @@ -45778,20 +47911,20 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF arV qzS -qzS +hGo +uRc vPF -dff -dff -lej -vWE -vWE -vWE +qzS +qVM +qzS +qzS +qzS uMe djq djq @@ -45810,17 +47943,17 @@ uMe uMe uMe uMe -aZn -dff -dff +wbq +tFl +xIq cAY wFb llD nlM cAY -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -45829,10 +47962,10 @@ vva vva vva vva -sVT -sVT -sVT -sVT +jan +jan +jan +jan vva vva vva @@ -45961,8 +48094,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vva vva vva @@ -45972,22 +48105,22 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF -tQb -jvr -jvr +arV +qzS +vAZ +vAZ vPF -dff -dff -lej -vWE -vWE -vWE +qzS +qVM +qzS +qzS +qzS uMe -oQa +iGc vwB djq djq @@ -46004,17 +48137,17 @@ iYh iYh iYh auD -aZn -dff -dff +wbq +xIq +xIq cAY -fSH +oRD aFl rVt uQp -tVd -dff -dff +beO +kEZ +kEZ vva vva vva @@ -46024,8 +48157,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vva vva vva @@ -46155,8 +48288,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vva vva vva @@ -46166,20 +48299,20 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF -arV +eYR qzS -glo +vAZ +pcY vPF -dff -dff -lej -vWE -vWE -vWE +qzS +qVM +qzS +qzS +qzS uMe kBB bet @@ -46198,17 +48331,17 @@ txP crx txP wXW -aZn -dff -dff +wbq +xIq +xIq cAY iHB pSP sLm cAY -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -46218,8 +48351,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vva vva vva @@ -46349,8 +48482,8 @@ vva vva vva vva -dff -qFt +kEZ +mIv vva vva vva @@ -46361,19 +48494,19 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF pdt dec aMc +vAZ vPF -dff -dff -lej -vWE -vWE -vWE +qzS +qVM +qzS +qzS +qzS uMe juN gKP @@ -46391,17 +48524,17 @@ crx crx txP crx -jMt -aZn -dff -dff +uKh +wbq +xIq +xIq cAY oBk ggL xZs cAY -dff -dff +kEZ +kEZ vva vva vva @@ -46412,8 +48545,8 @@ dAV vva vva vva -qFt -dff +mIv +kEZ vva vva vva @@ -46555,19 +48688,19 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF qzS qzS vPF vPF -dff -dff -lej -vWE -vWE -vWE +vPF +vPF +qVM +qzS +qzS +qzS mYM vaA rJK @@ -46576,7 +48709,7 @@ ovA djq ffa vaA -nGI +wYJ gaa qkG bTM @@ -46586,16 +48719,16 @@ uSq izc uSq gCl -aZn -dff -dff +wbq +rPG +rPG cAY cAY lVE vgx cAY -dff -dff +kEZ +kEZ vva vva dAV @@ -46749,19 +48882,19 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF qzS qzS vPF -dff -dff +kEZ +kEZ vva -lej -lej -lej -lej +qVM +qVM +qVM +qVM aZn aZn aZn @@ -46782,14 +48915,14 @@ aZn aZn aZn vva -dff -dff +rPG +qUN cAY jVf vQj cAY -dff -dff +kEZ +kEZ vva vva dAV @@ -46943,19 +49076,19 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF vPF vPF vPF -dff -dff +kEZ +kEZ vva vva -dff -sVT -asI +kEZ +rPG +rsM kAq qUN ueM @@ -46964,26 +49097,26 @@ rPG rpG bDk oLB +kAq +ovP qUN qUN qUN qUN qUN qUN -qUN -vWE -sVT -dff +rPG +kEZ vva vva -dff -dff +rPG +qUN cAY cAY cAY cAY -dff -dff +kEZ +kEZ vva vva dAV @@ -47137,19 +49270,19 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF vPF -dff -dff -dff +kEZ +kEZ +kEZ vva vva -dff -sVT -vWE +kEZ +rPG +qUN rsM rsM ueM @@ -47159,25 +49292,25 @@ qUN qUN oLB qUN +ovP qUN qUN qUN qUN qUN qUN -vWE -sVT -dff +rPG +kEZ vva vva -dff -dff -dff -qRx -qRx -dff -dff -dff +rPG +qUN +qUN +krP +krP +kEZ +kEZ +kEZ vva vva dAV @@ -47331,19 +49464,19 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF vPF -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva -sVT -pNq +rPG +cIZ jtb rsM rPG @@ -47353,25 +49486,25 @@ qUN qUN oLB qUN +ovP +lKN +ovP qUN qUN qUN qUN -qUN -qUN -vWE -sVT +rPG vva vva vva -dff -dff -dff -qRx -qRx -dff -dff -dff +rPG +qUN +qUN +krP +krP +kEZ +kEZ +kEZ vva vva dAV @@ -47526,45 +49659,45 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF vPF -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva -sVT -hJw +rPG +knF llw qUN -vDi -qUN -qUN -qUN -qUN +bGp +oLB +oLB +oLB +oLB oLB qUN qUN qUN +ovP qUN qUN qUN qUN -vWE -sVT +rPG vva vva vva -dff -dff -dff -qRx -qRx -dff -dff +rPG +rPG +rPG +krP +krP +kEZ +kEZ vva vva vva @@ -47720,18 +49853,18 @@ vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva vva vva -sVT -sVT +rPG +rPG rPG rPG rPG @@ -47743,22 +49876,22 @@ oLB qUN qUN qUN -qUN -qUN -qUN +ovP +ovP +ovP +rPG +rPG rPG -sVT -sVT vva vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -47914,25 +50047,25 @@ vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva vva vva -dff -dff +kEZ +kEZ rPG qUN qUN qUN qUN qUN -qUN +lOo oLB oLB oLB @@ -47941,18 +50074,18 @@ oLB jPD qkX rPG -dff -dff +kEZ +kEZ vva vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -48109,17 +50242,17 @@ vva vva vva vva -dff -dff -qFt +kEZ +kEZ +mIv vva vva vva vva vva vva -dff -dff +kEZ +kEZ rPG rPG rPG @@ -48135,17 +50268,17 @@ rPG rPG rPG rPG -dff -dff +kEZ +kEZ vva vva vva vva vva vva -qFt -dff -dff +mIv +kEZ +kEZ vva vva vva @@ -48312,25 +50445,25 @@ vva vva vva vva -jap -pAn -pAn -pAn -aNP +uNO +cuN +cuN +cuN +uak rPG qUN qUN qUN oLB qUN -qUN +kAq qUN rPG -wDe -pAn -pAn -pAn -eap +vHY +cuN +cuN +cuN +gOE vva vva vva @@ -48508,9 +50641,9 @@ vva vva vva vva -dff +kEZ iyn -klF +rDh rPG qUN qUN @@ -48520,9 +50653,9 @@ qUN qUN qUN rPG -kZo +teR kEk -dff +kEZ vva vva vva @@ -48702,9 +50835,9 @@ vva vva vva vva -dff -dff -hyH +kEZ +kEZ +nDF rPG tFl tFl @@ -48714,9 +50847,9 @@ tFl tFl tFl rPG -hyH -dff -dff +nDF +kEZ +kEZ vva vva vva @@ -48896,9 +51029,9 @@ vva vva vva vva -dff -dff -hyH +kEZ +kEZ +nDF rPG xIq xIq @@ -48908,9 +51041,9 @@ xIq xIq xIq rPG -hyH -dff -dff +nDF +kEZ +kEZ vva vva vva @@ -49090,9 +51223,9 @@ vva vva vva vva -dff -dff -hyH +kEZ +kEZ +nDF rPG rPG rPG @@ -49102,9 +51235,9 @@ rPG rPG rPG rPG -hyH -dff -dff +nDF +kEZ +kEZ vva vva vva @@ -49286,17 +51419,17 @@ vva vva vva vva -cRe -pAn -pAn -pAn -pAn -pIF -pAn -pAn -pAn -pAn -uGJ +lkb +cuN +cuN +cuN +cuN +naq +cuN +cuN +cuN +cuN +kZG vva vva vva @@ -49480,17 +51613,17 @@ vva vva vva vva -oxC -dff -dff -dff -dff -hyH -dff -dff -dff -dff -oxC +cRm +kEZ +kEZ +kEZ +kEZ +nDF +kEZ +kEZ +kEZ +kEZ +cRm vva vva vva @@ -49676,12 +51809,12 @@ vva vva vva vva -dff +kEZ bQV bQV pNf bQV -dff +kEZ vva vva vva @@ -50648,8 +52781,8 @@ vva vva vva vva -dff -hyH +kEZ +nDF vva vva vva @@ -50842,8 +52975,8 @@ vva vva vva vva -dff -hyH +kEZ +nDF vva vva vva @@ -51036,8 +53169,8 @@ vva vva vva vva -dff -oxC +kEZ +cRm vva vva vva diff --git a/maps/euthenia/levels/deck4.dmm b/maps/euthenia/levels/deck4.dmm index 07d93f4f8a..a975c08749 100644 --- a/maps/euthenia/levels/deck4.dmm +++ b/maps/euthenia/levels/deck4.dmm @@ -1,10 +1,12 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ab" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +"ac" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "ad" = ( /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) @@ -12,31 +14,48 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"ag" = ( -/obj/structure/stairs/spawner/east, +"ah" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) +/area/main_map/maintenance/deck_four/aft/starboard) "ai" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" }, /turf/space, /area/space) -"aj" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck4) "ak" = ( /turf/simulated/wall, /area/main_map/hallway/deck4/fore) +"al" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "am" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"an" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "ao" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -52,10 +71,21 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) -"aq" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/space) +"ar" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"at" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "au" = ( /obj/machinery/air_alarm{ dir = 4; @@ -64,32 +94,39 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) -"aw" = ( -/turf/simulated/floor/reinforced/airless, -/area/main_map/maintenance/deck_four/port) -"ay" = ( -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "smuggler_door1"; - pixel_x = 32 +"ax" = ( +/obj/structure/table/bench/padded, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/space) +/obj/landmark/spawnpoint/job/shaft_miner, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "az" = ( /obj/machinery/camera/network/command{ dir = 1 }, /turf/simulated/floor/greengrid, /area/ai) -"aA" = ( -/obj/effect/floor_decal/spline/plain, -/obj/spawner/window/borosillicate/reinforced/full, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_windows" +"aB" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/gateway) +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) +"aC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "aD" = ( /turf/simulated/floor/carpet/bcarpet, /area/library) @@ -104,15 +141,58 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"aG" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"aM" = ( +/obj/structure/frame{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "aN" = ( /obj/machinery/atmospherics/component/unary/freezer{ dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"aR" = ( -/turf/simulated/wall/r_wall/prepainted/science, +"aQ" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mobile_miningbase_door" + }, +/obj/machinery/atmospheric_field_generator, +/obj/machinery/airlock_sensor/airlock_exterior{ + dir = 4; + pixel_x = -24 + }, +/obj/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/maintenance/deck_four/aft/port) +"aS" = ( +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) +"aV" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "smugler_airlock1"; + dir = 4; + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "aW" = ( /obj/machinery/mineral/unloading_machine, /obj/machinery/conveyor{ @@ -124,15 +204,80 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"aX" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"aZ" = ( +/obj/structure/largecrate, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/starboard) "ba" = ( /obj/machinery/light/fairy{ dir = 8 }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"bi" = ( -/turf/simulated/wall/r_wall, -/area/rnd/secure_storage/critical/vault2) +"bb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"bc" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/gateway) +"bd" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"be" = ( +/obj/structure/catwalk, +/turf/space, +/area/rnd/telescience_lab/chamber) +"bf" = ( +/obj/structure/largecrate, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"bg" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) +"bh" = ( +/obj/structure/girder/reinforced, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"bj" = ( +/obj/structure/closet/crate/corporate/nanotrasen{ + name = "Slime Booster Kit" + }, +/obj/item/slimepotion/fertility, +/obj/item/slimepotion/feeding, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "bk" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, @@ -140,16 +285,13 @@ "bl" = ( /turf/simulated/wall/prepainted/civilian, /area/library) -"bo" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/map_helper/airlock/atmos/pump_out_external, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/main_map/maintenance/deck_four/aft/port) +"bm" = ( +/obj/machinery/disposal, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"bp" = ( +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) "bq" = ( /obj/machinery/shipsensors{ dir = 1 @@ -168,10 +310,36 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/library) +"bt" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/telescience_lab/chamber) "bu" = ( /obj/structure/sign/warning/secure_area, /turf/simulated/wall/r_wall/prepainted/exploration, /area/gateway) +"bv" = ( +/obj/turbolift_map_holder/euthenia_cargo, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"bx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"by" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "bz" = ( /obj/structure/plasticflaps/mining, /obj/machinery/conveyor{ @@ -179,26 +347,70 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"bC" = ( -/obj/machinery/light{ +"bB" = ( +/turf/simulated/wall, +/area/main_map/maintenance/deck_four/aft) +"bD" = ( +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) -"bE" = ( -/obj/structure/cable/heavyduty, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"bF" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"bG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "bH" = ( /turf/simulated/floor/tiled, /area/quartermaster/miningdock) +"bI" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"bJ" = ( +/obj/machinery/computer/guestpass{ + dir = 4; + pixel_x = -28 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "bK" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) +"bL" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) "bM" = ( /obj/structure/railing/grey{ dir = 1 @@ -222,6 +434,16 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"bQ" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"bR" = ( +/obj/structure/girder/reinforced, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "bS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -236,6 +458,22 @@ /obj/structure/target_stake, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"bV" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"bW" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"bX" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "bY" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -254,11 +492,23 @@ /obj/effect/floor_decal/techfloor/corner, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"cf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) +"ce" = ( +/obj/structure/ore_box, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"cg" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "ci" = ( /obj/machinery/camera/network/research{ dir = 4 @@ -294,10 +544,24 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) +"cq" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"cr" = ( +/obj/structure/closet, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) "cs" = ( /obj/machinery/camera/network/civilian, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"ct" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/rnd/telescience_lab/storage) "cu" = ( /obj/structure/closet/crate, /obj/item/target, @@ -323,15 +587,12 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) -"cx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"cz" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "cA" = ( /obj/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ @@ -358,25 +619,31 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/port) -"cH" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 +"cE" = ( +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"cF" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "W-SE-NE" }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) -"cK" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"cG" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/effect/floor_decal/techfloor/hole{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"cJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "cL" = ( /obj/effect/catwalk_plated/dark, /turf/simulated/floor/plating, @@ -384,12 +651,70 @@ "cM" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_four/starboard) +"cN" = ( +/obj/structure/table/standard, +/obj/item/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"cP" = ( +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"cQ" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/disposal, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "cR" = ( /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) +"cS" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "cW" = ( /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"cX" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"cY" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/split/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) +"cZ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) +"da" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"db" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "dc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -397,21 +722,71 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/bluegrid, /area/ai) -"de" = ( -/obj/effect/floor_decal/borderfloor/corner{ +"dd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"dj" = ( +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/disposaloutlet{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"dk" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/sar{ + req_access = list(5); + req_one_access = list(5) + }, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/autoinjectors, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/roller, +/obj/item/storage/backpack/parachute, +/obj/item/binoculars, +/obj/machinery/camera/network/exploration{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/exploration/explorer_prep) +"dl" = ( +/obj/effect/floor_decal/industrial/danger/corner, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/wall{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "dm" = ( /obj/structure/dispenser/oxygen, /obj/machinery/light/no_nightshift{ @@ -419,56 +794,119 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"dn" = ( -/obj/structure/salvageable/machine, -/turf/simulated/floor/plating, -/area/space) "dp" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"dq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +"dr" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"dw" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/port) +"dx" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"dy" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck4) -"dv" = ( -/obj/machinery/button/remote/blast_door{ - dir = 6; - id = "PubPrepFront"; - name = "Gateway Shutter"; - pixel_x = -24; - pixel_y = -24; - req_access = list(62) +"dz" = ( +/obj/structure/closet/secure_closet/explorer, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"dC" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/telescience_lab/foyer) +"dD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) -"dB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/warning{ +/area/rnd/telescience_lab) +"dE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/camera/network/cargo, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/structure/table/reinforced, +/obj/machinery/door/window/southright{ + req_one_access = list(48) + }, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-9" +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"dF" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/structure/closet/hydrant{ - pixel_x = -32 +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"dG" = ( +/obj/machinery/button/remote/blast_door{ + id = "PubPrep"; + name = "Gateway Shutter"; + pixel_x = -25; + pixel_y = 25; + req_access = list(62) }, /turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +/area/rnd/telescience_lab) +"dH" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"dI" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) +"dJ" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "dK" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -489,24 +927,45 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) -"dN" = ( -/obj/spawner/window/reinforced/full/firelocks, +"dM" = ( +/obj/structure/window/reinforced, +/obj/structure/table/glass, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"dP" = ( +/obj/structure/salvageable/bliss, /turf/simulated/floor/plating, -/area/space) -"dO" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/area/main_map/maintenance/deck_four/aft/starboard) +"dQ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor/corner{ dir = 1 }, -/turf/simulated/floor/bluegrid, -/area/ai_upload) -"dT" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck4) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"dR" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"dS" = ( +/obj/structure/stairs/spawner/north, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "dU" = ( /turf/simulated/wall/r_wall, /area/rnd/anomaly_lab/containment_one) @@ -514,44 +973,74 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_two) -"ea" = ( +"dW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 9 }, -/obj/machinery/door/airlock/maintenance/rnd, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 9 }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"dX" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"ed" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"dY" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"eb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"ec" = ( +/obj/structure/salvageable/bliss, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"ee" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "ef" = ( /obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck4/fore) -"eg" = ( -/obj/structure/cable{ - icon_state = "16-0" - }, -/obj/structure/cable/heavyduty{ - icon_state = "0-4" +"eh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "ei" = ( /obj/structure/railing{ dir = 8 @@ -567,6 +1056,25 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"el" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) +"em" = ( +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "en" = ( /obj/structure/railing{ dir = 1 @@ -596,9 +1104,25 @@ /obj/structure/railing/grey, /turf/simulated/floor/plating, /area/ai_upload) +"et" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "eu" = ( /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) +"ev" = ( +/obj/machinery/light/small/emergency, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "ex" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/plating, @@ -615,31 +1139,25 @@ }, /turf/simulated/floor/wood, /area/library) +"eA" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) "eB" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) "eC" = ( /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"eD" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - id = "PubPrepFront"; - name = "Gateway Shutter"; - pixel_x = 24; - pixel_y = 23; - req_access = list(62) - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "eE" = ( /turf/simulated/floor/plating, /area/main_map/hallway/deck4) @@ -647,24 +1165,53 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/maintenance/deck_four/aft/port) -"eI" = ( -/obj/machinery/camera/network/command, -/turf/simulated/floor/reinforced/airless, -/area/space) +"eG" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"eH" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospheric_field_generator, +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase_shuttle_door"; + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "mobile_miningbase_shuttle_door"; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/port) "eJ" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"eL" = ( -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) "eN" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/port) +"eO" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"eP" = ( +/obj/machinery/requests_console/preset/research{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"eQ" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/airlock_sensor/airlock_exterior{ + pixel_y = -24; + dir = 1 + }, +/obj/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "eR" = ( /obj/machinery/button/remote/blast_door{ dir = 1; @@ -674,10 +1221,62 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"eX" = ( -/obj/map_helper/network_builder/power_cable/green/auto, +"eS" = ( +/obj/machinery/computer/security/mining{ + dir = 4; + name = "xenobiology camera monitor"; + network = list("Xenobiology") + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"eT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/quartermaster/miningdock) +/area/exploration/explorer_prep) +"eU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table/wooden_reinforced, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"eV" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"eW" = ( +/obj/structure/salvageable/server, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"fa" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"fb" = ( +/obj/structure/closet/secure_closet/explorer, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "fc" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical/records) @@ -688,26 +1287,57 @@ /obj/structure/table/fancyblack, /turf/simulated/floor/carpet/bcarpet, /area/main_map/maintenance/deck_four/forward) -"ff" = ( -/obj/effect/floor_decal/techfloor/corner{ +"fe" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(5,19,43,44,67); + dir = 8; + name = "Exploration Equipment Room" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/exploration/explorer_prep) +"fg" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) +"fh" = ( +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"fi" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) -"fm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/no_nightshift{ +"fq" = ( +/obj/machinery/door/airlock/maintenance, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/starboard) +"fr" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/techfloor{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) -"fo" = ( -/obj/machinery/telepad, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) "fs" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, @@ -745,13 +1375,22 @@ /obj/item/book/custom_library/religious, /turf/simulated/floor/wood, /area/library) -"fC" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S" +"fz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/turf/space, -/area/space) +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"fA" = ( +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/starboard) +"fB" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "fD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -761,15 +1400,15 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"fE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"fF" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/machinery/camera/network/engineering{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "fG" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, @@ -784,20 +1423,42 @@ /obj/item/book/custom_library/nonfiction, /turf/simulated/floor/wood, /area/library) -"fJ" = ( +"fK" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/rnd/research) +"fL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "fM" = ( /obj/effect/floor_decal/industrial/loading{ dir = 1 }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"fN" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"fO" = ( +/obj/machinery/camera/network/command, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "fQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -805,9 +1466,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"fS" = ( -/turf/simulated/wall, -/area/gateway/prep_room) "fT" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -815,16 +1473,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"fV" = ( +"fU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) -"fW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/techfloor/corner, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +/area/rnd/xenobiology) "fX" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -843,21 +1495,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/greengrid, /area/ai_upload) -"gc" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, +"gd" = ( +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) +"ge" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) "gf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -866,6 +1514,35 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/greengrid, /area/ai) +"gg" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "gravity_pump" + }, +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ + dir = 8; + id_tag = "gravity_airlock"; + name = "Gravity Generator Airlock"; + pixel_x = 24; + req_access = list(11); + tag_airpump = "gravity_pump"; + tag_chamber_sensor = "gravity_csensor"; + tag_exterior_door = "gravity_outer"; + tag_exterior_sensor = "gravity_esensor"; + tag_interior_door = "gravity_inner"; + tag_interior_sensor = "gravity_isensor" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"gh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "gi" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -892,19 +1569,63 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"gk" = ( -/turf/simulated/wall/r_wall, -/area/rnd/secure_storage/critical/vault1) -"gl" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/port) +"gm" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"gn" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"go" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/cap/hidden, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) +"gp" = ( +/obj/structure/table/reinforced, +/obj/item/communicator, +/obj/item/communicator, +/obj/item/communicator, +/obj/item/communicator, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"gs" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "UpperInnerTeleSciBlastDoor"; + name = "Upper Inner TeleSci Blast Door Button"; + pixel_y = 24 + }, +/obj/machinery/button/remote/blast_door{ + id = "UpperOuterTeleSciBlastDoor"; + name = "Upper Outer TeleSci Blast Door Button"; + pixel_x = -11; + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "gv" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/gateway) -"gw" = ( -/turf/simulated/wall/r_wall, -/area/gateway/prep_room) "gx" = ( /obj/machinery/atmospherics/component/binary/passive_gate/on{ dir = 1; @@ -916,21 +1637,21 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"gz" = ( -/turf/simulated/floor/tiled, -/area/space) +"gy" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/port) "gA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"gC" = ( -/obj/machinery/camera/network/research{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"gB" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "gD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -940,34 +1661,24 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"gE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/camera/network/research{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) "gF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck4/fore) -"gG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-9" - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) "gH" = ( /obj/structure/table, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"gI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "gJ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -980,13 +1691,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) -"gN" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +"gL" = ( +/obj/machinery/door/firedoor, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) +"gM" = ( +/obj/machinery/gravity_generator/main/station, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "gO" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 5 @@ -1000,6 +1713,25 @@ }, /turf/simulated/floor/tiled/monotile, /area/gateway) +"gP" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"gQ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "gT" = ( /obj/structure/cable{ icon_state = "16-0" @@ -1015,21 +1747,13 @@ }, /turf/simulated/floor/plating, /area/ai_upload) -"gV" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"gU" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/structure/railing, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) "gW" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, @@ -1046,45 +1770,99 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) +"ha" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "hb" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"hi" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +"hd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"hh" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/main_map/hallway/deck4/fore) +"hj" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "hk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"hl" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) "hm" = ( /obj/structure/cable/green{ icon_state = "1-8" }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"hn" = ( +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "ho" = ( /obj/structure/lattice, /turf/space/basic, /area/space) +"hp" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"hr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) "hs" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) -"ht" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +"hu" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/main_map/hallway/deck4) +"hv" = ( +/obj/structure/disposalpipe/trunk, +/obj/structure/disposaloutlet, +/obj/machinery/camera/network/research{ + network = list("Xenobiology") + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "hw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1099,6 +1877,14 @@ }, /turf/simulated/floor/plating, /area/ai_upload) +"hy" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) +"hz" = ( +/obj/structure/statue/marble/female, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "hA" = ( /obj/structure/table/woodentable, /obj/item/duct_tape_piece, @@ -1115,29 +1901,39 @@ }, /turf/simulated/floor/reinforced, /area/gateway) -"hC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 +"hD" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/camera/motion{ - network = list("Research","Command") +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"hF" = ( +/obj/structure/table/standard, +/obj/machinery/computer/atmoscontrol/laptop{ + monitored_alarm_ids = list("xenopenvent"); + req_one_access = list(47,24,11) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"hG" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) -"hE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/aft/port) "hH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1167,9 +1963,17 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/gateway) -"hM" = ( -/turf/simulated/wall, -/area/space) +"hL" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "hN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1195,12 +1999,33 @@ }, /turf/space, /area/space) +"hR" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "hS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) +"hU" = ( +/obj/structure/table/reinforced, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "hV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1214,8 +2039,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -1234,19 +2058,27 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"ic" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor/airlock_exterior{ - pixel_y = -24 +"hZ" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 8 +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"ib" = ( +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "smuggler_door1"; + pixel_x = 32 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/main_map/maintenance/deck_four/aft/port) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"id" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "ie" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -1256,37 +2088,65 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"ig" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" +"if" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_four/aft/port) -"ih" = ( -/obj/structure/salvageable/bliss, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/disposal, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"ii" = ( +/obj/structure/table/reinforced, +/obj/item/multitool/triumph_buffered, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "ij" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/miningdock) -"is" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +"ik" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio4"; + name = "Containment Blast Doors"; + opacity = 0 }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"im" = ( +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab/chamber) +"ip" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"iq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"it" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) "iv" = ( /obj/structure/curtain/black{ anchored = 1; @@ -1294,21 +2154,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/main_map/maintenance/deck_four/forward) -"iw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) "ix" = ( /obj/machinery/door/airlock/glass/mining{ name = "Cargo Bay"; @@ -1317,39 +2162,37 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/miningdock) -"iA" = ( +"iz" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Cargo Bay"; + req_access = list(31); + req_one_access = list() + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/steel_ridged, +/area/quartermaster/miningdock) "iB" = ( /obj/structure/filingcabinet{ desc = "A large cabinet with drawers. They seem to be ominously empty."; name = "Classified Science Records" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"iD" = ( -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "PubPrepFront"; - layer = 3.3; - name = "Gateway Prep Shutter" +"iC" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/space, +/area/rnd/telescience_lab/chamber) "iE" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - layer = 3.3; pixel_y = 30 }, /obj/machinery/conveyor_switch/oneway{ @@ -1364,6 +2207,27 @@ "iF" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) +"iG" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"iH" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/wood, +/area/library) +"iI" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "iK" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 @@ -1386,11 +2250,44 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"iM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/landmark/spawnpoint/job/cyborg, +/turf/simulated/floor/bluegrid, +/area/ai_upload) +"iO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"iP" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) "iQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) +"iR" = ( +/obj/machinery/button/remote/blast_door{ + id = "tele_sci_vent"; + name = "Emergency Telesci Vent"; + pixel_x = -11; + pixel_y = -24; + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "iS" = ( /obj/structure/sink/kitchen{ name = "sink"; @@ -1398,9 +2295,6 @@ }, /turf/simulated/floor/plating, /area/main_map/hallway/deck4) -"iT" = ( -/turf/simulated/floor/bluegrid, -/area/gateway/prep_room) "iU" = ( /obj/structure/bookcase/legal/combo, /obj/item/book/manual/standard_operating_procedure, @@ -1411,6 +2305,22 @@ }, /turf/simulated/floor/wood, /area/library) +"iV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "iW" = ( /obj/machinery/door/morgue{ dir = 2; @@ -1418,16 +2328,37 @@ }, /turf/simulated/floor/tiled/dark, /area/main_map/maintenance/deck_four/forward) +"iY" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "iZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/gateway) -"jc" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +"ja" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + req_one_access = list(5,19,43,44,67) }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) +/turf/simulated/floor/plating, +/area/exploration/explorer_prep) +"jb" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/structure/closet/secure_closet/explorer, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "jd" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas, @@ -1453,11 +2384,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ai) -"jf" = ( -/turf/simulated/wall/r_wall{ - can_open = 1 - }, -/area/space) "jg" = ( /obj/machinery/message_server, /turf/simulated/floor/tiled/techfloor, @@ -1478,37 +2404,129 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) +"jj" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "jk" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) -"jl" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/supply, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, +"jm" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/engineering/aft_hallway) +"jo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "16-0" + icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"jr" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) +"js" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 1; + pressure_resistance = 750; + target_pressure = 750 }, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/area/rnd/telescience_lab) +"ju" = ( +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) "jv" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) -"jx" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"jw" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "jy" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck4) +"jz" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"jA" = ( +/obj/machinery/button/remote/blast_door{ + id = "xenobiovs"; + name = "Divider Blast Doors"; + pixel_x = -38; + req_access = list(55) + }, +/obj/machinery/button/remote/blast_door{ + id = "xenobio2"; + name = "Containment Blast Doors"; + pixel_x = -25; + pixel_y = -8; + req_access = list(55) + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + id = "xenobio1"; + name = "Containment Blast Doors"; + pixel_x = -25; + pixel_y = 8; + req_access = list(55) + }, +/obj/machinery/camera/network/research{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) +"jB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "jC" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four) @@ -1518,10 +2536,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"jE" = ( -/obj/machinery/door/airlock/engineering, -/turf/simulated/floor/tiled, -/area/space) +"jF" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/starboard) "jG" = ( /obj/structure/table/woodentable, /obj/item/pen/invisible, @@ -1538,9 +2556,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"jH" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck4/fore) "jI" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -1562,16 +2577,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"jK" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "jL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1584,6 +2589,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) +"jM" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"jN" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"jO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"jP" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "jQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -1594,42 +2624,173 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) +"jR" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) +"jS" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/valve{ + name = "EMERGENCY VENT TO SPACE" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "jV" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 }, /turf/simulated/floor/tiled/monotile, /area/gateway) +"jW" = ( +/obj/machinery/atmospherics/component/unary/freezer{ + dir = 1; + icon_state = "freezer_1"; + power_setting = 20; + set_temperature = 73; + use_power = 1 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) +"jZ" = ( +/obj/structure/stairs/spawner/north, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"kb" = ( +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/access_button/airlock_exterior{ + dir = 1; + pixel_y = -24; + master_tag = "smugler_airlock1" + }, +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "kc" = ( /obj/machinery/door/airlock/maintenance/common, /obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four) -"ke" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) +"kd" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"kf" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/gravity_gen) +"kg" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair/comfy/beige{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) "ki" = ( /obj/machinery/gateway{ dir = 9 }, /turf/simulated/floor/reinforced, /area/gateway) -"kj" = ( -/obj/effect/floor_decal/industrial/warning{ +"kl" = ( +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"kk" = ( -/obj/structure/statue/marble/venus, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"kn" = ( +/obj/machinery/power/apc/south_mount, +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/forward/port) "kq" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/starboard) +"kr" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"ks" = ( +/turf/simulated/floor/tiled/techfloor, +/area/engineering/gravity_gen) +"ku" = ( +/obj/structure/bed/chair/sofa/brown{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4/fore) +"kv" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/maintenance/deck_four/forward) +"kw" = ( +/obj/structure/table/rack/shelf, +/turf/simulated/floor/reinforced, +/area/rnd/secure_storage/lower) +"kx" = ( +/obj/landmark/spawnpoint/job/cyborg, +/turf/simulated/floor/tiled/techfloor, +/area/ai_upload) +"ky" = ( +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/aft/port) +"kz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"kA" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"kB" = ( +/obj/item/storage/box/nifsofts_mining, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/camera/network/cargo{ + dir = 4 + }, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/duct_tape_roll, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "kD" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1640,6 +2801,19 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"kE" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/adv, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"kF" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/item/barrier_tape_segment/atmos, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) "kG" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -1650,6 +2824,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"kH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"kJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "kK" = ( /obj/landmark/spawnpoint/job/chaplain, /obj/item/radio/intercom{ @@ -1675,6 +2864,17 @@ "kN" = ( /turf/simulated/wall/prepainted/civilian, /area/library/study) +"kO" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice, +/turf/space, +/area/rnd/telescience_lab/chamber) +"kR" = ( +/obj/structure/ore_box, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "kS" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -1685,6 +2885,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/gateway) +"kT" = ( +/obj/structure/lattice, +/turf/simulated/wall/r_wall, +/area/space) +"kU" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "kW" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/component/binary/pump{ @@ -1693,6 +2901,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"kY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, +/obj/structure/closet/hydrant{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "kZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -1702,25 +2923,36 @@ "la" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/main_map/maintenance/deck_four/aft/port) -"ld" = ( +"lb" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/miningdock) -"lf" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Gateway Civilian Prep" +/obj/structure/cable/green{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) -"li" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"lc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"ld" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) +"lg" = ( +/obj/structure/girder/reinforced, +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_four/starboard) +"lh" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "lj" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -1731,19 +2963,71 @@ }, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"lk" = ( +/obj/machinery/computer/telescience{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "ll" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/reinforced, /area/gateway) -"lo" = ( -/obj/structure/flora/tree/jungle, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research) +"lm" = ( +/obj/structure/bed/roller, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "lp" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward/starboard) +"lq" = ( +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/camera/network/cargo, +/obj/machinery/suit_storage_unit/mining{ + boots_stored_TYPE = /obj/item/clothing/shoes/magboots + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"ls" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"lt" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/rnd/telescience_lab/chamber) "lu" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -1763,28 +3047,30 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"ly" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "lz" = ( /turf/simulated/floor/reinforced, /area/gateway) -"lA" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) -"lE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +"lB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) +"lD" = ( +/obj/machinery/disposal, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) "lF" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_four/aft/starboard) +"lG" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "lH" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -1794,6 +3080,10 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) +"lI" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "lJ" = ( /obj/machinery/conveyor{ dir = 1 @@ -1804,31 +3094,76 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"lK" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/machinery/door/blast/regular{ - id = "mobile_miningbase" +"lL" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"lM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"lO" = ( +/obj/structure/ladder{ + pixel_y = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, /turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/port) -"lN" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/area/rnd/telescience_lab/chamber) "lP" = ( /turf/simulated/wall/prepainted, /area/maintenance/trash_pit) -"lS" = ( -/obj/effect/floor_decal/spline/plain, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_access" +"lQ" = ( +/obj/structure/table/steel, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 12 + }, +/obj/item/multitool{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/stack/cable_coil, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"lR" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"lT" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379 + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "lU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1848,23 +3183,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"lW" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "lX" = ( /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"lZ" = ( -/obj/structure/table/reinforced, -/obj/item/multitool/triumph_buffered, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +"lY" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "ma" = ( /obj/machinery/ai_slipper, /obj/structure/cable{ @@ -1878,54 +3202,113 @@ /obj/structure/stairs/spawner/south, /turf/simulated/floor/plating, /area/rnd/research) -"mg" = ( -/turf/simulated/floor/plating, -/area/engineering/ftl) -"mh" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +"mc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"me" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) +"mf" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"mn" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"mi" = ( +/obj/item/slime_extract/grey, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"mj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "6-8" + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"mk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/rnd/xenobiology) +"ml" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) "mo" = ( /obj/structure/salvageable/computer_os, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"mp" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mq" = ( +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_monitoring) "mr" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"mx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"mt" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-10" - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) +"mu" = ( +/turf/simulated/wall, +/area/main_map/maintenance/deck_three) +"mv" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"mz" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4/fore) "mA" = ( /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four) -"mD" = ( -/obj/structure/railing{ - dir = 8 +"mB" = ( +/obj/structure/railing, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) +"mC" = ( +/obj/structure/table/standard, +/obj/item/slime_scanner, +/obj/item/slime_scanner, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/obj/structure/railing{ +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four) +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "mE" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1936,51 +3319,67 @@ }, /turf/simulated/floor/tiled/monotile, /area/gateway) -"mG" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"mH" = ( -/obj/structure/bed/chair/comfy/black, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) +"mF" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "mI" = ( /obj/machinery/atmospherics/component/unary/heater{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"mJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +"mK" = ( +/obj/machinery/door/airlock/glass/research{ + name = "Xenoarch"; + req_access = list(65) }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/rnd/anomaly_lab) "mL" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 }, /turf/simulated/floor/wood, /area/library) -"mM" = ( -/turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) -"mO" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/space) +"mN" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"mQ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 1 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" + }, +/area/rnd/xenobiology) "mR" = ( /turf/simulated/floor/bluegrid, /area/ai) +"mS" = ( +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "mV" = ( /obj/structure/bookcase/legal/combo, /obj/item/book/manual/standard_operating_procedure, @@ -1991,6 +3390,30 @@ }, /turf/simulated/floor/wood, /area/library) +"mW" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"mX" = ( +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Telescience Tower" + }, +/obj/machinery/button/remote/blast_door{ + id = "OuterTeleSciBlastDoor"; + name = "Lower Outer TeleSci Blast Door Button"; + pixel_x = -11; + pixel_y = 24 + }, +/obj/machinery/button/remote/blast_door{ + id = "InnerTeleSciBlastDoor"; + name = "Lower Inner TeleSci Blast Door Button"; + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "mY" = ( /turf/simulated/wall/r_wall, /area/library/study) @@ -2002,6 +3425,33 @@ "na" = ( /turf/simulated/floor/tiled/techmaint, /area/rnd/research) +"nb" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"nc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/research{ + name = "Telescience Storage" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "nd" = ( /turf/simulated/wall/r_wall, /area/library) @@ -2014,71 +3464,124 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"ng" = ( -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"nm" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"nn" = ( +"ni" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) +"nj" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"nk" = ( +/obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/gateway) +"no" = ( +/obj/structure/statue/marble/venus, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "np" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"nu" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +"nq" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/space/basic, +/area/space) +"nr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) +"nt" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access = list(); + req_one_access = list(7,29) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"nv" = ( +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "nw" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_four/forward) +"nx" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad" + }, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "nz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 }, /turf/simulated/floor/reinforced, /area/gateway) -"nC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"nD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/purple{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) -"nH" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/main_map/maintenance/deck_four/forward) -"nI" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) +"nE" = ( +/obj/structure/closet/radiation, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_monitoring) +"nG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/mains_pipe/cap/hidden{ dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/exploration/explorer_prep) +"nH" = ( +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/main_map/maintenance/deck_four/forward) +"nJ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four) +"nK" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "nL" = ( /obj/machinery/camera/network/research_outpost{ dir = 4; @@ -2086,39 +3589,77 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"nM" = ( -/obj/machinery/door/airlock/glass/engineering, +"nO" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/mains_pipe/split/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/space) +/area/exploration/explorer_prep) +"nQ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "nR" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) +"nS" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) "nT" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"nU" = ( -/obj/machinery/airlock_sensor/airlock_interior{ - dir = 1; - pixel_y = -24 +"nW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"nX" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"nY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/map_helper/airlock/sensor/int_sensor, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"nZ" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/port) -"nV" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) "oa" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward/starboard) +"ob" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"oc" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) "og" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/techfloor{ @@ -2145,13 +3686,22 @@ "ok" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/starboard) -"ol" = ( +"on" = ( +/obj/structure/stairs/spawner/west, /obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) +"oo" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/railing, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research) +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) "op" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas, @@ -2162,6 +3712,12 @@ /obj/item/tank/emergency/oxygen/engi, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"oq" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "or" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2180,11 +3736,21 @@ /obj/machinery/blackbox_recorder, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"ou" = ( +"ot" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) +/area/main_map/maintenance/deck_four/aft/starboard) +"ov" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"ow" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/port) "ox" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -2195,7 +3761,6 @@ "oy" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - layer = 3.3; pixel_y = 30 }, /obj/effect/floor_decal/industrial/warning{ @@ -2203,10 +3768,32 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"oB" = ( -/obj/machinery/holopad, +"oz" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"oA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/table/rack/shelf, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/exploration/explorer_prep) "oC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2216,12 +3803,12 @@ }, /turf/simulated/floor/greengrid, /area/ai) -"oD" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"oF" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/forward) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "oH" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/bed/chair{ @@ -2229,6 +3816,24 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"oI" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"oJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"oK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/atmospherics/mains_pipe/split/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "oL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/door/blast/regular{ @@ -2237,16 +3842,62 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"oM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) "oN" = ( /obj/machinery/camera/network/command{ dir = 4 }, /turf/simulated/floor/greengrid, /area/ai) +"oO" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"oP" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/mains_pipe/split/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "oQ" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) +"oR" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/science{ + name = "Secure Storage"; + req_one_access = list(20,30) + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/access_button/airlock_interior{ + master_tag = "secure_science_stroage_airlock_control"; + pixel_x = -24; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) "oS" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -2255,15 +3906,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"oT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +"oW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) "oX" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable/green{ @@ -2272,13 +3919,11 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/library) -"oZ" = ( -/obj/structure/closet/secure_closet/personal, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +"oY" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) "pa" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck4) @@ -2299,6 +3944,15 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood, /area/library) +"pd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "pe" = ( /obj/machinery/air_alarm/monitor/isolation{ alarm_id = "isolation_two"; @@ -2307,34 +3961,41 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) -"pf" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) "pg" = ( /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" }, /turf/simulated/floor/wood, /area/library) -"ph" = ( -/obj/machinery/light/small{ - dir = 8 +"pi" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "pj" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/port) -"pl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"pk" = ( +/obj/structure/bed/chair/office/light{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"pm" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"po" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "pp" = ( /obj/effect/debris/cleanable/blood/splatter, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -2348,6 +4009,13 @@ /obj/item/mop, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4) +"ps" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "cludge_hanger" + }, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/forward/port) "pt" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -2357,9 +4025,19 @@ "pu" = ( /turf/simulated/shuttle/plating/carry, /area/main_map/maintenance/deck_four/aft/port) -"px" = ( -/obj/structure/morgue/crematorium{ - id = "crematorium" +"pv" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"pw" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"px" = ( +/obj/structure/morgue/crematorium{ + id = "crematorium" }, /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward) @@ -2394,16 +4072,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) +"pE" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) "pF" = ( /turf/simulated/wall, /area/main_map/hallway/deck4) -"pH" = ( -/obj/structure/table/bench/standard, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +"pG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "pJ" = ( /turf/simulated/wall, /area/quartermaster/miningdock) @@ -2420,6 +4104,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) +"pP" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/rnd/secure_storage/critical) "pR" = ( /obj/machinery/door/airlock/glass_external{ name = "Isolation Room 1"; @@ -2446,12 +4136,29 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) +"pT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "pU" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" }, /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward/starboard) +"pW" = ( +/obj/structure/salvageable/server_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"pX" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "pY" = ( /obj/machinery/porta_turret/stationary, /obj/machinery/light{ @@ -2459,10 +4166,49 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"pZ" = ( -/obj/structure/closet/secure_closet/personal, +"qa" = ( +/obj/structure/table/woodentable, +/obj/machinery/photocopier/faxmachine{ + department = "Pathfinder's Office"; + pixel_x = 2; + pixel_y = 4 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"qb" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"qc" = ( +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase"; + dir = 4 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/aft/port) +"qe" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_inner"; + req_access = list(11); + name = "Gravity Generator Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +/area/engineering/gravity_gen) "qg" = ( /turf/simulated/floor/greengrid, /area/ai) @@ -2476,6 +4222,40 @@ }, /turf/space, /area/space) +"qm" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"qn" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"qo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"qp" = ( +/mob/living/simple_mob/living_statue, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"qq" = ( +/turf/simulated/wall{ + can_open = 1 + }, +/area/main_map/maintenance/deck_four/aft) "qr" = ( /turf/simulated/wall, /area/library) @@ -2483,11 +4263,28 @@ /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"qt" = ( -/obj/machinery/door/blast/regular{ +"qu" = ( +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"qv" = ( +/obj/structure/stairs/spawner/south, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) +"qw" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + req_one_access = list(31); + name = "Mining Operations" + }, +/turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/miningdock) "qx" = ( /obj/spawner/window/reinforced/full/firelocks, @@ -2499,41 +4296,88 @@ }, /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/forward/starboard) -"qC" = ( +"qz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"qA" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"qB" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"qD" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"qF" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/button/remote/blast_door{ + id = "gateway_access"; + name = "Gateway Access"; + pixel_x = 24 + }, /obj/machinery/door/blast/regular{ + dir = 2; + id = "gateway_access" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/gateway) +"qG" = ( +/obj/machinery/camera/network/research{ dir = 4; - id = "smuggler_door1" + network = list("Xenobiology") }, -/turf/simulated/floor/plating, -/area/space) -"qH" = ( -/obj/structure/table/fancyblack, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) -"qI" = ( -/obj/machinery/door/airlock/science{ - name = "Secure Storage"; - req_one_access = list(20,30) +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" }, -/obj/map_helper/airlock/door/int_door, -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) -"qM" = ( -/obj/machinery/camera/network/research_outpost{ - dir = 4; - network = list("Research Outpost","Command") +/area/rnd/xenobiology) +"qJ" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) -"qO" = ( -/obj/structure/closet/secure_closet/personal, -/obj/machinery/camera/network/research_outpost{ - dir = 4; - network = list("Research Outpost","Command") +/area/main_map/hallway/deck4/fore) +"qK" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +/area/engineering/aft_hallway) +"qP" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) +"qQ" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) "qR" = ( /obj/structure/sink/kitchen{ name = "sink"; @@ -2542,14 +4386,28 @@ /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/starboard) -"qS" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1379 +"qT" = ( +/obj/structure/dogbed, +/obj/item/toy/plushie/squid/pink, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"qU" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/library) +"qV" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 }, -/obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck4/fore) "qW" = ( /obj/structure/filingcabinet{ desc = "A large cabinet with drawers. They seem to be ominously empty."; @@ -2562,6 +4420,16 @@ /obj/machinery/door/airlock, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck4/fore) +"qY" = ( +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) "qZ" = ( /obj/machinery/light_switch{ dir = 8; @@ -2569,15 +4437,22 @@ }, /turf/simulated/floor/wood, /area/library) -"ra" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) -"re" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"rb" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"rd" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, /turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +/area/exploration/explorer_prep) +"rf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "rg" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -2586,10 +4461,48 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"rh" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "ri" = ( /obj/machinery/gateway/centerstation, /turf/simulated/floor/reinforced, /area/gateway) +"rj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"rk" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"rl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) "rm" = ( /obj/structure/bookcase{ name = "bookcase (Fiction)" @@ -2598,15 +4511,21 @@ /obj/item/book/manual/the_humanized_mice, /turf/simulated/floor/wood, /area/library) -"rn" = ( +"ro" = ( +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"rp" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "rq" = ( /obj/machinery/door/airlock/science{ name = "Secure Storage"; @@ -2630,13 +4549,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) -"rs" = ( -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - pressure_resistance = 750; - target_pressure = 750 +"rr" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/forward) +"rt" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/glass, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "rv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2650,21 +4582,36 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"rA" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/library) -"rB" = ( +"ry" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio1"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"rz" = ( /obj/structure/cable/green{ - icon_state = "0-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/manifold/hidden{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) -"rC" = ( -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck4/fore) +/area/main_map/maintenance/deck_four/forward) +"rA" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/library) "rD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2680,48 +4627,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"rF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +"rE" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) "rH" = ( /obj/machinery/gateway{ dir = 5 }, /turf/simulated/floor/reinforced, /area/gateway) -"rI" = ( -/turf/simulated/wall{ - can_open = 1 - }, -/area/space) -"rJ" = ( -/obj/structure/closet/excavation, -/obj/item/multitool, -/obj/item/multitool, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "rK" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"rL" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1379 +"rM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/airlock_sensor{ - pixel_y = -24; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "rN" = ( /turf/simulated/wall/r_wall{ can_open = 1 @@ -2743,21 +4673,52 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/white, /area/rnd/anomaly_lab) +"rP" = ( +/obj/machinery/door/blast/regular{ + id = "xenobiovs"; + layer = 8; + name = "Divider Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "rQ" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4/fore) -"rS" = ( -/obj/spawner/window/reinforced/full, -/turf/simulated/floor/plating, -/area/outpost/mining_main/outpost/near_gateway) -"rX" = ( -/obj/machinery/door/airlock/maintenance, +"rT" = ( +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) +"rU" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck4/fore) -"rZ" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/main_map/hallway/deck4) +/area/main_map/maintenance/deck_four/starboard) +"rV" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/mining{ + boots_stored_TYPE = /obj/item/clothing/shoes/magboots + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"rW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "sa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2769,18 +4730,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"sd" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/main_map/maintenance/deck_four/aft/port) -"sg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +"sb" = ( +/obj/structure/table/steel, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"se" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"sf" = ( +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "sh" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/bookbinder, @@ -2793,6 +4755,40 @@ /obj/structure/lattice, /turf/space, /area/space) +"sj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"sk" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"sm" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) "sn" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward/port) @@ -2805,6 +4801,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) +"sp" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/port) "sq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2828,16 +4830,35 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"sw" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +"ss" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) +"st" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/light{ +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"su" = ( +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"sv" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "sx" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/starboard) @@ -2852,18 +4873,11 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) -"sz" = ( -/turf/simulated/floor/tiled/monotile, -/area/gateway/prep_room) -"sA" = ( -/obj/structure/table/bench/standard, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) "sC" = ( /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc/super/south_bump, +/obj/machinery/power/apc/super/south_mount, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) "sD" = ( @@ -2884,24 +4898,6 @@ /obj/item/clothing/head/bio_hood/anomaly, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"sF" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S-Pass" - }, -/obj/structure/catwalk, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) -"sG" = ( -/obj/structure/girder/reinforced, -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "sH" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -2912,12 +4908,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"sI" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) "sJ" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/forward) @@ -2933,47 +4923,48 @@ /obj/structure/flora/ausbushes/palebush, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"sO" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ +"sP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/port) "sQ" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/library) -"sT" = ( -/obj/machinery/button/remote/blast_door{ - id = "PubPrep"; - name = "Gateway Shutter"; - pixel_x = -25; - pixel_y = 25; - req_access = list(62) +"sR" = ( +/obj/structure/window/reinforced, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_four/aft/port) -"sU" = ( -/turf/simulated/wall/prepainted/civilian, -/area/main_map/maintenance/deck_four) -"sV" = ( -/obj/machinery/light{ +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"sW" = ( +/obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +/area/main_map/hallway/deck4) +"sX" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) "sZ" = ( /turf/simulated/floor/plating, /area/space) -"tb" = ( -/obj/structure/transit_tube/station{ - dir = 4 - }, -/obj/structure/transit_tube_pod{ - dir = 1 +"ta" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_four/aft/port) +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "tc" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -2985,6 +4976,10 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) +"td" = ( +/obj/machinery/door/airlock/glass/research, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) "tf" = ( /obj/structure/table/steel_reinforced, /obj/item/folder{ @@ -2998,27 +4993,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"ti" = ( -/obj/structure/table/woodentable, -/obj/item/flashlight/lamp{ - pixel_y = 12 +"tg" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) +/obj/structure/lattice, +/turf/space/basic, +/area/space) "tj" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) -"tk" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" +"tl" = ( +/obj/machinery/smartfridge/secure/extract, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "tm" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/lavendergrass, @@ -3028,23 +5022,14 @@ /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/plating, /area/quartermaster/miningdock) +"to" = ( +/obj/machinery/atmospherics/pipe/tank, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "tp" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"tq" = ( -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/machinery/suit_cycler/mining{ - req_access = null - }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) -"tr" = ( -/obj/machinery/mech_recharger, -/turf/simulated/floor/bluegrid, -/area/gateway/prep_room) "tt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -3071,10 +5056,24 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) -"tv" = ( -/obj/structure/statue/marble/male, -/turf/simulated/floor/plating, -/area/space) +"tw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/vending/medical{ + req_access = null; + req_one_access = list(5,44) + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "tx" = ( /obj/structure/bookcase{ name = "bookcase (Fiction)" @@ -3095,24 +5094,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"tC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/machinery/camera/network/research{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) "tD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"tG" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +"tE" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"tF" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"tH" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "tJ" = ( /obj/machinery/door/airlock/maintenance{ name = "Trash Pit" @@ -3127,6 +5135,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) +"tL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "tN" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3152,6 +5169,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) +"tP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "tQ" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" @@ -3159,62 +5182,25 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward/starboard) -"tR" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"tS" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "tT" = ( /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) -"tV" = ( -/obj/structure/stairs/spawner/south, -/obj/structure/railing{ +"tX" = ( +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/structure/railing{ - dir = 4 +/obj/effect/floor_decal/industrial/danger{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four) -"tW" = ( -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/access_button/airlock_exterior{ - dir = 1; - pixel_y = -24; - master_tag = "smugler_airlock1" +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) +"uc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 }, -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plating, -/area/space) -"tY" = ( -/obj/machinery/mining/drill, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"ub" = ( -/mob/living/simple_mob/living_statue, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ud" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 @@ -3231,12 +5217,17 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"uf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +"ug" = ( +/obj/structure/salvageable/computer_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"uh" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"ui" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/tether/exploration/pathfinder_office) "uk" = ( /obj/machinery/light/small{ dir = 4 @@ -3252,30 +5243,95 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) -"uo" = ( +"ul" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/field_medic, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"un" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"uq" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S" +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"up" = ( +/obj/structure/frame/computer{ + dir = 1 }, -/turf/space, -/area/space) -"ur" = ( -/obj/machinery/camera/network/research, -/obj/effect/floor_decal/techfloor{ +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"us" = ( +/obj/structure/table/steel, +/obj/item/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/binoculars{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/binoculars{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) +"ut" = ( +/obj/structure/disposalpipe/trunk, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"uu" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/rnd/research) "uv" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) @@ -3286,16 +5342,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"ux" = ( -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) -"uy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) "uz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -3305,6 +5351,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_one) +"uA" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/rnd/telescience_lab/foyer) "uC" = ( /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" @@ -3317,19 +5366,6 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"uG" = ( -/obj/effect/floor_decal/spline/plain, -/obj/machinery/button/remote/blast_door{ - id = "gateway_access"; - name = "Gateway Access"; - pixel_x = 24 - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_access" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) "uH" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -3353,23 +5389,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/ai) -"uL" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/structure/cable/orange{ - icon_state = "1-2" +"uK" = ( +/obj/structure/closet/crate{ + rigged = 1; + desc = "A rectangular steel crate with all identifying marks seemingly grinded off. Looks sketchy at best"; + name = "sketchy crate" }, +/obj/item/radio/electropack, /turf/simulated/floor/plating, -/area/quartermaster/miningdock) -"uQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/airlock{ - name = "General Storage"; - req_access = list(47) +/area/main_map/maintenance/deck_four/aft) +"uM" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four) +"uO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "uR" = ( /obj/structure/transit_tube/station{ dir = 1 @@ -3379,13 +5418,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward/starboard) -"uT" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S-Pass" - }, -/obj/structure/lattice, -/turf/space, -/area/space) "uU" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, @@ -3397,21 +5429,49 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"uW" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) "uX" = ( /turf/simulated/wall/r_wall, /area/rnd/research/testingrange) +"uY" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) "va" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/port) -"vd" = ( -/obj/structure/table/reinforced, -/obj/item/roller, -/obj/item/roller, -/obj/machinery/camera/network/research_outpost, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +"vc" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"ve" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"vf" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "vg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3441,15 +5501,47 @@ "vj" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/anomaly_lab/containment_two) -"vn" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +"vk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"vl" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"vm" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "vo" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4) +"vp" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "vr" = ( /turf/simulated/wall/r_wall, /area/quartermaster/miningdock) @@ -3457,10 +5549,39 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) +"vt" = ( +/obj/machinery/door/firedoor/glass{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass/exploration{ + name = "Explorer Prep"; + req_access = list(); + req_one_access = list(19,43,67) + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "vu" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/starboard) +"vw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "vx" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3498,37 +5619,84 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) +"vB" = ( +/obj/structure/transit_tube/station{ + dir = 8 + }, +/obj/structure/transit_tube_pod, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"vC" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 32 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "vD" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/hallway/deck4) -"vG" = ( +"vE" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"vH" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/miningdock) -"vJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-2" }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) +"vI" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"vK" = ( +/obj/machinery/recharge_station, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/quartermaster/office) +"vM" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/ai_upload) +"vO" = ( +/obj/structure/closet/secure_closet/miner, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "vP" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/miningdock) +"vQ" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio2"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"vR" = ( +/obj/machinery/door/airlock/glass/engineering, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/aft_hallway) "vS" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical/vault1) @@ -3538,10 +5706,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"vU" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/tiled, -/area/space) "vV" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -3558,12 +5722,89 @@ }, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"vX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"vY" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"vZ" = ( +/obj/machinery/door/airlock/science{ + name = "Pathfinder"; + req_one_access = list(44) + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "wa" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"wb" = ( +/obj/structure/closet/crate/corporate/nanotrasen, +/turf/simulated/floor/reinforced, +/area/rnd/secure_storage/lower) +"wc" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "xenobio7"; + name = "Containment Blast Doors"; + pixel_x = 24; + pixel_y = 24; + req_access = list(55) + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"wd" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"we" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 7 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"wf" = ( +/obj/machinery/telepad, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab/chamber) "wg" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3581,21 +5822,15 @@ /obj/machinery/gateway, /turf/simulated/floor/reinforced, /area/gateway) -"wj" = ( -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plating, -/area/space) -"wl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"wm" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"wp" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) +/area/rnd/research) "wq" = ( /obj/structure/railing, /obj/structure/railing{ @@ -3604,11 +5839,16 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) -"wt" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck4) +"wr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"ws" = ( +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/wall, +/area/main_map/maintenance/deck_four/forward/port) "wu" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -3628,59 +5868,62 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"wz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +"wx" = ( /obj/structure/cable/green{ - icon_state = "6-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) -"wA" = ( -/obj/machinery/light_switch{ - name = "light switch "; - pixel_y = 30 +/area/main_map/hallway/deck4/fore) +"wy" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light{ +/obj/machinery/airlock_sensor{ + pixel_y = -24; dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) -"wC" = ( -/obj/machinery/atmospherics/component/unary/engine/bigger, -/turf/simulated/shuttle/plating/carry, -/area/main_map/maintenance/deck_four/aft/port) -"wD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"wB" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/camera/network/research{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/monotile, +/area/rnd/anomaly_lab) +"wC" = ( +/obj/machinery/atmospherics/component/unary/engine/bigger, +/turf/simulated/shuttle/plating/carry, +/area/main_map/maintenance/deck_four/aft/port) +"wE" = ( +/obj/machinery/door/blast/regular/open, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"wG" = ( +/turf/simulated/wall/r_wall, +/area/rnd/xenobiology) "wH" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) -"wI" = ( -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/engineering, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) +"wJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "wK" = ( /turf/simulated/floor/tiled/techfloor, /area/quartermaster/miningdock) @@ -3704,6 +5947,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"wO" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) +"wP" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) "wQ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3730,33 +5982,126 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_one) -"wS" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) -"wV" = ( -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/starboard) -"xb" = ( -/obj/structure/railing, -/obj/structure/railing{ +"wT" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/wood, /area/main_map/maintenance/deck_four/forward) -"xc" = ( +"wU" = ( /obj/machinery/door/airlock/maintenance/common, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) +"wV" = ( /turf/simulated/floor/plating, -/area/main_map/hallway/deck4/fore) -"xd" = ( +/area/main_map/maintenance/deck_four/starboard) +"wW" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/starboard) +"wY" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(11) + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"xa" = ( +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) +"xb" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"xd" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/main_map/maintenance/deck_four/port) -"xf" = ( -/obj/machinery/door/airlock/maintenance/engi, +"xe" = ( +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/structure/table/standard, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"xh" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"xi" = ( +/obj/structure/table/standard, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/weldingtool, +/obj/item/weldingtool, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"xj" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab) +"xk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"xl" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) +"xm" = ( +/obj/machinery/atmospherics/component/binary/pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"xn" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "gateway_access" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/gateway) +"xo" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor/glass, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/space) +/area/rnd/anomaly_lab) "xp" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -3765,33 +6110,49 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) +"xs" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "xt" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 }, /turf/simulated/floor/tiled/techfloor, /area/gateway) -"xu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/table/rack/shelf/steel, -/obj/item/storage/toolbox/emergency, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"xv" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"xx" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 8 + }, +/obj/structure/curtain/open/shower/engineering, +/turf/simulated/floor/tiled/white, +/area/engineering/gravity_gen) +"xw" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "xy" = ( /obj/structure/bookcase{ name = "bookcase (Religious)" @@ -3804,10 +6165,7 @@ /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) "xB" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -3817,18 +6175,26 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"xC" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +"xE" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"xG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/trash_pit) "xH" = ( /obj/structure/table/fancyblack, /turf/simulated/floor/carpet/bcarpet, @@ -3844,6 +6210,23 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) +"xK" = ( +/obj/machinery/holopad, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"xO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "xP" = ( /obj/structure/railing/grey{ dir = 4 @@ -3854,20 +6237,57 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) -"xT" = ( -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_four/aft/port) -"xX" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible, -/turf/simulated/floor/plating, -/area/space) +"xV" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/gateway) +"xW" = ( +/obj/mecha/combat/fighter/cludge{ + dir = 4 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) "ya" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"yb" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/camera/network/research{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"yc" = ( +/obj/machinery/pipedispenser, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"yd" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab/foyer) "yg" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -3886,28 +6306,34 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) -"yl" = ( -/obj/structure/stairs/spawner/south, -/obj/structure/railing{ +"yi" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"yk" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"yn" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"yo" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/railing{ +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"yq" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_four/aft/port) -"ym" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"yr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/exploration/explorer_prep) "yt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3920,6 +6346,16 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) +"yw" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/obj/machinery/disposal/wall, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "yy" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3929,6 +6365,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"yz" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) +"yB" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "yC" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing/grey{ @@ -3936,12 +6399,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"yE" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"yF" = ( +/obj/structure/table/bench/padded, +/obj/landmark/spawnpoint/job/shaft_miner, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "yG" = ( /obj/structure/bookcase{ name = "bookcase (Reference)" @@ -3949,12 +6411,34 @@ /obj/item/book/manual/chef_recipes, /turf/simulated/floor/wood, /area/library) -"yH" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/railing, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research) +"yI" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) +"yJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"yK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"yL" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "yM" = ( /obj/structure/filingcabinet, /obj/machinery/air_alarm{ @@ -3980,20 +6464,35 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"yV" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +"yP" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 }, -/obj/item/communicator, -/obj/item/communicator, -/obj/item/communicator, -/obj/item/communicator, -/obj/machinery/light{ +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"yQ" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass/research{ + name = "Weapons Testing Range"; + req_access = list(47) + }, +/turf/simulated/floor/tiled, +/area/rnd/research) +"yR" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/foyer) +"yT" = ( +/obj/structure/bed/chair/sofa/brown/corner{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4/fore) +"yU" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "yW" = ( /obj/machinery/mineral/unloading_machine, /obj/machinery/conveyor{ @@ -4005,15 +6504,53 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"yZ" = ( -/obj/effect/floor_decal/industrial/warning{ +"yX" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mobile_miningbase" + }, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/aft/port) +"yY" = ( +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "PubPrep"; + name = "Gateway Access Shutters" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor/grid, +/area/gateway) +"za" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) "zb" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"zc" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/starboard) "ze" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, @@ -4035,17 +6572,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) -"zh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/turf/simulated/floor/plating, -/area/space) -"zi" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"zg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four/forward) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"zk" = ( +/obj/machinery/camera/network/research, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "zl" = ( /obj/structure/anomaly_container, /obj/structure/window/reinforced{ @@ -4057,12 +6599,33 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/anomaly_lab) +"zm" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) +"zp" = ( +/obj/structure/table/rack/shelf, +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/reinforced, +/area/rnd/secure_storage/lower) +"zq" = ( +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "zr" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"zs" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "zt" = ( /obj/structure/railing, /obj/structure/railing{ @@ -4080,6 +6643,25 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) +"zv" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"zw" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/conveyor{ + dir = 1 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"zx" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "zy" = ( /obj/machinery/door/airlock/glass_science{ name = "Decontamination"; @@ -4093,6 +6675,25 @@ }, /turf/simulated/floor/tiled, /area/gateway) +"zz" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "tele_sci_vent"; + name = "Emergency Vent" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"zA" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "zB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4102,22 +6703,39 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) +"zC" = ( +/obj/machinery/atmospherics/component/unary/freezer{ + dir = 1; + icon_state = "freezer_1"; + power_setting = 20; + set_temperature = 73; + use_power = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) +"zD" = ( +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab) "zE" = ( /obj/machinery/newscaster{ pixel_y = 30 }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"zI" = ( -/obj/machinery/door/airlock/maintenance/rnd, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, +"zF" = ( +/obj/machinery/door/airlock/maintenance, +/obj/item/barrier_tape_segment/engineering, +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, -/area/rnd/anomaly_lab) +/area/main_map/maintenance/deck_four/forward/port) +"zG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "zL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -4125,26 +6743,30 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/bluegrid, /area/ai) -"zN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +"zM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, +/obj/machinery/camera/network/engineering, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) -"zS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) -"zU" = ( -/obj/machinery/conveyor{ - dir = 4 +/area/engineering/gravity_gen) +"zO" = ( +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/map_helper/conveyor/belt{ - id_tag = "mining_interior"; - name = "Ore processing belt" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"zP" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/tiled/techmaint, +/area/exploration/explorer_prep) +"zV" = ( +/obj/machinery/atmospherics/component/binary/pump/on, /turf/simulated/floor/plating, /area/quartermaster/miningdock) "zW" = ( @@ -4161,33 +6783,46 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Ab" = ( -/turf/simulated/wall/r_wall, -/area/main_map/maintenance/deck_four/port) -"Af" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"zZ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/door/airlock{ - name = "General Storage"; - req_access = list(47) +/obj/effect/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/rnd/secure_storage/lower) +"Ab" = ( +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_four/port) +"Ad" = ( +/obj/machinery/door/airlock/glass/engineering, +/obj/machinery/door/airlock/glass/engineering, +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) +"Ae" = ( +/mob/living/simple_mob/mechanical/corrupt_maint_drone/weak_no_poison, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"Ag" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "Ah" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/forward) -"Ai" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) "Aj" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Ak" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "Al" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/light, @@ -4199,6 +6834,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/gateway) +"Am" = ( +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase" + }, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/aft/port) "An" = ( /obj/machinery/atmospherics/valve/digital{ dir = 4 @@ -4217,18 +6858,39 @@ "Ao" = ( /turf/simulated/floor/tiled, /area/gateway) -"Ar" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"Ap" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/gravity_gen) +"Au" = ( +/turf/simulated/wall/prepainted, +/area/space) +"Av" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"Aw" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Ay" = ( +/obj/machinery/camera/network/research{ + dir = 4; + network = list("Xenobiology") + }, +/obj/structure/bed, +/obj/item/bedsheet/blue, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"Az" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"As" = ( -/obj/structure/statue/marble/female, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "AA" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/spawner/window/borosillicate/reinforced/full/firelocks, @@ -4243,10 +6905,33 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) -"AH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"AC" = ( +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "mining_interior"; + name = "Ore processing belt" + }, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"AD" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"AF" = ( +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) +"AG" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/quartermaster/office) "AI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -4294,13 +6979,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"AR" = ( -/obj/structure/table/rack/shelf, -/obj/machinery/air_alarm{ - pixel_y = 24 - }, -/turf/simulated/floor/reinforced, +"AO" = ( +/obj/structure/girder, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) +"AP" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four) "AS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -4318,6 +7005,17 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) +"AT" = ( +/obj/item/binoculars, +/obj/item/folder/blue{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) "AU" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck4) @@ -4327,12 +7025,91 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"Bd" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"Bg" = ( -/obj/structure/reagent_dispensers/coolanttank, +"AX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/table/rack/shelf, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/exploration/alt, +/obj/item/clothing/head/helmet/space/void/exploration/alt, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"AY" = ( +/obj/structure/transit_tube/station, +/obj/structure/transit_tube_pod{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"AZ" = ( +/obj/machinery/disposal, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/research) +"Ba" = ( +/obj/structure/closet/secure_closet/pathfinder, +/obj/machinery/recharger/wallcharger{ + pixel_x = 32 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"Bb" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"Bc" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio6"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Bd" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"Be" = ( +/obj/structure/lattice, +/turf/space, +/area/rnd/telescience_lab/chamber) +"Bf" = ( +/obj/structure/table/standard, +/obj/item/folder/blue{ + pixel_x = 5 + }, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/item/clothing/glasses/science, +/obj/item/reagent_containers/syringe, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"Bg" = ( +/obj/structure/reagent_dispensers/coolanttank, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -4349,12 +7126,45 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"Bi" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Bj" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/aft_hallway) "Bk" = ( /obj/machinery/gateway{ dir = 10 }, /turf/simulated/floor/reinforced, /area/gateway) +"Bl" = ( +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoarch"; + req_access = list(65) + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) +"Bm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"Bn" = ( +/obj/machinery/door/airlock/glass/research, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "Bo" = ( /obj/machinery/camera/motion{ network = list("Research","Command") @@ -4371,9 +7181,34 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4/fore) +"Br" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Bs" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/purple{ + dir = 1 + }, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) "Bt" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) +"Bv" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) "Bw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -4386,6 +7221,97 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck4/fore) +"By" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"Bz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"BB" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) +"BC" = ( +/obj/structure/salvageable/console_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"BD" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) +"BF" = ( +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"BG" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"BH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"BI" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"BJ" = ( +/obj/machinery/button/remote/blast_door{ + id = "cludge_hanger"; + pixel_y = 32 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) +"BK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/mains_pipe/split/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"BM" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "BO" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -4401,6 +7327,20 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_two) +"BS" = ( +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio4"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "BT" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai) @@ -4425,12 +7365,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) -"BX" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +"BW" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "BY" = ( /obj/machinery/door/blast/regular{ id = "mobile_miningbase" @@ -4441,6 +7382,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"BZ" = ( +/obj/structure/bed/chair/comfy/brown, +/turf/simulated/floor/carpet/bcarpet, +/area/library) "Ca" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -4457,12 +7402,38 @@ "Cb" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/forward) -"Cc" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +"Cd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/power/apc/north_mount, +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"Ce" = ( +/obj/structure/closet/secure_closet/miner, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"Cf" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "Cg" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -4491,6 +7462,9 @@ /obj/item/book/manual/robotics_cyborgs, /turf/simulated/floor/wood, /area/library) +"Cj" = ( +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) "Ck" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -4504,37 +7478,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"Cp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" +"Cm" = ( +/obj/structure/table/reinforced, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"Cn" = ( +/obj/machinery/door/firedoor{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck4) -"Cq" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"Cs" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "smugler_airlock1"; - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) +"Cr" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/rnd/telescience_lab) +"Ct" = ( +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "Cu" = ( /obj/structure/lattice, /obj/structure/transit_tube/high_velocity{ @@ -4554,9 +7517,6 @@ }, /turf/simulated/floor/plating, /area/space) -"Cw" = ( -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) "Cx" = ( /obj/structure/closet, /obj/item/clothing/under/suit_jacket/red, @@ -4566,35 +7526,52 @@ /obj/item/pen/invisible, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"Cy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"CA" = ( +/obj/structure/girder/reinforced, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/obj/effect/floor_decal/techfloor, -/obj/structure/cable/green{ - icon_state = "4-8" +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"CB" = ( +/obj/machinery/mineral/equipment_vendor, +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/corner/brown/border{ + dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"CC" = ( -/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"CE" = ( +/obj/structure/largecrate, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"CD" = ( -/obj/structure/sign/warning/secure_area, -/turf/simulated/wall/r_wall, -/area/gateway/prep_room) +/area/main_map/maintenance/deck_four/starboard) +"CF" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four) "CG" = ( /turf/simulated/wall/rshull, /area/main_map/maintenance/deck_four/aft/port) +"CH" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/telescience_lab) +"CI" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) "CJ" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4611,12 +7588,50 @@ }, /turf/simulated/floor/plating, /area/space) +"CL" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"CO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 6 + }, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) +"CP" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "CQ" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"CR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/structure/table/rack/shelf/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 5 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = -4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) "CS" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4629,6 +7644,22 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4) +"CU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/rnd, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/research) +"CV" = ( +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "CW" = ( /obj/structure/bed/chair/wood{ dir = 8 @@ -4648,6 +7679,12 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) +"CY" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + req_access = list(47) + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "CZ" = ( /obj/structure/table/rack, /obj/item/storage/belt/archaeology, @@ -4663,19 +7700,27 @@ /obj/item/clothing/mask/breath, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Da" = ( -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - dir = 1; - id_tag = "secure_science_stroage_airlock_control"; - name = "Secure Storage Access Controller"; - pixel_y = -25 +"Db" = ( +/obj/structure/table/standard, +/obj/machinery/reagentgrinder, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 }, -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/obj/item/stack/material/phoron{ + amount = 25 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "Dc" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Dd" = ( +/obj/machinery/camera/network/research{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "De" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4694,13 +7739,31 @@ }, /turf/simulated/floor/reinforced, /area/gateway) -"Dh" = ( -/obj/structure/table/bench/standard, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +"Di" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "xenobio4"; + name = "Containment Blast Doors"; + pixel_x = -24; + pixel_y = 8; + req_access = list(55) + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "xenobio4"; + name = "Containment Blast Doors"; + pixel_x = -24; + pixel_y = -8; + req_access = list(55) + }, +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) "Dj" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, @@ -4714,30 +7777,53 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Dp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) -"Du" = ( -/obj/machinery/camera/network/command{ - dir = 4 +"Dq" = ( +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "DRAMATIC"; + name = "Dramatic Blast Door" }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Dw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/window/brigdoor/southleft{ + req_access = list(55); + name = "Containment Pen" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/window/brigdoor/northright{ + name = "Containment Pen"; + req_access = list(55) }, -/obj/structure/cable/green{ - icon_state = "5-8" +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Ds" = ( +/obj/structure/table/reinforced, +/obj/item/binoculars, +/obj/item/folder/blue{ + pixel_x = -4; + pixel_y = 5 }, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"Dt" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/area/main_map/maintenance/deck_four/forward) +"Dv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"Dx" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "expshuttle_dock"; + req_one_access = list(19,43,67); + pixel_y = 32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) "Dy" = ( /obj/machinery/door/morgue{ dir = 2; @@ -4776,26 +7862,79 @@ }, /turf/simulated/shuttle/floor/voidcraft, /area/main_map/maintenance/deck_four/aft/port) -"DH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +"DE" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/space) -"DJ" = ( -/obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/table/standard, +/obj/item/defib_kit/loaded, +/obj/item/storage/firstaid/surgery, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"DF" = ( +/obj/machinery/atmospherics/component/binary/pump/on{ dir = 8 }, -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, -/area/gateway) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"DK" = ( +/obj/machinery/conveyor{ + dir = 1 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" + }, +/area/rnd/xenobiology) +"DL" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/hallway/deck4) "DM" = ( /turf/simulated/floor/bluegrid, /area/ai_upload) +"DN" = ( +/obj/machinery/camera/network/research{ + dir = 4; + network = list("Xenobiology") + }, +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 8; + frequency = 1445; + id = "burn_in"; + volume_rate = 700 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"DO" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/suit_cycler/medical, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "DP" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward) @@ -4804,6 +7943,14 @@ /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/maintenance/deck_four/aft/port) +"DR" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"DT" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "DU" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" @@ -4814,12 +7961,33 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck4) +"DW" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) "DX" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"DY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) "DZ" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -4844,22 +8012,48 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"Ec" = ( -/turf/simulated/wall, -/area/engineering/ftl) +"Ef" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/machinery/camera/network/exploration{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Eg" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass/mining{ + name = "Mining Prep Room" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Eh" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"Em" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 +"Eo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Ep" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) "Eq" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -4870,16 +8064,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"Et" = ( -/obj/machinery/door/airlock/maintenance/rnd, +"Es" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) +"Eu" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, -/area/rnd/research) +/area/main_map/maintenance/deck_four/aft/port) +"Ev" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) "Ew" = ( /obj/structure/railing{ dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"Ex" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) "Ey" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four) @@ -4889,6 +8100,32 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"EB" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"EC" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"EE" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) "EF" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) @@ -4910,25 +8147,26 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"EI" = ( -/obj/machinery/door/airlock/maintenance/rnd, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, +"EH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" + dir = 9 }, /turf/simulated/floor/plating, -/area/gateway/prep_room) -"EJ" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" +/area/quartermaster/miningdock) +"EK" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio1"; + name = "Containment Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/reinforced/airless, -/area/main_map/hallway/deck4/fore) +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "EL" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ dir = 8; @@ -4939,12 +8177,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) -"EM" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-8" +"EN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "EP" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4966,13 +8207,31 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) "ER" = ( /obj/machinery/artifact_analyser, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) +"ES" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/hand_labeler, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"EU" = ( +/obj/machinery/button/remote/blast_door{ + id = "xenobio6"; + name = "Containment Blast Doors"; + pixel_y = -28; + req_access = list(55) + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "EV" = ( /obj/machinery/air_alarm{ dir = 8; @@ -4980,27 +8239,29 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"EX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +"EW" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/area/main_map/hallway/deck4) "EY" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/anomaly_lab) -"Fd" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/plating, -/area/space) -"Fh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"Fa" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"Fe" = ( +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"Ff" = ( +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) "Fj" = ( /obj/machinery/gateway{ dir = 4 @@ -5017,10 +8278,50 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/research) +"Fn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_outer"; + req_access = list(11) + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "Fo" = ( /obj/structure/railing/grey, /turf/simulated/floor/plating, /area/ai_upload) +"Fp" = ( +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"Fq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "Fr" = ( /obj/structure/railing, /turf/simulated/floor/carpet/bcarpet, @@ -5048,27 +8349,9 @@ "Fv" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/lower) -"Fz" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"FA" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck4) +"Fx" = ( +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "FC" = ( /turf/simulated/floor/tiled/techfloor, /area/ai) @@ -5083,14 +8366,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) -"FH" = ( -/obj/effect/floor_decal/spline/plain, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_access" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) "FI" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing{ @@ -5116,6 +8391,16 @@ }, /turf/simulated/floor/bluegrid, /area/ai) +"FL" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) "FM" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -5132,6 +8417,15 @@ }, /turf/simulated/floor/bluegrid, /area/ai) +"FO" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/aft/port) "FP" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/railing{ @@ -5139,29 +8433,84 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) -"FQ" = ( -/obj/structure/largecrate, -/turf/simulated/floor/plating, -/area/space) +"FR" = ( +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"FS" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_inner"; + req_access = list(11); + name = "Gravity Generator Access" + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"FV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 4 + }, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) "FW" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"Gb" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "mobile_miningbase_door" +"FX" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"FY" = ( +/obj/machinery/door/window/brigdoor/southright{ + name = "Containment Pen"; + req_access = list(55) }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "mobile_miningbase_door"; - pixel_x = 32 +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"FZ" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospheric_field_generator, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/maintenance/deck_four/aft/port) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) +"Ga" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"Gc" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) +"Gd" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/space) "Ge" = ( /turf/simulated/floor/carpet/bcarpet, /area/main_map/maintenance/deck_four/forward) @@ -5169,58 +8518,77 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/port) +"Gg" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "Gh" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Gj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) -"Gm" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "expshuttle_dock"; - req_one_access = list(19,43,67); - pixel_y = 32 +"Gk" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/miningdock) +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Gl" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Go" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"Gp" = ( +/obj/structure/largecrate, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/starboard) "Gs" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research) -"Gy" = ( -/obj/machinery/door/airlock/science{ - name = "Secure Storage"; - req_one_access = list(20,30) - }, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/access_button/airlock_interior{ - master_tag = "secure_science_stroage_airlock_control"; - pixel_y = 24 +"Gt" = ( +/obj/structure/ladder/up, +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"Gv" = ( +/obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Gx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"GA" = ( /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + icon_state = "2-4" }, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) -"Gz" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "E-W-Pass" +/obj/effect/floor_decal/techfloor{ + dir = 9 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) "GB" = ( /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -5234,32 +8602,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) -"GD" = ( -/obj/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/access_button/airlock_interior{ - master_tag = "smugler_airlock1"; - dir = 4; - pixel_x = -24 - }, -/obj/machinery/door/airlock/external, +"GC" = ( +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/space) -"GE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/area/main_map/maintenance/deck_four/forward) +"GG" = ( +/obj/structure/cable/green{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled, -/area/space) -"GI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Science Outpost Maintenance"; - req_one_access = list(10,47) +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) "GJ" = ( /obj/effect/catwalk_plated/dark, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -5267,18 +8622,20 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"GK" = ( +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "GL" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) -"GN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +"GM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/maintenance/cargo, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "GO" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/photocopier/faxmachine{ @@ -5286,27 +8643,61 @@ }, /turf/simulated/floor/wood, /area/library) -"GP" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "GQ" = ( /obj/machinery/light/small, /turf/simulated/floor/wood, /area/library) -"GS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +"GR" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" + }, +/area/rnd/xenobiology) +"GU" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 5 + }, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/mining{ + boots_stored_TYPE = /obj/item/clothing/shoes/magboots + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"GV" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "GW" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"GX" = ( -/turf/simulated/wall, -/area/rnd/outpost/maintenance) +"GZ" = ( +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "Ha" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -5318,9 +8709,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"Hd" = ( -/turf/simulated/wall, -/area/gateway) "He" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/monotile, @@ -5349,12 +8737,32 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"Hi" = ( -/turf/simulated/wall, -/area/outpost/mining_main/outpost/near_gateway) +"Hh" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoarch"; + req_access = list(65) + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) +"Hj" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "Hn" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/port) +"Ho" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "Hp" = ( /obj/machinery/artifact_harvester, /obj/structure/window/reinforced{ @@ -5362,6 +8770,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/anomaly_lab) +"Hq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "Hr" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" @@ -5369,28 +8783,45 @@ /obj/structure/lattice, /turf/space, /area/space) +"Hs" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) "Ht" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Hu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"Hv" = ( +/obj/machinery/camera/network/command, +/turf/simulated/floor/greengrid, +/area/ai) +"Hw" = ( +/obj/structure/table/rack/shelf, +/obj/item/suit_cooling_unit, +/obj/item/clothing/mask/gas/half, +/obj/item/tank/oxygen, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/exploration/pathfinder, +/obj/item/clothing/head/helmet/space/void/exploration/pathfinder, +/obj/item/binoculars, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"Hy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) -"Hv" = ( -/obj/machinery/camera/network/command, -/turf/simulated/floor/greengrid, -/area/ai) "Hz" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -5400,6 +8831,13 @@ /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"HB" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "HC" = ( /obj/machinery/camera/network/research{ dir = 8 @@ -5416,27 +8854,72 @@ "HE" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward/starboard) +"HF" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/starboard) +"HG" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"HH" = ( +/obj/item/frame, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"HJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "HK" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four) +"HL" = ( +/obj/effect/decal/mecha_wreckage/cludge{ + dir = 1 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) "HM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward/starboard) +"HN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/mining{ + boots_stored_TYPE = /obj/item/clothing/shoes/magboots + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"HO" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four) "HP" = ( /obj/machinery/door/airlock/glass, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) -"HQ" = ( -/obj/machinery/door/firedoor{ - dir = 1 +"HR" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/machinery/door/airlock/science{ + name = "Secure Storage"; + req_one_access = list(20,30) }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) "HS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -5444,59 +8927,103 @@ /obj/machinery/atmospherics/pipe/vent/high_volume, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/maintenance/deck_four/aft/port) -"HT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +"HV" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/starboard) +"HX" = ( +/obj/machinery/power/apc/north_mount, +/obj/map_helper/network_builder/power_cable/green/auto, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Science Outpost Maintenance"; - req_one_access = list(10,47) + icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"HU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/area/main_map/maintenance/deck_four/port) +"HY" = ( +/obj/structure/largecrate/animal/spiders, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/starboard) "HZ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Ib" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/main_map/hallway/deck4/fore) +"Ia" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "Ic" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/forward/starboard) -"Id" = ( -/obj/structure/closet/firecloset/full/double, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"Ig" = ( -/obj/machinery/door/firedoor/glass{ - dir = 4 +"If" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/storage) +"Ih" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/split/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/anomaly_lab) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) +"Ii" = ( +/obj/machinery/camera/network/research{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"Ij" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "Ik" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/ai) +"In" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/power/apc/high/east_mount, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Io" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "Ip" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/maintenance/deck_four/forward) +"Iq" = ( +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"Ir" = ( +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_four/aft) "Is" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -5507,6 +9034,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) +"It" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/airlock_sensor{ + pixel_y = 28; + pixel_x = -28 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"Iu" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) "Iv" = ( /obj/structure/closet/excavation, /obj/effect/floor_decal/industrial/warning/full, @@ -5515,15 +9058,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Iy" = ( -/turf/simulated/floor/tiled, -/area/engineering/ftl) -"Iz" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"Iw" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/rnd/research) "IB" = ( /obj/item/storage/secure/safe{ pixel_x = 36 @@ -5533,31 +9072,112 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"IE" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +"IC" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"ID" = ( +/obj/structure/cable/green{ + icon_state = "0-8" }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/engineering/aft_hallway) "IF" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_four/forward/starboard) -"IJ" = ( -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) -"IK" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 1 +"IG" = ( +/obj/machinery/atmospherics/component/unary/vent_pump{ + dir = 1; + external_pressure_bound = 0; + external_pressure_bound_default = 0; + icon_state = "map_vent_in"; + initialize_directions = 1; + internal_pressure_bound = 4000; + internal_pressure_bound_default = 4000; + pressure_checks = 2; + pressure_checks_default = 2; + pump_direction = 0; + use_power = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/button/remote/blast_door{ - id = "gateway_windows"; - name = "Gateway Window Control"; - pixel_x = 8; - pixel_y = 32 +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/obj{ + name = "---Merge conflict marker---" + }, +/obj/machinery/conveyor{ + dir = 4; + id = "xenobiocoldroom" + }, +/obj/machinery/atmospherics/component/unary/vent_pump{ + dir = 1; + external_pressure_bound = 0; + external_pressure_bound_default = 0; + icon_state = "map_vent_in"; + initialize_directions = 1; + internal_pressure_bound = 4000; + internal_pressure_bound_default = 4000; + pressure_checks = 2; + pressure_checks_default = 2; + pump_direction = 0; + on = 1 + }, +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 1 + }, +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" + }, +/area/rnd/xenobiology) +"IJ" = ( +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"IK" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/button/remote/blast_door{ + id = "gateway_windows"; + name = "Gateway Window Control"; + pixel_x = 8; + pixel_y = 32 }, /turf/simulated/floor/tiled/monotile, /area/gateway) +"IM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"IO" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"IP" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(5,19,43,44,67); + dir = 8; + name = "Exploration Equipment Room" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/exploration/explorer_prep) "IQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -5572,6 +9192,29 @@ /obj/structure/salvageable/console_broken_os, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"IS" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"IT" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"IU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "IV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -5581,6 +9224,35 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"IW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"IX" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "xenobio7"; + name = "Containment Blast Doors"; + pixel_x = 24; + pixel_y = 24; + req_access = list(55) + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) +"IY" = ( +/obj/machinery/computer/telescience, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "IZ" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/techfloor, @@ -5614,9 +9286,19 @@ "Jf" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/forward/port) -"Ji" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) +"Jg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"Jj" = ( +/obj/structure/salvageable/data_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "Jl" = ( /obj/machinery/artifact_scanpad, /obj/machinery/light/no_nightshift{ @@ -5624,6 +9306,16 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) +"Jm" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/structure/table/reinforced, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Jn" = ( /obj/machinery/power/terminal{ dir = 8 @@ -5634,6 +9326,9 @@ /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/techfloor, /area/ai) +"Jo" = ( +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Jq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -5641,22 +9336,40 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"Jt" = ( -/obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"Jr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four) +"Js" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Ju" = ( +/obj/item/frame/noticeboard{ + dir = 1; + pixel_y = -32 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) +"Jw" = ( +/obj/effect/floor_decal/techfloor/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/monotile, -/area/gateway) -"Jv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/rnd/research) +"Jx" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "Jy" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/aft/port) @@ -5668,6 +9381,47 @@ }, /turf/simulated/floor/wood, /area/library) +"JA" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/starboard) +"JB" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"JD" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) +"JE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"JF" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_outer"; + req_access = list(11) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "JH" = ( /obj/structure/table/reinforced, /obj/machinery/recharger/wallcharger{ @@ -5682,28 +9436,36 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"JK" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/miningdock) -"JM" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"JI" = ( +/obj/item/slime_extract/grey, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"JJ" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mobile_miningbase_door" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospheric_field_generator, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/maintenance/deck_four/aft/port) +"JL" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-4" +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"JN" = ( +/obj/structure/ore_box, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) +"JO" = ( +/obj/structure/bed/chair/sofa/brown/right{ + dir = 1 }, -/obj/machinery/power/apc/direction_bump/south, /turf/simulated/floor/tiled/monotile, -/area/gateway) +/area/main_map/hallway/deck4/fore) "JQ" = ( /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/borderfloor{ @@ -5719,26 +9481,51 @@ /obj/machinery/portable_atmospherics/hydroponics/soil, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) +"JS" = ( +/obj/structure/statue/marble/male, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"JT" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"JU" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"JV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"JW" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"JY" = ( +/obj/machinery/door/window/brigdoor/northright{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio7"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) "JZ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) -"Kb" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "Kc" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing/grey{ @@ -5746,18 +9533,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"Ke" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) "Kf" = ( /obj/machinery/washing_machine, /turf/simulated/floor/tiled, @@ -5772,17 +9547,49 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/starboard) -"Ki" = ( -/obj/machinery/door/airlock/maintenance/rnd, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) +"Kj" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/exploration/explorer_prep) "Kk" = ( /obj/spawner/window/full/firelocks, /turf/simulated/floor/plating, /area/gateway) -"Kl" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/port) +"Km" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Ko" = ( +/obj/structure/table/steel, +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 12 + }, +/obj/item/multitool{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/stack/cable_coil, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) +"Kp" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/conveyor{ + dir = 1 + }, +/turf/simulated/wall/r_wall, +/area/rnd/xenobiology) +"Kq" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "Kr" = ( /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" @@ -5796,6 +9603,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) +"Kt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "Ku" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -5811,28 +9630,86 @@ }, /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) +"Kw" = ( +/obj/structure/window/reinforced, +/obj/structure/table/glass, +/obj/item/glass_jar, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Kx" = ( +/turf/simulated/wall/prepainted/exploration, +/area/exploration/explorer_prep) +"Ky" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/exploration/explorer_prep) +"Kz" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "KA" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research/testingrange) +"KB" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/starboard) +"KC" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"KD" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 1; + pressure_resistance = 4559.63; + target_pressure = 4559.63 + }, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "KE" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "E-W-Pass" }, /turf/space, /area/space) -"KL" = ( -/obj/effect/floor_decal/industrial/warning{ +"KG" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, -/obj/machinery/camera/network/research_outpost{ +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 8 + }, +/obj/structure/curtain/open/shower/engineering, +/obj/machinery/airlock_sensor{ dir = 1; - network = list("Research Outpost","Command") + id_tag = "gravity_csensor"; + master_tag = "gravity_airlock"; + pixel_y = -28; + req_access = list(11) }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"KP" = ( +/turf/simulated/floor/tiled/white, +/area/engineering/gravity_gen) +"KH" = ( +/obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/engineering/shunt) +/area/tether/exploration/pathfinder_office) +"KN" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/telescience_lab/storage) "KQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5842,34 +9719,35 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"KS" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"KT" = ( -/obj/spawner/window/borosillicate/reinforced/full, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_windows" - }, -/turf/simulated/floor, -/area/gateway) +"KR" = ( +/turf/simulated/floor/wood, +/area/rnd/xenobiology) "KU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"KX" = ( +"KV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, -/area/engineering/shunt) +/area/main_map/hallway/deck4) +"KW" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = -4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) "KY" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 @@ -5897,39 +9775,70 @@ }, /turf/simulated/floor/tiled/monotile, /area/gateway) -"Lf" = ( +"Ld" = ( +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/starboard) +"Le" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"Lg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Lh" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/cyborg, +/turf/simulated/floor/bluegrid, +/area/ai_upload) +"Li" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "Lj" = ( /obj/landmark/spawnpoint/job/librarian, /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"Lk" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "mobile_miningbase_door" +"Ln" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "deck_4_maint1"; + pixel_x = 24 }, -/obj/machinery/atmospheric_field_generator, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/maintenance/deck_four/aft/port) -"Ll" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/sign/deck4{ + pixel_y = 28 }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"Lo" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research) +"Lp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Lq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -5942,15 +9851,9 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) -"Lr" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) +"Lt" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/rnd/research) "Lu" = ( /obj/structure/filingcabinet{ desc = "A large cabinet with drawers. They seem to be ominously empty."; @@ -5962,21 +9865,55 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) +"Lv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"Lw" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) +"Lx" = ( +/obj/structure/lattice, +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/turf/simulated/wall/r_wall, +/area/space) +"Ly" = ( +/turf/simulated/wall/r_lead, +/area/engineering/gravity_gen) +"Lz" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) "LA" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/meter, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"LE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/floor_decal/techfloor{ +"LB" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/maintenance/deck_four/forward/port) +"LD" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "LF" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 5 @@ -6001,6 +9938,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) +"LI" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four/forward/starboard) "LJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6012,6 +9955,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) +"LK" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4/fore) +"LL" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) "LM" = ( /obj/structure/table/rack, /obj/item/storage/belt/archaeology, @@ -6031,6 +9983,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"LN" = ( +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "LO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -6051,6 +10006,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"LQ" = ( +/obj/structure/table/fancyblack, +/turf/simulated/floor/wood, +/area/library) +"LR" = ( +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "LS" = ( /obj/structure/ladder/up, /turf/simulated/floor/plating, @@ -6059,24 +10022,49 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"LU" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) +"LV" = ( +/obj/machinery/door/firedoor/glass{ + dir = 1 + }, +/obj/machinery/door/airlock/glass/exploration{ + name = "Medic Prep"; + req_one_access = list(44,19,5) + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "LW" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four) -"LX" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 +"Ma" = ( +/obj/machinery/light/small{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-4" +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four) +"Mb" = ( +/obj/machinery/button/remote/blast_door{ + id = "xenobio3"; + name = "Containment Blast Doors"; + pixel_y = -28; + req_access = list(55) }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) "Mc" = ( /obj/machinery/artifact_scanpad, /obj/structure/window/reinforced{ @@ -6084,6 +10072,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/anomaly_lab) +"Md" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/starboard) "Me" = ( /obj/structure/railing{ dir = 1 @@ -6091,19 +10083,35 @@ /obj/structure/railing, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/starboard) -"Mf" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/atmospheric_field_generator, -/obj/machinery/door/blast/regular{ - id = "mobile_miningbase_shuttle_door" +"Mg" = ( +/obj/machinery/processor, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Ml" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/button/remote/blast_door{ - id = "mobile_miningbase_shuttle_door"; - pixel_y = 32 +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"Mm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/port) +/area/rnd/secure_storage/lower) +"Mn" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/obj/landmark/spawnpoint/job/explorer, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "Mp" = ( /turf/simulated/floor/carpet/bcarpet, /area/library/study) @@ -6111,14 +10119,30 @@ /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"Mu" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +"Mr" = ( +/mob/living/simple_mob/animal/sif/fluffy/silky, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"Mt" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"Mu" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) "Mv" = ( /turf/simulated/wall/r_wall/prepainted/engineering, @@ -6162,38 +10186,32 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"MF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/space) +"MD" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/engineering/aft_hallway) +"ME" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/aft/port) +"MG" = ( +/obj/structure/table/reinforced, +/obj/item/roller, +/obj/item/roller, +/obj/machinery/camera/network/research_outpost, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "MJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"MK" = ( -/obj/structure/table/rack/shelf, -/turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/starboard) -"MM" = ( -/obj/machinery/door/airlock/maintenance/int{ - req_access = list(27); - name = "Chapel Access" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) -"MN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +"ML" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "MO" = ( /obj/machinery/air_alarm{ dir = 8; @@ -6201,6 +10219,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) +"MP" = ( +/obj/machinery/suit_cycler/exploration, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "MR" = ( /obj/machinery/light/fairy{ dir = 4 @@ -6208,47 +10241,51 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"MS" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"MT" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) "MU" = ( /obj/machinery/porta_turret/ai_defense, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"MV" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/main_map/maintenance/deck_four) -"MX" = ( -/obj/structure/girder, -/obj/item/barrier_tape_segment/engineering, +"MW" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"MZ" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"Nb" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, /turf/simulated/floor/plating, /area/space) +"Nc" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) +"Nd" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "Ne" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) -"Nf" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/plating, -/area/space) "Ng" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -6256,6 +10293,21 @@ }, /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/forward/starboard) +"Nh" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Nj" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"Nk" = ( +/obj/structure/stairs/spawner/west, +/obj/structure/railing, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) "Nl" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -6263,6 +10315,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Nm" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Nn" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "No" = ( /obj/structure/table/standard, /obj/item/anobattery{ @@ -6289,25 +10357,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Np" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +"Nq" = ( +/obj/machinery/conveyor{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) -"Nr" = ( -/obj/structure/table/reinforced, -/obj/machinery/camera/network/research_outpost{ - dir = 4; - network = list("Research Outpost","Command") +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "Ns" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Nt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "Nv" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -6315,6 +10391,20 @@ "Nw" = ( /turf/simulated/wall/r_wall, /area/gateway) +"Nx" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/blast/regular{ + id = "UpperInnerTeleSciBlastDoor"; + name = "Upper Exterior Telesci Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) +"Ny" = ( +/obj/structure/ladder_assembly, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "Nz" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 @@ -6327,12 +10417,6 @@ /obj/structure/railing, /turf/simulated/floor/carpet/bcarpet, /area/library) -"NB" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/forward) "NC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6348,6 +10432,33 @@ }, /turf/simulated/floor/plating, /area/ai_upload) +"NE" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + dir = 1; + name = "Research - Exploration Wing" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"NH" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/maintenance/deck_four/forward/starboard) +"NI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) "NJ" = ( /obj/machinery/atmospheric_field_generator/perma, /obj/machinery/door/blast/shutters{ @@ -6361,15 +10472,10 @@ /obj/item/book/codex/lore/news, /turf/simulated/floor/wood, /area/library) -"NN" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +"NM" = ( +/obj/machinery/door/airlock/glass/engineering, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/aft_hallway) "NP" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -6395,6 +10501,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) +"NS" = ( +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint/violet, +/turf/simulated/floor/plating, +/area/exploration/explorer_prep) +"NT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) +"NU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "NV" = ( /obj/structure/railing, /obj/structure/railing{ @@ -6403,10 +10524,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/maintenance/trash_pit) -"NW" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) "NX" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "E-W-Pass" @@ -6420,14 +10537,46 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) -"NY" = ( -/obj/effect/floor_decal/borderfloor/corner, +"NZ" = ( +/turf/space, +/area/rnd/telescience_lab/chamber) +"Oa" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Ob" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/main_map/hallway/deck4) "Oc" = ( /obj/machinery/atmospherics/pipe/vent, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"Od" = ( +/obj/machinery/light/small, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"Oe" = ( +/obj/structure/medical_stand/anesthetic, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "Of" = ( /obj/machinery/mineral/processing_unit, /obj/machinery/conveyor{ @@ -6443,43 +10592,61 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) -"Ok" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, +"Oj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "2-9" + dir = 4 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/quartermaster/office) "Ol" = ( /obj/machinery/door/airlock/maintenance/cargo, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/port) +"Om" = ( +/obj/effect/floor_decal/corner_techfloor_grid, +/obj/effect/floor_decal/techfloor/corner, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"On" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"Op" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/westright{ + req_access = list(11) + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Oq" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "Or" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward/starboard) -"Ou" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-6" - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) "Ow" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -6507,36 +10674,49 @@ /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"OA" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) -"OC" = ( -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck4) -"OD" = ( +"Oz" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 4 }, -/obj/effect/floor_decal/techfloor, -/obj/structure/cable/green{ - icon_state = "4-8" +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"OC" = ( +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"OE" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "OF" = ( /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"OG" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +"OH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"OI" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "OJ" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 @@ -6566,6 +10746,11 @@ /obj/item/book/manual/fission_engine, /turf/simulated/floor/wood, /area/library) +"OM" = ( +/obj/structure/girder, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "ON" = ( /obj/machinery/door/morgue{ dir = 2; @@ -6574,6 +10759,15 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"OO" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "OP" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -6581,12 +10775,31 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"OS" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-8" +"OQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) +"OR" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"OT" = ( +/obj/machinery/mech_recharger, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) "OU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -6612,19 +10825,55 @@ }, /turf/simulated/floor/wood, /area/library) +"OY" = ( +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "Pa" = ( /turf/simulated/wall/prepainted/engineering, /area/maintenance/trash_pit) -"Pb" = ( -/obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +"Pc" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio3"; + name = "Containment Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/tiled/techfloor, -/area/space) +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Pd" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"Pe" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Pf" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rnd/research) +"Pg" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) "Ph" = ( /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/forward/starboard) +"Pi" = ( +/obj/structure/ore_box, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/port) "Pj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6635,16 +10884,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Po" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/structure/cable/green{ - icon_state = "2-4" +"Pk" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) +"Pl" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"Pm" = ( +/obj/machinery/mining/drill{ + drill_id = 2 }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/main_map/maintenance/deck_four/aft/port) "Pq" = ( /obj/machinery/camera/network/command{ dir = 9 @@ -6652,15 +10907,15 @@ /obj/structure/lattice, /turf/space, /area/space) -"Ps" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"Pt" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, +"Pr" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/quartermaster/miningdock) +"Pu" = ( +/obj/structure/bed/chair{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/aft/starboard) "Pv" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -6674,14 +10929,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/monotile, /area/gateway) -"Pw" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/port) -"Py" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck4) "Pz" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -6695,18 +10942,16 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"PD" = ( -/obj/effect/floor_decal/techfloor{ +"PB" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"PC" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"PE" = ( -/obj/machinery/suit_cycler/mining{ - req_access = null - }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "PF" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/pointybush, @@ -6716,18 +10961,21 @@ /obj/machinery/ai_slipper, /turf/simulated/floor/tiled/techfloor, /area/ai) -"PI" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1 +"PK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/space) -"PJ" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "E-W-Pass" +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck4) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "PL" = ( /obj/structure/railing/grey{ dir = 8 @@ -6740,6 +10988,13 @@ }, /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) +"PM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) "PN" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6751,10 +11006,56 @@ /obj/structure/table/fancyblack, /turf/simulated/floor/wood, /area/main_map/maintenance/deck_four/forward) +"PP" = ( +/obj/structure/largecrate, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"PQ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"PR" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Mining Prep Room" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "PS" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"PU" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"PV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four) +"PW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"PX" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "PY" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -6773,10 +11074,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"Qb" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "Qc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6822,59 +11119,201 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"Qg" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "Qi" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/shuttle/wall/voidcraft, /area/main_map/maintenance/deck_four/aft/port) -"Qo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) -"Qr" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/main_map/maintenance/deck_four/aft/port) -"QB" = ( -/obj/structure/flora/ausbushes/pointybush, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/main_map/maintenance/deck_four/starboard) -"QF" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber{ +"Qk" = ( +/obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/rnd/anomaly_lab/containment_one) -"QH" = ( -/obj/machinery/libraryscanner, -/turf/simulated/floor/wood, -/area/library) -"QI" = ( -/obj/machinery/porta_turret/ai_defense, -/turf/simulated/floor/tiled/techfloor, -/area/ai) -"QJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + dir = 4; + id_tag = "secure_science_stroage_airlock_control"; + name = "Secure Storage Access Controller"; + pixel_x = -25 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/port) -"QL" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, -/area/rnd/anomaly_lab) -"QM" = ( -/obj/structure/cable/green{ +/area/rnd/secure_storage/critical) +"Ql" = ( +/obj/item/frame/apc, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"Qm" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Qn" = ( +/obj/effect/floor_decal/corner_techfloor_grid, +/obj/effect/floor_decal/techfloor/corner, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Qp" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Qr" = ( +/turf/simulated/shuttle/wall/voidcraft, +/area/main_map/maintenance/deck_four/aft/port) +"Qs" = ( +/obj/machinery/suit_cycler{ + req_access = null + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"Qt" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) +"Qu" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"Qx" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase_door" + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "mobile_miningbase_door"; + pixel_x = 32 + }, +/obj/machinery/atmospheric_field_generator, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/maintenance/deck_four/aft/port) +"Qz" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/pathfinder, +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 24 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"QA" = ( +/obj/structure/lattice, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) +"QB" = ( +/obj/structure/flora/ausbushes/pointybush, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/main_map/maintenance/deck_four/starboard) +"QC" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice, +/turf/space, +/area/rnd/telescience_lab/chamber) +"QD" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) +"QE" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"QF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab/containment_one) +"QG" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"QH" = ( +/obj/machinery/libraryscanner, +/turf/simulated/floor/wood, +/area/library) +"QI" = ( +/obj/machinery/porta_turret/ai_defense, +/turf/simulated/floor/tiled/techfloor, +/area/ai) +"QJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/port) +"QL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) +"QM" = ( +/obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/door/firedoor/glass, @@ -6885,6 +11324,19 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) +"QO" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"QP" = ( +/obj/structure/salvageable/machine_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "QQ" = ( /obj/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ @@ -6892,6 +11344,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"QS" = ( +/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "QU" = ( /obj/spawner/window/reinforced/tinted/full, /turf/simulated/floor/plating, @@ -6920,6 +11377,28 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"QY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"Ra" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/quartermaster/miningdock) +"Rb" = ( +/obj/machinery/suit_cycler/mining, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Rc" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) @@ -6930,43 +11409,56 @@ /obj/machinery/atmospherics/pipe/vent, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"Rf" = ( +/obj/mecha/combat/fighter/cludge{ + dir = 4; + name = "\improper Titan Class Fighter" + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) "Rh" = ( /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) -"Ri" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/multi_tile/metal{ - name = "Gateway Prep Room" +"Rk" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "PubPrepFront"; - layer = 3.3; - name = "Gateway Prep Shutter" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) -"Rj" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) +/area/rnd/secure_storage/critical) "Rm" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" }, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) -"Rs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +"Ro" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/camera/network/engineering{ + dir = 1 }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Rp" = ( +/obj/structure/stasis_cage, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Rq" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Rr" = ( +/turf/simulated/wall/prepainted/exploration, +/area/space) "Rt" = ( /obj/machinery/button/crematorium{ id = "crematorium"; @@ -6977,6 +11469,28 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward) +"Ru" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"Rv" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) +"Rx" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"Ry" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "RA" = ( /obj/machinery/air_alarm{ dir = 4; @@ -6984,10 +11498,25 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) -"RB" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor/grid, -/area/main_map/maintenance/deck_four/aft/port) +"RC" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"RD" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four/forward/starboard) +"RF" = ( +/obj/structure/cable{ + icon_state = "16-0" + }, +/obj/structure/cable/heavyduty{ + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "RH" = ( /obj/item/storage/secure/safe{ pixel_x = 36 @@ -6997,20 +11526,23 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"RI" = ( -/obj/structure/closet/crate{ - rigged = 1; - desc = "A rectangular steel crate with all identifying marks seemingly grinded off. Looks sketchy at best"; - name = "sketchy crate" - }, -/obj/item/radio/electropack, -/turf/simulated/floor/plating, -/area/space) "RJ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4/fore) +"RK" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"RL" = ( +/obj/structure/frame{ + anchored = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "RM" = ( /obj/structure/grille, /obj/machinery/door/firedoor/border_only, @@ -7019,6 +11551,12 @@ }, /turf/simulated/floor/plating, /area/library/study) +"RN" = ( +/obj/machinery/camera/network/command{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "RO" = ( /obj/machinery/porta_turret/stationary, /turf/simulated/floor/tiled/techfloor/grid, @@ -7028,6 +11566,22 @@ can_open = 1 }, /area/main_map/maintenance/deck_four/forward) +"RQ" = ( +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"RR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "gravity_pump" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "RS" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -7042,27 +11596,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"RT" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S-Pass" - }, -/turf/space, -/area/space) -"RV" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/maintenance/deck_four/aft/port) -"RZ" = ( -/obj/structure/transit_tube/station{ - dir = 4 - }, -/obj/structure/transit_tube_pod{ - dir = 1 +"RX" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"RY" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"Sa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck4) +/area/rnd/xenobiology) "Sb" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -7079,47 +11630,44 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Sd" = ( -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) -"Sf" = ( -/obj/structure/girder, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/engineering/ftl) -"Si" = ( -/obj/machinery/door/airlock/maintenance/int{ - req_access = list(27); - name = "Chapel Access" +"Se" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Sg" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/forward) -"Sj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/forward) +"Sh" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospheric_field_generator, +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase_shuttle_door"; + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/trash_pit) -"Sk" = ( -/turf/simulated/wall, -/area/rnd/outpost/underground) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/port) +"Sl" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/quartermaster/miningdock) +"Sn" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/floor/reinforced/outdoors, +/area/quartermaster/miningdock) "So" = ( /obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled, @@ -7130,6 +11678,15 @@ "Sq" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/aft/port) +"Sr" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "gateway_windows" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/gateway) "Ss" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7147,24 +11704,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"Sv" = ( -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "PubPrep"; - layer = 3.3; - name = "Gateway Access Shutters" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +"Su" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) "Sx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -7188,10 +11733,45 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) +"SA" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/obj/structure/closet/bombcloset, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"SB" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/forward) "SC" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/quartermaster/miningdock) +"SD" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"SE" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) +"SF" = ( +/obj/effect/decal/mecha_wreckage/shuttlecraft, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"SG" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "SH" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, @@ -7220,38 +11800,29 @@ /obj/item/storage/bag/trash, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"SL" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ +"SO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) -"SM" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) -"SN" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-2" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"SP" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "SQ" = ( /obj/spawner/window/reinforced/tinted/full, /turf/simulated/floor/tiled/dark, /area/main_map/maintenance/deck_four/forward) +"SR" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/port) "SS" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -7277,6 +11848,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) +"SV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) "SW" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -7288,12 +11865,30 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"Ta" = ( -/obj/machinery/light/no_nightshift{ +"SY" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + dir = 1; + name = "Research - Deck 4 Wing" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research) +"SZ" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, /turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/port) +/area/rnd/xenobiology) +"Tb" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "Tc" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -7308,6 +11903,24 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"Tf" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Tg" = ( +/obj/structure/table/standard, +/obj/item/gun/energy/taser/xeno, +/obj/item/multitool, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/melee/baton/slime/loaded, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "Th" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/portables_connector{ @@ -7315,6 +11928,31 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Tk" = ( +/obj/structure/table/standard, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen/red{ + pixel_x = -1; + pixel_y = 3 + }, +/obj/item/pen/blue{ + pixel_x = -5; + pixel_y = -1 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"Tl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "Tm" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -7322,15 +11960,47 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Tq" = ( +"Tn" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) +"To" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Tp" = ( +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"Tr" = ( +/turf/simulated/wall/r_wall{ + can_open = 1 + }, +/area/main_map/maintenance/deck_four/aft) +"Tu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/landmark{ + name = "lightsout" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) -"Ts" = ( -/turf/simulated/floor/reinforced/airless, -/area/main_map/hallway/deck4/fore) -"Tt" = ( -/turf/simulated/wall, -/area/engineering/shunt) +/area/tether/exploration/pathfinder_office) +"Tv" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "Tw" = ( /obj/machinery/mineral/processing_unit, /obj/machinery/conveyor{ @@ -7353,34 +12023,77 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"Ty" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"Tz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"TF" = ( -/obj/machinery/camera/network/research{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/anomaly_lab) -"TG" = ( -/turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/port) -"TJ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"TA" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/bluegrid, -/area/ai_upload) -"TL" = ( +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"TB" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/manifold4w/hidden, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"TD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/explorer, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"TE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/anomaly_lab) -"TM" = ( +/area/rnd/xenobiology) +"TH" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/port) +"TI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"TJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/bluegrid, +/area/ai_upload) +"TK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"TL" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) +"TM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -7428,6 +12141,12 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) +"TR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "TS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -7437,13 +12156,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) -"TT" = ( -/obj/structure/bed/chair/comfy/brown, -/turf/simulated/floor/carpet/bcarpet, -/area/main_map/maintenance/deck_four) -"TU" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/space) "TV" = ( /obj/structure/lattice, /obj/structure/transit_tube/high_velocity{ @@ -7460,19 +12172,72 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) +"TX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"TY" = ( +/turf/simulated/floor/reinforced/overhang, +/area/space) +"Ua" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Ub" = ( +/obj/machinery/conveyor_switch, +/obj/map_helper/conveyor/lever{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"Uc" = ( +/obj/structure/salvageable/console_broken_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"Ud" = ( +/obj/machinery/door/blast/regular{ + id = "OuterTeleSciBlastDoor"; + name = "Lower Exterior TeleSci Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/foyer) +"Ue" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "gateway_access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/gateway) "Uf" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) -"Ug" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/space) "Uh" = ( /obj/structure/lattice, /obj/structure/transit_tube/high_velocity{ @@ -7480,6 +12245,33 @@ }, /turf/space, /area/space) +"Uj" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) +"Uk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"Um" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/rnd/telescience_lab) "Un" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -7494,25 +12286,45 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"Us" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/atmospheric_field_generator, -/obj/machinery/door/blast/regular{ - id = "mobile_miningbase_shuttle_door" +"Ut" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"Uw" = ( +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/port) +/area/rnd/xenobiology) +"Ux" = ( +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) +"Uy" = ( +/obj/machinery/light/spot/no_nightshift, +/obj/structure/ore_box, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"Uz" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/library) +"UA" = ( +/obj/structure/bed/chair/sofa/brown/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4/fore) +"UB" = ( +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) "UD" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck4/fore) -"UE" = ( -/obj/machinery/camera/network/research_outpost{ - dir = 4; - network = list("Research Outpost","Command") - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) "UF" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4 @@ -7520,14 +12332,16 @@ /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"UG" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) -"UH" = ( -/obj/machinery/floodlight, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +"UI" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "UJ" = ( /obj/machinery/door/airlock/maintenance/command, /obj/item/barrier_tape_segment/engineering, @@ -7536,25 +12350,28 @@ "UK" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload) -"UN" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "E-W-Pass" - }, -/obj/structure/railing{ - dir = 4 +"UL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/railing{ +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck4) -"UQ" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S-Pass" +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"UP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) "US" = ( /obj/machinery/conveyor{ dir = 4 @@ -7565,13 +12382,14 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"UV" = ( -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck4/fore) +"UT" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) +"UU" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/secure_storage/lower) "UW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -7590,14 +12408,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"Vb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"Vc" = ( -/turf/simulated/wall/r_wall, -/area/rnd/secure_storage/critical/records) "Vd" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "E-W-Pass" @@ -7605,17 +12415,32 @@ /obj/structure/lattice, /turf/space, /area/space) +"Ve" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/library) "Vf" = ( /obj/machinery/camera/network/civilian{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, /area/library) -"Vg" = ( -/obj/structure/girder, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/engineering/shunt) +"Vh" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/motion{ + network = list("Research","Command") + }, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) "Vj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -7625,21 +12450,29 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"Vl" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +"Vk" = ( +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "Vm" = ( /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) -"Vp" = ( -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +"Vn" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/port) +"Vo" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) +"Vq" = ( +/turf/simulated/wall, +/area/rnd/xenobiology) "Vr" = ( /obj/structure/bookcase{ name = "bookcase (Reference)" @@ -7648,6 +12481,13 @@ /obj/item/book/custom_library/reference, /turf/simulated/floor/wood, /area/library) +"Vs" = ( +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp{ + pixel_y = 12 + }, +/turf/simulated/floor/wood, +/area/library) "Vt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/no_nightshift{ @@ -7658,6 +12498,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"Vu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Vv" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4/fore) "Vy" = ( /obj/structure/disposaloutlet{ dir = 1 @@ -7672,6 +12528,55 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"Vz" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 1; + frequency = 1445; + id = "burn_in"; + volume_rate = 700 + }, +/obj/machinery/camera/network/research{ + network = list("Xenobiology") + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"VA" = ( +/obj/machinery/hyperpad/centre{ + map_pad_id = "lavaland_station"; + map_pad_link_id = "lavaland_away"; + newcolor = "#fcba03" + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"VB" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"VC" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/telescience_lab) +"VE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"VF" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/plating, +/area/rnd/research/testingrange) +"VG" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/pump_out_external, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/aft/port) "VH" = ( /obj/structure/cable/green{ icon_state = "16-0" @@ -7681,6 +12586,21 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"VK" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"VL" = ( +/obj/machinery/conveyor_switch/oneway, +/obj/map_helper/conveyor/lever{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "VM" = ( /obj/machinery/door/airlock/glass/mining{ name = "Mining Operations"; @@ -7693,21 +12613,40 @@ /obj/structure/filingcabinet, /turf/simulated/floor/reinforced, /area/rnd/secure_storage/lower) -"VT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +"VO" = ( +/obj/machinery/camera/network/research{ + dir = 4; + network = list("Xenobiology") }, -/turf/simulated/floor/bluegrid, -/area/ai_upload) -"VU" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"VP" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"VX" = ( -/turf/simulated/wall/r_wall, -/area/rnd/secure_storage/critical) +/obj/machinery/door/blast/regular{ + id = "UpperOuterTeleSciBlastDoor"; + name = "Upper Interior Telesci Blast Door" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"VR" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"VS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/field_medic, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "VY" = ( /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -7743,23 +12682,17 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"Wc" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" - }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +"Wd" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"We" = ( -/obj/effect/floor_decal/spline/plain, -/turf/simulated/wall/r_wall, -/area/gateway) -"Wf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/area/quartermaster/miningdock) +"Wg" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "smuggler_door1" }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "Wh" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -7769,22 +12702,27 @@ "Wi" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/anomaly_lab/containment_one) -"Wj" = ( -/obj/structure/stairs/spawner/south, -/obj/structure/railing{ +"Wl" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + dir = 8; + name = "Research - Exploration Wing" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ dir = 4 }, -/obj/structure/railing{ - dir = 8 +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"Wn" = ( +/obj/machinery/pipedispenser/disposal, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"Wo" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"Wk" = ( -/obj/structure/table/reinforced, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "Wp" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -7796,22 +12734,16 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"Wq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +"Wr" = ( +/obj/structure/bed/chair/sofa/brown/left, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4/fore) "Ws" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"Wt" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume, -/turf/simulated/floor/plating, -/area/space) "Wu" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -7819,42 +12751,98 @@ }, /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/forward/starboard) -"Wv" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" +"Wx" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Ww" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/machinery/button/remote/blast_door{ - id = "PubPrep"; - name = "Gateway Shutter"; - pixel_x = -25; - pixel_y = 25; - req_access = list(62) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/sar{ + req_access = list(5); + req_one_access = list(5) + }, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/autoinjectors, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/roller, +/obj/item/storage/backpack/parachute, +/obj/item/binoculars, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/exploration/explorer_prep) +"Wz" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "WA" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/secure/briefcase, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) +"WC" = ( +/obj/structure/stairs/spawner/west, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"WF" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/airlock_sensor/airlock_interior{ + dir = 8; + pixel_x = 24; + pixel_y = 4 + }, +/obj/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/maintenance/deck_four/aft/port) +"WG" = ( +/obj/machinery/mining/drill{ + drill_id = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) +"WH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"WI" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) "WJ" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"WL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +"WK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/forward) "WM" = ( /obj/item/radio/intercom{ broadcasting = 1; @@ -7873,12 +12861,10 @@ /obj/structure/salvageable/machine_os, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"WO" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"WQ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "WT" = ( /obj/structure/railing{ dir = 8 @@ -7891,15 +12877,6 @@ "WU" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/hallway/deck4/fore) -"WV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "WW" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7913,19 +12890,25 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/deck_four/aft/port) -"WX" = ( -/turf/simulated/floor/tiled/monotile, -/area/space) "WZ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Xa" = ( -/obj/structure/closet/crate/corporate/nanotrasen, -/turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/starboard) +"Xb" = ( +/obj/structure/flora/tree/jungle, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/rnd/research) +"Xc" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + req_access = list(47) + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/xenobiology) "Xd" = ( /obj/landmark/spawnpoint/job/scientist, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7936,6 +12919,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"Xf" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "Xg" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -7957,6 +12943,10 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"Xn" = ( +/obj/structure/frame, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "Xo" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -7978,14 +12968,29 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four) -"Xu" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +"Xs" = ( +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, /obj/machinery/door/blast/regular{ - dir = 4; - id = "mobile_miningbase" + density = 0; + icon_state = "pdoor0"; + id = "xenobio5"; + name = "Containment Blast Doors"; + opacity = 0 }, /turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/port) +/area/rnd/xenobiology) +"Xt" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) "Xv" = ( /obj/machinery/door/airlock/science{ name = "Secure Storage"; @@ -7997,10 +13002,18 @@ }, /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) -"Xx" = ( -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/engineering/shunt) +"Xw" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/gateway) "Xy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -8012,11 +13025,6 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/maintenance/deck_four/aft/port) -"Xz" = ( -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) "XA" = ( /obj/machinery/air_alarm{ dir = 4; @@ -8037,6 +13045,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"XB" = ( +/obj/structure/largecrate, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "XC" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ @@ -8048,17 +13060,23 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"XF" = ( -/obj/structure/girder/reinforced, -/turf/simulated/floor/reinforced/airless, -/area/space) -"XG" = ( -/obj/machinery/light, -/obj/machinery/suit_cycler/mining{ - req_access = null +"XE" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"XH" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "XI" = ( /obj/machinery/door/airlock/maintenance/rnd, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8068,6 +13086,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/research/testingrange) +"XJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "XK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8079,38 +13103,124 @@ "XL" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical) -"XS" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) -"XU" = ( -/obj/machinery/floodlight, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +"XM" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"XN" = ( +/obj/structure/table/woodentable, +/obj/item/paper_bin, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"XO" = ( +/obj/effect/floor_decal/techfloor/corner{ dir = 1 }, -/obj/machinery/light, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"XP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) +"XR" = ( +/obj/structure/cable/heavyduty, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"XT" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"XW" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"XX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/vending/medical{ + req_access = null; + req_one_access = list(5,44); + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"XY" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Yb" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "Yc" = ( /obj/structure/table/standard, /obj/item/multitool, /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Yi" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Gateway Prep" +"Yd" = ( +/obj/structure/table/standard, +/obj/item/slime_scanner, +/obj/item/slime_scanner, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/turf/simulated/floor/tiled/monotile, -/area/gateway/prep_room) +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Ye" = ( +/turf/space, +/area/rift/surfacebase/outside/outside3) +"Yg" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access = list(); + req_one_access = list(7,29) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "Yj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8143,10 +13253,58 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Yq" = ( -/obj/machinery/door/airlock/maintenance, +"Ym" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) +"Yn" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) +"Yp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 5 + }, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) +"Yr" = ( +/obj/structure/salvageable/machine, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/aft/starboard) +"Ys" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_monitoring) +"Yt" = ( +/obj/structure/table/woodentable, +/obj/item/folder/yellow{ + pixel_y = 5 + }, +/obj/item/pen, +/obj/item/paper{ + desc = ""; + info = "Central Command greets you, Pathfinder. If you're reading this memo, this is to remind you of your mission. Exploration is not for leisure: Nanotrasen's main interest in the Virgo system is to acquire new specimens of wildlife. Not only this, but the compiling of all Virgo flora is as important as the acquisition of fauna. Most importantly, your mission requires you to leave no crew behind. No discoveres are worth an explorer's life. We wish you a good expedition, Pathfinder."; + name = "Central Command memo"; + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/paper{ + desc = ""; + info = "I greet you, Pathfinder. I hope this message finds you well. I am Kaexae Ke'teq'xum, the first pathfinder to set foot in the very system your Tether is build, Virgo. I am too old to continue my research here, and so, between pathfinders, I only wish to grant you my luck in exploring these planets to depths I could not reach. Yours is a truly advanced shuttle and station, but its jewel is in its crew. Use it well, and discoveries will flow anew. May the stars shine bright to guide you."; + name = "Personal fax from Kaexae Ke'teq'xum"; + pixel_y = 3 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "Yu" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -8161,7 +13319,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "Yw" = ( @@ -8179,37 +13337,29 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) -"YB" = ( -/obj/machinery/status_display{ - pixel_y = 30 +"YA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 }, -/obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27 +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/airlock_sensor/airlock_interior{ + dir = 1; + pixel_y = -24 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/obj/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "YC" = ( /obj/machinery/camera/network/command{ dir = 9 }, /turf/simulated/floor/greengrid, /area/ai) -"YF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/plating, -/area/space) "YG" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, /area/main_map/hallway/deck4) -"YH" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/adv, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "YJ" = ( /obj/machinery/light/small, /obj/machinery/light_switch{ @@ -8231,13 +13381,17 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"YN" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" - }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) +"YO" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"YP" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "YQ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8250,6 +13404,19 @@ "YR" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) +"YS" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"YT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "YV" = ( /obj/item/tvcamera, /obj/item/tvcamera, @@ -8263,36 +13430,83 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck4/fore) -"YY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"YX" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/port) +"YZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "Za" = ( -/turf/space, -/area/space) -"Zh" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/machinery/light/spot/no_nightshift{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) -"Zi" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/area/quartermaster/miningdock) +"Zb" = ( +/obj/structure/disposaloutlet{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Zc" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/mains_pipe/cap/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Zd" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Ze" = ( +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four/forward/port) +"Zf" = ( +/obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/access_button/airlock_interior{ + master_tag = "smugler_airlock1"; + dir = 4; + pixel_x = -24 + }, +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"Zg" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) -"Zm" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/main_map/maintenance/deck_four) +"Zj" = ( +/turf/simulated/floor/reinforced/overhang, +/area/main_map/hallway/deck4) +"Zk" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-2" + }, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"Zl" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "Zo" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -8301,6 +13515,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/gateway) +"Zp" = ( +/turf/simulated/wall/prepainted/cargo, +/area/quartermaster/office) "Zq" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" @@ -8317,15 +13534,6 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) -"Zs" = ( -/obj/structure/closet/excavation, -/obj/item/multitool, -/obj/item/multitool, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "Zu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -8350,19 +13558,17 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"Zz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"ZC" = ( +/obj/machinery/photocopier/faxmachine{ + department = "Telescience Tower" }, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) +"ZD" = ( +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"ZA" = ( -/obj/structure/salvageable/server, -/turf/simulated/floor/plating, -/area/engineering/shunt) +/area/main_map/maintenance/deck_four/aft) "ZE" = ( /obj/machinery/atmospheric_field_generator/perma, /obj/machinery/door/blast/shutters{ @@ -8380,15 +13586,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"ZG" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_four/aft/port) "ZH" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) @@ -8400,6 +13597,16 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/miningdock) +"ZM" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) +"ZN" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/gravity_gen) "ZP" = ( /obj/structure/salvageable/console_os, /turf/simulated/floor/plating, @@ -8411,152 +13618,85 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"ZR" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/turf/simulated/floor/plating, -/area/space) "ZU" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"ZV" = ( +/obj/structure/closet/secure_closet/scientist, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"ZW" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA" + }, +/turf/simulated/wall/r_lead, +/area/engineering/gravity_gen) +"ZX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"ZY" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "ZZ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) (1,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -8578,6 +13718,77 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -8599,158 +13810,6 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(2,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -8767,6 +13826,71 @@ Dz Dz Dz Dz +CO +lB +lB +nD +lB +lB +lB +nD +lB +lB +lB +nD +lB +lB +lB +nD +lB +lB +lB +Yp +Ex +Ex +Yw +Yw +Yw +"} +(2,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -8788,163 +13912,82 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Yw -Za -"} -(3,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -8977,172 +14020,71 @@ Dz Dz Dz Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(4,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz +FV +bW +cP +DN +Zb +Ex +bW +DN +Zb +Ex +SZ +DN +cP +rP +bW +DN +Zb +Ex +bW +DN +Zb +Ex +Yw +Yw +Yw +"} +(3,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9164,11 +14106,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +nE +nE +mq +ZW +Ly +qe +Ly +Ly +Ys +Xf +Xf Dz Dz Dz @@ -9181,7 +14205,6 @@ Dz Dz Dz Dz -Za Dz Dz Dz @@ -9191,6 +14214,71 @@ Dz Dz Dz Dz +FV +cP +cP +cP +uO +Ex +cP +cP +uO +Ex +uO +cP +cP +rP +cP +JI +uO +Ex +cP +JI +uO +Ex +Yw +Yw +Yw +"} +(4,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9201,138 +14289,6 @@ Dz Dz Dz Dz -"} -(5,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -9344,11 +14300,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +Ly +Ly +Ly +RR +iV +KG +Ly +mu +gB +vf Dz Dz Dz @@ -9370,12 +14408,73 @@ Dz Dz Dz Dz +FV +cP +cP +cP +uO +Ex +cP +cP +uO +Ex +uO +cP +cP +rP +cP +cP +uO +Ex +cP +cP +uO +Ex Dz Dz Dz +"} +(5,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz -Za Dz Dz Dz @@ -9395,142 +14494,93 @@ Dz Dz Dz Dz -"} -(6,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz Dz Dz Dz Dz +Ly +ZN +Ap +Ly +gg +vX +xv +Ly +mu +mu +mu Dz Dz Dz @@ -9552,9 +14602,72 @@ Dz Dz Dz Dz +FV +Nm +Nm +Xs +ry +Ex +Nm +BS +ry +Ex +ry +EK +Nm +Ex +Nm +vQ +ry +Ex +Nm +Pc +ry +Ex Dz Dz Dz +"} +(6,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz Dz Dz Dz @@ -9569,13 +14682,99 @@ Dz Dz Dz Dz -Za Dz Dz Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Ly +ks +ks +Ly +Ly +JF +Ly +ZW +Ly +Ly +Ly Dz Dz Dz @@ -9589,138 +14788,6 @@ Dz Dz Dz Dz -"} -(7,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -9729,9 +14796,71 @@ Dz Dz Dz Dz +FV +yL +dM +XY +ob +Ex +dM +XY +ob +Ex +sR +XY +Gv +Ex +Kw +XY +ob +Ex +dM +XY +ob +Ex Dz Dz Dz +"} +(7,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9753,17 +14882,98 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +zM +xk +iq +HJ +qz +mf +jN +nb +Ro +Ly Dz Dz Dz Dz Dz -Za Dz Dz Dz @@ -9780,142 +14990,71 @@ Dz Dz Dz Dz +FV +tX +tX +tX +tX +Di +tX +tX +tX +tX +tX +tX +tX +jA +tX +tX +tX +KW +tX +tX +Mb +Ex Dz Dz Dz "} (8,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9937,11 +15076,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Kx +Kx +Kx +Kx +Kx +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +yJ +Qn +Se +Op +Se +wY +Se +gn +xE +Ly Dz Dz Dz @@ -9957,16 +15178,77 @@ Dz Dz Dz Dz -Za Dz Dz Dz Dz Dz Dz +FV +RQ +RQ +RQ +RQ +RQ +RQ +lG +gh +RQ +RQ +RQ +RQ +RQ +RQ +RQ +mc +TE +RQ +RQ +YS +Ex Dz Dz Dz +"} +(9,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9977,138 +15259,6 @@ Dz Dz Dz Dz -"} -(9,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -10120,11 +15270,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +Kx +oA +Kt +Ef +jb +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +yJ +Oa +SD +oO +oO +oO +yP +VB +xE +Ly Dz Dz Dz @@ -10146,12 +15378,73 @@ Dz Dz Dz Dz +FV +RQ +RQ +RQ +RQ +RQ +RQ +RQ +JE +RQ +RQ +RQ +RQ +RQ +RQ +RQ +mk +RQ +RQ +RQ +RQ +Ex Dz Dz Dz +"} +(10,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz -Za Dz Dz Dz @@ -10171,147 +15464,93 @@ Dz Dz Dz Dz -"} -(10,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +NS +oA +fh +al +fb +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +yJ +Oa +Pd +pm +pm +pm +XM +VB +xE +Ly Dz Dz Dz @@ -10327,25 +15566,81 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +FV +yc +Wn +cN +xi +Yd +RQ +RQ +eb +gm +zq +zq +zq +zq +zq +gm +TI +RQ +RQ +VL +if +Ex Dz Dz Dz +"} +(11,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -10363,143 +15658,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +NS +oA +fh +al +dz +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz -"} -(11,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz +Ly +cS +Oa +Pd +pm +pm +gM +XM +VB +yU +Ly Dz Dz Dz @@ -10515,9 +15760,77 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +FV +wG +wG +wG +wG +wG +rk +RQ +eb +QE +ES +Tg +xe +eS +tl +QE +TI +RQ +EU +Ex +ry +Ex Dz Dz Dz +"} +(12,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -10528,22 +15841,6 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz Dz Dz Dz @@ -10555,143 +15852,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +Kx +oA +Ua +al +dz +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz -"} -(12,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz +Ly +yJ +Oa +Pd +pm +pm +pm +XM +VB +xE +Ly Dz Dz Dz @@ -10707,9 +15954,77 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +FV +Ay +KR +cr +Nm +rt +el +RQ +eb +Vq +SA +zq +zq +QG +eP +Vq +TI +RQ +Mg +Nm +GR +Ex Dz Dz Dz +"} +(13,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -10722,18 +16037,6 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -10743,148 +16046,98 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +vt +dX +Tv +al +yz +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +yJ +Oa +Tb +cG +cG +cG +GV +VB +xE +Ly Dz Dz Dz Dz Dz -"} -(13,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -10895,9 +16148,77 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Bs +Vz +KR +KR +JY +FY +el +cJ +ip +Gx +Gx +Gx +Gx +Gx +zg +Sa +ve +Pe +wJ +Bc +IG +Ex Dz Dz Dz +"} +(14,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -10916,25 +16237,96 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +Kx +us +sj +kY +MP +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz Dz Dz Dz Dz +Ly +yJ +Br +hp +hp +hp +hp +hp +iI +xE +Ly Dz Dz Dz @@ -10947,138 +16339,84 @@ Dz Dz Dz Dz +Dz +Dz +Dz +eO +Yw +Yw +Yw +Yw +Yw +FV +ut +eU +kg +ik +zO +IX +RQ +zq +Zl +Ml +Ml +Ml +Ml +iO +zq +zq +zG +Zd +Kp +mQ +Ex +Dz +Dz +Dz "} -(14,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(15,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz Dz Dz Dz @@ -11096,6 +16434,179 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +Kx +Kx +Kx +Kx +Kx +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ly +AD +tP +bG +tP +fF +tP +bG +tP +Aw +Ly +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw +FV +Ex +Ex +Ex +Ex +Ex +Ex +Xc +Ex +Ex +FX +zq +zq +zq +Tz +zq +zq +xm +DF +Ex +Ex +Ex +Dz +Dz +Dz +"} +(16,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11110,18 +16621,6 @@ Dz Dz Dz Dz -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -11129,6 +16628,114 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +NS +dY +DE +dk +Wx +Kx +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11138,184 +16745,62 @@ Dz Dz Dz Dz +Ex +FX +pk +zq +zq +Tz +zq +zq +oq +Km +SE +zC +Ex Dz Dz Dz "} -(15,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(17,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11335,181 +16820,181 @@ Dz Dz Dz Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +LV +IC +dd +Js +pT +Oe +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Ex +Tk +Bf +hF +Db +ee +fU +Az +lc +RQ +mt +jW +Ex +Dz +Dz +Dz "} -(16,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(18,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11529,186 +17014,116 @@ Dz Dz Dz Dz -"} -(17,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +NS +rj +kH +kH +Bi +Kx +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +py +kT +py +py +py +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11718,186 +17133,64 @@ Dz Dz Dz Dz +Ex +Ex +Ex +Ex +Ex +Yg +QE +Ex +RQ +RQ +mt +by +Ex Dz Dz Dz +"} +(19,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz -"} -(18,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -11917,509 +17210,448 @@ Dz Dz Dz Dz -"} -(19,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +NS +DO +tw +AX +AX +Kx +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO kL kL kL -Ji -Ji -Ji -Ji -Ji -Ji -Ji +TY +TY +TY +TY +TY +TY +TY kL kL kL -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TV +Lx +Cu +py +py +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Ex +RQ +RQ +Tl +jS +VE +Yw +Yw +Yw "} (20,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +Kx +Kx +Kx +Kx +Kx +Kx +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO kL kL kL -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +TY +TY +TY +TY +TY +TY +TY +TY +TY kL kL kL -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +py +kT +py +Uh +Cu +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Ex +zv +zv +sf +sf +Ex +Yw +Yw +Yw "} (21,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ZI +ZI +ZI +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO kL kL kL -Ji +eO kL kL kL -Ji -Ji +TY +TY py py py @@ -12427,498 +17659,118 @@ py py py py -Ji -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(22,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -kL -kL -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +TY +TY kL kL kL +eO kL kL kL +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL +py +Cu +py kL -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Yw +Yw +Yw "} -(23,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -Ji -kL -kL -kL -kL -FQ -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -kL -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(24,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(22,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -12927,11 +17779,6 @@ Dz Dz Dz Dz -Hd -Hd -Hd -Hd -Hd Dz Dz Dz @@ -12940,179 +17787,176 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -FQ -FQ -FQ -kL -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -kL -sZ -sZ -sZ -kL -kL -kL -kL -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ZI +Dc +ZI +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +Ir +Ir +Ir +Ir +Ir +Ir +Ir +kL +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +kL +Ir +Ir +Ir +Ir +Ir +Ir +Ir +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(25,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(23,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -13121,11 +17965,6 @@ Dz Dz Dz Dz -Hd -vz -hK -IQ -Hd Dz Dz Dz @@ -13134,180 +17973,6 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -gv -gv -gv -gv -gv -ZI -ZI -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -sZ -kL -kL -kL -FQ -kL -kL -kL -rI -hM -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -sZ -sZ -kL -sZ -sZ -kL -kL -kL -kL -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -lF -lF -lF -lF -lF -lF -lF -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(26,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz Dz Dz Dz @@ -13315,192 +17980,177 @@ Dz Dz Dz Dz -Hd -vz -Ao -hw -Hd -Dz Dz Dz Dz Dz Dz Dz -Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -gv -vz -hK -IQ -gv +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ZI +ZI Dc ZI ZI -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -kL -kL -kL -Ji -Ji -Ji -kL -kL -kL -kL -rI -hM -hM -hM -rI -hM -kL -sZ -sZ -hM -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -kL -kL -kL +ZI +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +Ir +Ir +Ir +eO +Ir +Ir +Ir +Ir +XB +Ir +Ir +kL +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY kL -Ji +Ir +Ir +dJ +dJ +dJ +Ir +Ir +eO kL kL kL -Ji -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -lF -lF -ZH -ZH -ZH -qh -ZH -lF -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(27,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(24,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -13509,11 +18159,6 @@ Dz Dz Dz Dz -Hd -Kf -iZ -bS -Hd Dz Dz Dz @@ -13522,192 +18167,184 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -gv -vz -Ao -hw -gv +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +ZI +ZI +Dc +Dc Dc Dc ZI ZI -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -Ji -Ji -Ji -kL -kL -kL -hM -sZ -sZ -kk -ub -ub -rI -sZ -tv -tv -hM -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +XB +XB +XB +Ir +TY +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +TY +Ir +dJ +dJ +dJ +dJ +Ir +Ir kL kL kL kL +eO kL kL kL -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -lF -lF -ZH -ZH -ZH -ZH -ZH -ZH -lF -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(28,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Kk -zy -Nw +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(25,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -13716,611 +18353,628 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +gv +gv +gv gv -Kf -iZ -bS gv -Dc Dc Dc ZI ZI -Ji -Ji -Ji -Ji -Ji -Ji -Ji -ZI -ZI -ZI -ZI -ZI -kL -py -py -py -kL -kL -kL -hM -sZ -sZ -sZ -ub -ub -hM -kL -As -sZ -hM -rI -kL -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -kL -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -kL -Ji -Ji -Ji -kL -kL -kL -Ji -Ji -lF -lF -ZH -ZH -xA -xA -xA -Lr -Wj -lF -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +eO +Ir +Ir +Ir +dJ +Ir +Ir +Ir +XB +Ir +Ir +Ir +qq +bB +Ir +Ir +kL +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY +kL +Ir +Ir +dJ +dJ +dJ +bB +dJ +dJ +Ir +Ir +Ir +Ir +Ir +Ir +kL +eO +kL +kL +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(29,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -pY -iF -nL -sI -iF -iF -RO -aA -jV -LG -Nw -Sk -Sk -Sk -Sk -Sk -Sk -Sk +(26,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -gv -gv -gv -gv -gv -gv -gv -gv +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO gv -Kk -zy +vz +hK +IQ gv -Sq -Sq -Sq -ZI -ZI -ZI -ZI -ZI -ZI +hG +Uj +pj ZI -hW -hW ZI -Dc -Dc -Dc ZI -Ji -Za -Za -Za -Ji -kL -FQ -rI -sZ -RI -kL -kL -kL -kL -kL -As -sZ -hM -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +kL +kL +kL +TY +TY +TY +Ir +Ir +Ir +Ir +qq +bB +bB +bB +qq +bB +Ir +dJ +dJ +bB +Ir +Ir +kL +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY kL +Ir +Ir +dJ +dJ +dJ +bB +dJ +dJ +dJ +dJ +dJ +dJ +Ir +Ir kL kL -sZ -sZ -sZ kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ kL +eO kL kL -Ji -Ji -Ji kL -lF -lF -lF -lF -lF -lF -ZH -ZH -xA -ZH -gk -gk -gk -gk -gk -bi -bi -bi -bi -bi -bi -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ex +Ex +Ex +Fx +Fx +Nq +zw +DK +DK +DK +Ex +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(30,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -hP -hP -hP -hP -hP -wa -iF -aA -FE -Al -Nw -dF -UE -ux -Cw -Cw -nV -Sk +(27,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO gv -pY -iF -nL -nT -iF -iF -RO -aA -jV -LG +vz +Ao +hw gv Dc Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI pj -pj -Dc -Dc Dc ZI ZI ZI -Za -Za -Za -kL -kL -kL -hM -sZ -RI -kL -kL -kL -kL -kL -kL -rI -kL -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -kL -kL -kL -kL -kL -sZ -sZ -sZ -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -py -py -py -kL -lF -lF -ZH -ZH -ZH -ZH -ZH -ZH -xA -ZH -vS -vS -vS -vS -vS -fH -fH -fH -fH -bi -bi -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +hW +hW +hW +ZI +ZI +ZI +ZI +ZI +ZI +ZI +ZI +TY +TY +TY +Ir +Ir +Ir +bB +dJ +dJ +no +qp +qp +qq +dJ +JS +JS +bB +Ir +Ir +kL +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY +kL +Ir +Ir +bB +wO +bB +bB +dJ +dJ +dJ +dJ +dJ +dJ +dJ +bB +dJ +dJ +Ir +Ir +Ir +Ir +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +dS +ro +ro +ro +Fx +zx +Uw +Uw +qG +Ex +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(31,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -ll -ll -ll -ll -Bw -vV -wp -Nw -Pv -La -KT -Cw -Cw -Cw -Cw -Cw -nV -Sk +(28,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +eO +eO gv -hP -hP -hP -hP -hP -wa -iF -aA -FE -Al +Kf +iZ +bS gv Dc +Dc +pj +pj +pj pj pj pj @@ -14329,567 +18983,1145 @@ pj pj pj pj -Xz pj pj Dc Dc -Dc -ZI ZI -ZI -Za -Za -Za -kL -kL -kL -kL -rI -kL -kL -kL -kL -kL -kL -FQ -FQ -FQ -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -Ji -Za -Za -Za -Ji -lF -ZH -ZH -xA -xA -xA -xA -xA -xA -ZH -vS -Bt -OK -Bt -vS -ty -RA -ty -fH -bi -bi -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +py +py +py +Ir +Ir +Ir +bB +dJ +dJ +dJ +qp +qp +bB +Ir +hz +dJ +bB +qq +Ir +TY +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY +TY +Ir +dJ +dJ +xs +xs +UT +xs +xs +xs +xs +xs +xs +xs +wO +dJ +dJ +dJ +dJ +dJ +dJ +Ex +cP +bW +cP +Ex +qD +Fx +Ex +Ex +Ex +Ex +Ex +dS +ro +ro +ro +Ub +zx +Uw +Uw +Uw +Ex +eO +eO +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(32,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -lz -ki -hB -Bk -gW -kG -iF -FH -FE -mE -KT -uy -gN -GX -GX -GX -GX -GX -GX -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +(29,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO gv -ll -ll -ll -ll -Bw -vV -mr -Nw -Pv -La gv -Dc -pj -pj -pj -pj -pj -pj -pj -pj -pj +gv +gv +gv +gv +gv +gv +gv +Kk +zy +gv +Kj +ja +Kj +Kj +Kj +Kj +pF +pF +pF +pF +pF +pF +pF pj pj Dc Dc -Dc ZI -ZI -ZI -Za -Za -Za -kL -kL -kL -hM -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -kL -FQ -FQ -kL -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -kL -sZ -sZ -kL -kL -kL -kL -kL -sZ -sZ -sZ -kL -kL -kL -kL -kL -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -Za -Za -Za -kL -lF -lF -ZH -xA -ZH -ZH -ZH -ZH -ZH -ZH -vS -BV -zB -Is -vS -Bo -cm -DB -fH -bi -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +eO +Ir +XB +qq +dJ +uK +Ir +Ir +Ir +Ir +Ir +hz +dJ +bB +Ir +Ir +kL +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY +kL +Ir +Ir +dJ +xs +dJ +bB +dJ +dJ +bB +bB +bB +xs +dJ +bB +dJ +dJ +dJ +dJ +dJ +dJ +Ex +hv +Li +Li +Dq +da +Fx +FV +Ex +Ex +Ex +Ex +Ex +XW +ro +ro +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +kL +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(33,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -lz -AK -ri -wi -gW -aF -hN -lS -Zo -kS -Nw -rF -Gj -GI -Vb -Vb -Vb -Zz -GX -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji +(30,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO gv -lz -ki -hB -Bk -gW -kG +pY iF -FH -FE -mE +nL +nT +iF +iF +RO +Sr +jV +LG gv -Dc -pj -pj -pj -pj -pj +oA +Mn +Eo +Nt +jb +Kj +OC +OC +OC +Iq +OC +OC +pF pj pj Dc -ZI -RV -RV -ZI -Dc -Dc Dc ZI -Ji -Za -Za -Za -Ji -kL -sZ -rI -sZ -sZ -Ug -YF -YF -GD -Cs -rL -kL -kL -kL -kL -kL -Ji -Ji -py -py -py -py -py -py -py -Ji -Ji -kL -kL -kL -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -Za -Za -Za -kL -lF -lF -ZH -xA -ZH -ZH -ZH -ZH -ZH -ZH -vS -Ne -Ox -Bt -vS -Uf -jL -ty -fH -bi -bi -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +uK +Ir +Ir +Ir +Ir +Ir +Ir +qq +Ir +Ir +Ir +kL +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +kL +Ir +Ir +dJ +xs +bB +bB +bB +bB +bB +dJ +bB +UT +bB +bB +bB +bB +bB +dJ +dJ +dJ +Ex +cP +cP +cP +Ex +yw +Fx +FV +Ay +KR +cr +Nm +rt +mN +ro +ro +Ex +cP +bW +cP +Ex +qD +dl +Ex +cP +cP +cP +Ex +kL +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(34,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(31,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +gv +hP +hP +hP +hP +hP +wa +iF +Sr +FE +Al +gv +oA +TD +IC +Zc +fb +Kj +OC +OC +OC +OC +OC +OC +hy +pj +pj +Dc +Dc +ZI +Yw +Yw +Yw +Ir +Ir +Ir +Ir +qq +Ir +Ir +Ir +Ir +Ir +Ir +XB +XB +XB +Ir +Ir +kL +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +kL +Ir +Ir +dJ +xs +bB +dJ +dJ +dJ +dJ +dJ +bB +xs +dJ +dJ +dJ +dJ +bB +dJ +dJ +dJ +Ex +Ex +Ex +Ex +Ex +Fx +Fx +Bs +Vz +KR +KR +JY +FY +mN +ro +ro +Ex +hv +Li +Li +Dq +da +dx +Dq +Li +mi +dj +Ex +kL +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(32,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ct +ct +ct +gv +ll +ll +ll +ll +Bw +vV +mr Nw +Pv +La +gv +oA +TD +DR +BK +dz +Kj +OC +dy +PB +pF +OC +OC +pF +pj +pj +Dc +Dc +ZI +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +dJ +dJ +dJ +dJ +Ir +Ir +Ir +Ir +XB +XB +Ir +TY +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +TY +Ir +dJ +dJ +xs +wO +dJ +dJ +dJ +dJ +dJ +bB +xs +dJ +dJ +dJ +dJ +bB +dJ +dJ +dJ +Ex +cP +bW +cP +Ex +qD +Fx +FV +ut +eU +kg +ik +zO +wc +ro +ro +Ex +cP +cP +cP +Ex +yw +bV +Ex +cP +Qm +cP +Ex +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(33,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +ct +ct +ct +rT +rT +gv lz -rH -Fj -AL +ki +hB +Bk gW -lj +kG iF -uG +xn FE mE -KT -re -wS -GX -Vp -Vp -Vp -oT -GX -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji +gv +oA +TD +IC +Tf +dz +Kj +OC +dy +AU +pF +qQ +qQ +pF +pj +pj +Dc +Dc +ZI +Yw +Yw +Yw +eO +Ir +dJ +qq +dJ +dJ +WH +nW +nW +Zf +aV +wy +Ir +Ir +Ir +Ir +Ir +eQ +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +dJ +dJ +xs +bB +dJ +dJ +dJ +dJ +dJ +bB +xs +dJ +dJ +dJ +dJ +bB +bB +bB +bB +Ex +hv +Li +Li +Dq +da +Fx +FV +Ex +Ex +Ex +Ex +Ex +PU +Ho +TA +Ex +Ex +Ex +Ex +Ex +BF +Fx +Ex +Ex +Ex +Ex +Ex +kL +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(34,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +ct +ct +rT +rT +rT +rT gv lz AK @@ -14898,192 +20130,192 @@ wi gW aF hN -lS +Ue Zo kS gv -Dc -pj -pj -pj -pj -pj -pj -pj -Dc -Hb +yz +Vu +IC +Tf +us +Kj +OC +dy +AU +Cg +vo +vo +pF pj pj -Hb Dc Dc ZI -ZI -ZI -Za -Za -Za -kL -kL -kL -hM -sZ -sZ -WL -kL -kL -kL -MF -qS -kL -kL -kL -kL -kL -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -Za -Za -Za -kL -lF -lF -ZH -xA -Fv -Fv -Fv -Fv -Fv -Fv -vS -vS -Ch -vS -vS -fH -AS -fH -fH -fH -bi -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +dJ +oJ +Ir +Ir +Ir +OH +lT +Ir +Ir +Ir +Ir +It +NT +Ir +dJ +dJ +dJ +xs +xs +xs +xs +xs +xs +xs +UT +xs +xs +xs +bB +dJ +dJ +dJ +dJ +dJ +bB +xs +dJ +dJ +dJ +dJ +bB +dJ +dJ +dJ +Ex +cP +cP +cP +Ex +yw +Fx +Ex +cP +cP +cP +Ex +qD +Fx +tL +ro +Ex +cP +cP +cP +Ex +qD +dl +Ex +cP +bW +cP +Ex +kL +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (35,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -Dg -Dg -Dg -Dg -nz -uH -wp -We -IK -Jt -KT -uf -vn -GX -Vp -jl -Ou -EX -GX -Za -Za -Za -Za -Ji -Ji -Ji -kL -kL -kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +If +qY +rT +rT +rT +rT gv lz rH @@ -15092,192 +20324,192 @@ AL gW lj iF -uG +qF FE -mE +nk gv -Dc -pj -pj -pj -pj -pj +MP +nY +IC +ac +dk +Kj +OC +dy +AU +Cg +ml +ml +pF pj pj Dc -Hb -ag -ag -Hb -Dc Dc ZI -ZI -ZI -Za -Za -Za -kL -kL -kL -hM -sZ -sZ -WL -kL -kL -kL -wj -tW -kL -kL -kL -kL -kL -Ji -Ji -py -py -py -py -py -py -py -Ji -Ji -kL -kL -kL -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -Za -Za -Za -kL -lF -lF -ZH -xA -Fv -VN -ci -TP -VN -Fv -hC -LJ -tO -vJ -RS -yO -SS -yr -JQ -XL -VX -kL -kL -kL -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +dJ +oJ +Ir +Ir +Ir +qu +kb +Ir +Ir +Ir +Ir +Ln +zs +Ir +dJ +dJ +dJ +xs +dJ +dJ +dJ +dJ +dJ +dJ +bB +bB +bB +bB +bB +dJ +dJ +dJ +dJ +dJ +bB +xs +xs +xs +xs +xs +UT +xs +xs +dJ +Ex +Ex +Ex +Ex +Ex +BF +Fx +Ex +hv +Li +Li +Dq +da +Fx +tL +ro +Ex +hv +Li +Li +Dq +da +dx +Dq +Li +mi +dj +Ex +kL +kL +kL +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (36,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -jI -jI -jI -jI -jI -xt -iF -aA -FE -DJ -Nw -Cw -Cw -GX -Vp -Vp -Vp -gG -GX -Za -Za -Za -Za -Ji -Ji -Ji -kL -kL -kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +If +ZC +rT +rT +rT +BD gv Dg Dg @@ -15288,10 +20520,211 @@ uH mr Nw IK -Jt +bc gv -Dc +DO +nY +IC +ac +Wx +Kj +OC +Wl +pF +pF +pF +pF +pF pj +nZ +ZI +ZI +ZI +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +dJ +oJ +Ir +Ir +Tr +dJ +dJ +Wg +dJ +Ir +Ir +Ir +YA +Ir +dJ +dJ +dJ +xs +dJ +bB +bB +ZD +bB +bB +bB +dJ +dJ +dJ +bB +dJ +dJ +dJ +dJ +dJ +bB +dJ +dJ +dJ +xs +dJ +bB +dJ +xs +dJ +Ex +cP +cP +cP +Ex +qD +Fx +Ex +cP +Qm +cP +Ex +yw +Fx +tL +ro +Ex +cP +Qm +cP +Ex +yw +bV +Ex +cP +cP +cP +Ex +kL +kL +kL +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(37,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +If +AT +rT +rT +rT +Es +gv +jI +jI +jI +jI +jI +xt +iF +Sr +FE +Xw +gv +dY +VS +Nh +oK +DE +Kj +OC +OC +ss pj pj pj @@ -15299,373 +20732,172 @@ pj pj pj Dc -ZI -ZI -ZI -ZI -Dc Dc ZI -ZI -ZI -Za -Za -Za -kL -kL -kL -hM -sZ -sZ -WL -kL -kL -jf -sZ -sZ -qC -sZ -sZ -jf -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -kL -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -Ji -Za -Za -Za -Ji -lF -ZH -ZH -xA -Fv -yM -cv -Ks -VN -Fv -nI -NY -jD -wg -jD -EP -tz -jD -pD -XL -VX -kL -kL -kL -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(37,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -zu -iF -AW -bC -MO -iF -RO -aA -gO -JM -Nw -Cw -Cw -GX -nm -xx -Id -lE -GX -Za -Za -Za -Za -Ji -Ji -Ji -kL -kL -kL -gv -jI -jI -jI -jI -jI -xt -iF -aA -FE -DJ -gv -Dc -pj -pj -pj -pj -pj -pj -pj -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI -Ji Dz Dz Dz -kL -kL -kL -hM -kL -kL -Nf -kL -kL -ay -kL -kL -kL -sZ -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -kL -kL -kL -sZ -kL -kL -kL -sZ -sZ -sZ -kL -kL -kL -sZ -kL -kL -kL -sZ -kL -kL -kL -py -py -py -kL -lF -lF -ZH -xA -Fv -VN -hS -Ku -VN -Fv -Gy -qI -fc -fc -fc -wQ -fc -fc -fc -fc -Vc -kL -kL -kL -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Ir +Ir +Ir +bB +Ir +Ir +VK +Ir +Ir +ib +Ir +Ir +Ir +dJ +Ir +Ir +yi +zs +xs +xs +xs +xs +xs +dJ +bB +dJ +dJ +dJ +dJ +qq +dJ +dJ +dJ +bB +dJ +dJ +Ir +Ir +pa +pF +pF +pF +pF +LL +pF +pF +dJ +xs +dJ +Ex +hv +Li +Li +Dq +da +Fx +Ex +Ex +Ex +Ex +Ex +BF +Fx +tL +ro +Ex +Ex +Ex +Ex +Ex +Fx +Fx +Ex +Ex +Ex +Ex +Ex +kL +kL +kL +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (38,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Nw -xr -Sv -CD -sz -Yi -gw -gw -gw -GX -HT -GX -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +ct +ct +ju +ju +rT +Es gv zu iF @@ -15674,421 +20906,421 @@ dp MO iF RO -aA +Sr gO -JM +xV gv +AX +VS +IC +ac +lm +Kj +Su +dy +Sq +Dc +Dc Dc pj pj pj pj pj -pj -pj -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI -ZI ZI py py py +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Tr +Ir +Ir +to +RK +dJ +dJ +dJ +dJ +xs +dJ +bB +dJ +dJ +dJ +dJ +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +pa +pa +AY +OC +OC +OC +OC +pF +dJ +xs +dJ +Ex +cP +Qm +cP +Ex +yw +Fx +Fx +Fx +ro +ro +ro +ro +ro +tL +ro +ro +ro +ro +Fx +uc +Fx +dl +Ex +cP +VO +cP +Ex +kL +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(39,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +ct +ct +ct +ct +Es +gv +gv +gv +gv +gv +gv +gv +gv +gv +xr +yY +bu +AX +ul +kH +yK +XX +Kj +Fp +dy +ui +ui +ui +ui +ui +ui +pj +Dc +pj +ZI +TY +TY +TY +Ir +Ir +Ir +TY kL kL +TY kL kL +TY kL kL kL +TY kL +Ir +Ir +Ir +Ir +Ir +Ir +Ir +BM +Ir +bB +Ir +Ir +Ir +Ir +Ir +Ir +TY kL kL kL -kL -kL -kL -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -Ji -Ji -Ji -kL -aR -aR -aR -Ki -Fv -Fv -dL -jQ -Fv -Fv -nI -eL -fc -qW -rK -vh -rK -qW -fc -Vc -Vc -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(39,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Hi -Hi -Hi -Hi -Hi -Hi -gw -YB -lW -Ww -mJ -qM -ng -ng -LX -rJ -gw -CC -lE -GX -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -gv -gv -gv -gv -gv -gv -gv -gv -gv -xr -Sv -bu -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI -ZI -ZI -Ji -Ji -Ji -kL -kL -kL -Ji -kL -kL -Ji -kL -kL -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -kL -kL -kL -py -py -py -kL -aR -jk -xC -iA -cK -Ll -Cq -YY -fJ -rq -de -Da -fc -WA -bk -SU -jJ -bN -fc -Vc -Vc -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +TY +Ir +Ir +pa +pF +DU +OC +OC +OC +OC +pF +dJ +xs +dJ +Ex +Ex +Ex +Ex +Ex +Fx +Fx +Fx +SG +vI +bI +jO +jO +jO +EN +jO +jO +jO +jO +Le +pd +Fx +dx +Dq +Li +mi +dj +Ex +kL +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (40,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nr -SM -SM -oZ -qO -pZ -gw -XS -Wq -IE -mJ -ng -ng -GN -tk -Zs -gw -Vp -lE -GX -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -sd -xT -xT -xT -xT -xT -xT -xT -xT -sT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -VU -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ct +ct +XP +AF +DW +Yn +AF +AF +uA +xa +cz +xa +dG +Ym +Um +Kj +Kj +Ky +fe +Kj +Kj +OC +uW +vZ +WQ +wr +bJ +bm +ui +pj Dc -ZI -ZI +sX ZI py py py -Ji -Ji +TY +TY ho ho ho @@ -16102,187 +21334,187 @@ Dz Dz Dz Dz -Dz -Dz -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -py -Za -Za -Za -Za -Za -Za -Za -Za -py -py -py -py -py -Za -Za -Za -Za -Za -Za +TY +TY +TY +Yw +Yw +uh +YZ +YZ +YZ +uh +Yw +Yw +TY +TY +TY py -Ji +Yw +Yw py -Za -Za -Za -Ji -Po -Ty -gc -jk -Cc -mh -wl -Wf -jk -Xv -jD -tC -fc -tf -rK -NR -rK -WA -fc -Vc -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Dz +ho +jy +OC +cF +OC +OC +OC +OC +pF +dJ +xs +dJ +dJ +CY +Fx +Fx +Fx +Fx +Fx +Fx +Fx +ro +et +Fx +qB +bj +nX +nX +mC +ro +ro +Fx +Nj +Fx +bV +Ex +cP +Qm +cP +Ex +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (41,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -sA -sA -pH -Sd -Sd -mM -gw -wA -ab -ng -mJ -ng -ng -MN -Fz -XU -gw -ym -lE -GX -Za -Za -Za -Za -Za -Za -Za -Za -Ji -sd -sd -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -cf -nC -zS -zS -zN -zS -Dc -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +yR +XP +lY +lY +QD +rh +lY +td +Ev +Lz +Ev +Ev +Qt +xa +Bn +OY +OY +MZ +OY +Bn +OC +uW +KH +rb +rb +Mr +cE +ui +WI +Dc +Eu ZI -Ji -Za -Za -Za -Ji -Ji +Yw +Yw +Yw +TY +TY py Hr TV @@ -16296,380 +21528,380 @@ ai ai ai Cu -Wv -UQ -UQ -Hr +Hs +EE +EE Hr Hr -uT -uT -uT +EB +hD +hD +hD +EB Hr Hr -Hr -UQ -UQ -UQ +EE +EE +EE Cu ai ai +Hr ai ai -ai -ai -ai -RT -TV -TV -Cu -py -py -Za -Za -Za -Za -Za -Za -py -Ji -py -Za -Za -Za -Ji -rB -yE -Ke -fG -aR -tG -Af -uQ -tG -XL -Kv -PL -fc -iB -RH -IB -UZ -Lu -fc -Vc -Vc +nq +tg +Zq +VR +eG +VR +pF +OC +OC +pF +dJ +xs +dJ +dJ +Ex +pv +pv +Fx +Fx +Fx +Fx +Fx +ro +et +Fv +Fv +Fv +Fv +Fv +Fv +ro +ro +vS +vS +vS +vS +fH +fH +fH +fH +fH kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (42,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -fV -fV -Rs -UG -Sd -dv -Ri -kj -IE -ng -wz -oB -ng -cx -mn -UH -CD -Vp -Dw -GX -Za -Za -Za -Za -Za -Za -Za -Za -Ji -sd -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -SP -Dc -Dc -Dc -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +bt +bt +bt +KN +KN +KN +KN +KN +Gd +Yw +Yw +Yw +Yw +Yw +Yw +yR +Io +lh +nr +yB +Ih +lh +Xt +me +cY +me +me +zm +jj +vY +hL +OR +TB +rd +RX +lL +hr +KH +XN +Yt +Tu +BI +ui +Pk Dc ZI ZI -ZI -Za -Za +Yw +Yw ai -Wv -Wv +Hs +Hs Mz py py py -Za -Za -Za -Za -Za -Za -Za -Za -py -Ji -Ji -Ji -py -py -py -py -py -py -py -py +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw py -Ji -Ji -Ji +TY +TY +TY py -Za -Za -Za -Za -Za -Za -Za -Za py +uh +Ij +Ij +Ij +uh py py -Uh -fC -uq -ai -Za -Za -Za -Za +TY +TY +TY py -Ji +Yw +Yw py -Za -Za -Za +Yw +Yw +Dz +ho +bB +dJ +dJ +MW +eG +OC +OC +pF +dJ +xs +dJ +dJ +Ex +Ex +Ex +zx +zx +Ex +Ex +Ex +zx +nt +Fv +VN +ci +TP +VN +Fv +bX +bX +vS +Bt +OK +Bt +fH +ty +RA +ty +fH kL -aR -yE -Ke -fG -aR -Xa -wl -Wf -Xa -XL -cR -XL -fc -fc -fc -fc -fc -fc -fc -Vc -Vc kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (43,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -sA -sA -Dh -Sd -Sd -mM -iD -eD -hi -AH -jK -dB -Kb -tR -is -Ok -EI -mx -Fh -GX -Za -Za -Za -Za -Za -Za -Za -Za -Ji -sd -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +Tp +FL +bt +hU +Ct +bQ +UI +KN +Gd +Yw +Yw +Yw +Dz +Yw +Yw +uA +uA +lY +lY +lY +lY +lY +lt +Tp +Tp +Tp +lt +Ev +xa +Bn +tF +OY +MZ +OY +Bn +OC +hr +ui +Qz +DT +TR +qT +ui +Pk Dc Dc ZI -ZI -ZI -Ji -Wv -ZI -ZI +TY +Hs +pa +pa ZI py Cu @@ -16677,516 +21909,323 @@ py kL kL kL -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -kL -kL -kL -kL -zh -sZ -zh -kL -kL -kL -kL -Ji -kL -kL -kL -Ji -kL -kL +TY kL -Ji kL kL -kL -py -Cu -py +TY kL kL kL -YN -Un -Un -Un +TY kL kL kL -Ji -Ji -Ji +Ir +dJ +dJ +dJ +Ir +pa +pa +pa +TY +pa +pa +pa +TY +pa +pa +pa +pa +pa +Ir +dJ +dJ +MW +eG +OC +OC +pF +dJ +xs +dJ +dJ +Gs +Rp +Pf +IJ +IJ +Lt +Rp +Gs +Rq +dQ +Fv +yM +cv +Ks +VN +Fv +Ex +Ex +vS +BV +zB +Is +fH +Bo +cm +DB +fH kL -aR -yE -Ke -fG -aR -AR -mh -Cc -MK -XL -XL -XL -lF -lF -lF -lF -lF -lF -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (44,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -SM -SM -SM -sV -mM -Zh -gw -Wk -WV -ng -gI -Qb -fS -iT -vG -KL -CD -Vp -Vp -GX -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI -ZI -ZI -Wc -hW -ZI -ZI +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +Tp +SV +bt +mX +Ct +st +Bz +KN +Gd +Yw +Yw +Yw +Dz +Yw +Yw +Yw +uA +AF +lY +lY +AF +AF +lt +Tp +Tp +Tp +lt +xa +Um +Kj +Kj +Ky +IP +Kj +Kj +OC +hr +ui +vC +Ba +Hw +qa +ui +Pk +Dc +Rv ZI -Ji -Wv -Ji -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -Wt -Dp -PI -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -Ji -Wv -Ji -pa -pa +DL +Zj pa -OC -DU -DU -RZ pa pa +TY +Hs +TY pa pa pa pa pa -rZ -yE -Ke -fG -aR -MK -gC -WO -MK -aR -ZH -lF -lF -lF -ZH -lF -lF -lF -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(45,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -rS -rS -rS -Hi -Sd -lf -gw -vd -WV -ng -gI -tS -fS -tr -sO -tq -gw -GX -GX -GX -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -sd -sd -sd -sd -sd -sd -hW -hW -hW -sd -sd -Dc -Dc -Dc -Dc -Dc -Dc -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -aj -eE pa pa pa -jy -Zq -jy pa pa pa -eE pa pa pa -eE pa +Ir +dJ +dJ +dJ +Ir pa pa -sZ -kL -kL -kL -sZ -Wt -xX -PI -sZ -kL -kL -kL -sZ -kL pa pa -AU pa pa pa -AU pa pa pa -jy -dT -jy pa pa pa +Ir +dJ +dJ +MW +eG OC OC -OC -OC -pa -pa -pa -vo -vo -vo -vo -rZ -yE -Ke -fG -aR -aR -aR -aR -aR -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +pF +bB +UT +bB +bB +Gs +Rp +Lt +IJ +IJ +Lt +Rp +Gs +Pz +fK +Fv +VN +hS +Ku +VN +Fv +cR +cR +vS +Ne +Ox +Bt +fH +Uf +jL +ty +fH +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(46,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(45,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -17194,193 +22233,580 @@ Dz Dz Dz Dz -gw -OG -pl -ng -gI -GP -fS -iT -sO -PE -gw Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -sd -TG -TG -TG -TG -TG -sd -Dc -Dc -Dc -Dc -Dc -Dc -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -PJ -AU -AU -DV -AU -CT -UN -BP -AU -DV -AU -AU -AU -AU -AU -AU -AU -AU +Dz +Dz +Gd +Tp +gE +bt +Ds +Ct +Cf +ls +KN +Gd +Yw +Yw +Yw +Dz +Yw +Yw +Yw +Um +Um +Ev +Ev +Um +lt +lt +Tp +Tp +Tp +lt +lt +Um +Qs +Kz +eT +YT +QS +Kj +Su +hr +ui +ui +ui +ui +ui +ui +oY +Sq +Sq +ZI +Zq +jy pa -sZ -sZ -Pb -hM -hM -Pt -GS -Pt -hM -hM -sZ -sZ -sZ -kL -AU -AU -AU -AU -AU -AU -AU -AU -DV -AU -CT -UN -BP -AU -DV +pa +pa +jy +Zq +jy +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +iP +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +yk +QA +pF +OC +OC +OC +OC +OC +OC +OC +Gs +Rp +Lt +IJ +IJ +Lt +Rp +Gs +Pz +fK +Fv +Fv +dL +jQ +Fv +Fv +XL +XL +vS +vS +Ch +vS +fH +fH +AS +fH +fH +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(46,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +Tp +SV +bt +ZV +Dd +pX +vw +KN +Gd +Yw +Yw +Yw +Dz +Yw +Yw +Yw +Um +xa +Ev +Ev +iR +lt +Tp +Tp +Tp +Tp +Tp +lt +Cm +eT +JL +Go +nO +QS +Kj +OC +hr +hr +NE +KV +KV +KV +KV +KV +KV +KV +YO +uY +kz +KV +gL +KV +YO +uY +kz +KV +gL +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +jr +KV +YO +uY +kz +KV +KV +KV +UP +IT AU AU +Gs +IJ +Lt +IJ +IJ +Lt +IJ +Gs +Pz +Qp +XH +gP +zA +IS +CL +rq +LJ +Qk +NI +oR +tO +Vh +RS +yO +SS +JQ +XL +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(47,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +Tp +SV +bt +KN +KN +LR +nc +KN +Gd +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +xa +Ev +Ev +aM +RC +Tp +Tp +Tp +Tp +Tp +lt +MG +IU +hn +hn +yq +Oq +Kj +OC +OC +OC +OC AU AU AU AU AU AU +oc +Ob +BB +lM +oc +oW +oc +Ob +BB +lM +oc +oW +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +eA +oc +Ob +BB +lM AU AU AU AU -DV -ff -Ke -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Uk +sq +sq +jo +rW +vk +vk +vk +vk +vk +UL +mj +xw +zZ +sk +pG +Mm +JW +Xv +jD +Rk +Nc +HR +jD +wg +jD +EP +tz +pD +XL +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(47,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(48,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -17388,70 +22814,83 @@ Dz Dz Dz Dz -gw -YH -sg -ht -fE -GP -fS -tr -sO -XG -gw Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -TG -TG -TG -TG -TG -TG -hW -Dc -Dc -Dc -Dc -Dc -Dc +Dz +Dz +Dz +Gd +oo +jz +bt +on +Nk +bp +DY +yd +Gd +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +at +Ev +Ev +lk +RC +Tp +Tp +wf +Tp +fN +lt +JU +IU +hn +wd +oP +vm +Kj +Sq +Sq +Sq +Sq +Sq AU AU AU AU AU AU +CT +AM +BP AU +DV +sW +CT +AM +BP +sW +DV +AU +AU +sW AU AU AU AU AU AU -PJ AU AU -DV AU -CT -AM -BP AU -DV AU AU AU @@ -17460,21 +22899,6 @@ AU AU AU AU -pa -sZ -sZ -WL -ZR -hM -sZ -GS -sZ -hM -ZR -sZ -sZ -sZ -kL AU AU AU @@ -17483,292 +22907,100 @@ AU AU AU AU -DV AU +AU +ge +sW CT AM BP AU -DV AU AU -Cp -sq -sq -sq -sq -sq -sq -sq -sq -sq -dq -Jv -KS -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(48,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -gw -yV -lZ -nu -lN -fS -iT -sw -PE -gw -Dz -Dz -Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -TG -TG -TG -fo -TG -TG -hW -Dc -Dc -Dc -Dc -Dc -Dc -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -PJ -AU -AU -DV -AU -CT -AM -BP -AU -DV -AU -AU -AU -AU -AU -AU -AU -Py -wt -HU -rs -Ai -YF -hE -YF -DH -sZ -Yq -sZ -sZ -sZ -sZ -kL -AU -AU -AU -AU -AU -AU -AU -AU -DV -AU -CT -AM -BP -AU -DV -AU AU Hf +sW AU -AU -AU -AU -AU -AU -AU -AU -AU -DV -Iz -nn -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +uu +yn +WJ +WJ +WJ +tH +WJ +WJ +jP +rp +Fv +UU +dL +jQ +UU +XL +pP +Kv +PL +fc +fc +fc +fc +wQ +fc +fc +fc +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (49,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -17777,62 +23009,62 @@ Dz Dz Dz Dz -gw -gw -gw -gw -gw -gw -gw -gw -gw -gw Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -TG -TG -TG -TG -TG -TG -hW -Dc -Dc -Dc -Dc -Dc +Dz +Dz +Gd +Ud +dC +dC +Vo +mB +Pg +OQ +yd +Gd +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +xa +Ev +Ev +aM +RC +Tp +Tp +Tp +Tp +Tp +lt +kE +PW +gQ +gQ +nG +CV +zP +pj +pj Dc +np Sq -pF -pF -pF -pF -pF AU AU -pF AU AU AU AU -DA -Cg Cg +DA +pF +pF pa pa jy @@ -17844,35 +23076,35 @@ pa pF pF Xh -pa -AU -AU -AU -pa -kL -kL -kL -kL -kL -sZ -sZ -sZ -kL -kL -kL -kL -kL -kL -AU +pF +pF +pF +pF +pF +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +vD AU AU -vD -vD -vD -vD -vD -vD -pa +qh +qh +qh +vc +qh +qh +qh +lF +lF jy Zq jy @@ -17880,89 +23112,89 @@ pa pa pa pa -FA +FZ pa EY EY EY EY +mK +kM EY EY EY -EY -EY -yE -Ke -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Pz +fK +Fv +wb +hS +Ku +wb +Fv +XL +XL +XL +fc +fc +qW +rK +vh +rK +qW +fc +kL +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (50,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -17970,107 +23202,107 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -sd -TG -TG -Ta -TG -TG -sd -Dc -Dc -Dc -Dc -Dc -Dc -Ps -Dc -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +xa +yI +yI +Ko +lt +Tp +Tp +Tp +Tp +Tp +lt +gp +ii +ta +oz +nj +nj +Kj Dc +pj Dc -pF +Aj +Sq +Ru AU AU pF -xT -xT -xT -Jy -Jy -ig -tb -ZI -ZI -Za +vB +hu +VR +eE +eE +eE +pa +pa +Yw ai -Za +Yw kL kL kL iS eE eE -pa -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU +pF +eE +eE +eE +eE +kf +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +vD AU AU -AU -AU -AU -AU -AU -AU -Mv -sZ -sZ -sZ -sZ -Mv -Ji -Za +qh +ZH +ZH +ZH +ZH +OM +dP +lF +eO +Yw ai -Za -Ji +Yw +eO lF ZH ZH @@ -18080,190 +23312,190 @@ EY Hp Sp Yc -TF +Sp pS Bg pS EY -Em -Zi -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH +Gl +BH +Fv +zp +ha +Pl +kw +Fv ZH ZH ZH ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +fc +WA +bk +SU +jJ +bN +fc +kL +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (51,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -sd -sd -sd -sd -sd -sd -sd -sd -sd -sd -sd -hW -hW -ZI -ZI -ZI -ZI -ZI -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +Um +Um +Um +Um +lt +lt +zz +zz +zz +lt +lt +Kj +Kj +Kj +Kj +Kj +Kj +Kj Dc +pj Dc Dc -pF +Sq +AU AU AU pF -xT -xT -Jy -Jy -Jy -Jy -Jy -ZI -Ji -Za +Cg +Cg +pF +eE +eE +eE +pa +pa +Yw ai -Za -Ji +Yw +eO kL kL eE eE YG -pa -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU +pF +eE +eE +eE +eE +kf +Ly +zM +xk +iq +HJ +HJ +HJ +PK +nb +Ro +Ly +vD AU AU -Mv -sZ -sZ -sZ -sZ -Mv +qh +ZH +ZH +ZH +ZH +OM +Yr +lF kL -Za +Yw ai -Za +Yw kL lF lF @@ -18277,146 +23509,146 @@ Sc Sp GB GB -GB +wB EY -yE -Ke -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -pf -ZH -ZH -ZH -ZH +Pz +fK +Fv +kw +Ii +bD +kw +Fv ZH ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +wP +xA +fc +tf +rK +NR +rK +WA +fc +kL +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (52,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ZI -Ji -Ji +eO +eO py py py py -Ji -Ji -Ji +eO +eO +eO py py py py -Ji -Ji +eO +eO hW Dc -Dc -Dc -Dc -pF +pj +pj +pj +JD AU AU -pF -xT -Jy -Jy -Jy -Jy -Jy -Jy -ZI -ZI +AU +iP +vo +vo +vo +vo +eE +eE +pa +pa py Cu py @@ -18426,42 +23658,42 @@ kL eE eE eE -pa -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU +pF +eE +eE +eE +eE +kf +Ly +yJ +Om +HG +HG +HG +HG +vp +sv +xE +Ly +vD AU AU -AU -AU -AU -AU -Mv -sZ -sZ -sZ -sZ -Mv +qh +ZH +ZH +ZH +ZH +AO +eW +lF kL -Za +Yw ai -Za +Yw kL lF lF -ZH +Hj Lq ZH EY @@ -18473,147 +23705,147 @@ Sp Sp NP EY -yE -Ke -Bh -Gs -Gs -Gs -Gs -Gs -Gs -Gs -Gs -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Pz +fK +Fv +Fv +Fv +Fv +Fv +Fv +Fv +XL +XL +xA +fc +iB +RH +IB +UZ +Lu +fc +kL +eO +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (53,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +bt +im +im +bt +im +im +bt +VC +VC +xj +xj +xj +xj +VC +VC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO ZI -Ji -Ji +eO +eO CG CG -lK -lK +qc +qc CG -lK -lK +qc +qc CG CG -Mf -Us +eH +Sh CG CG -Ji +eO hW Dc Dc Dc -Dc -pF +pj +Sq +AU AU AU pF -Jy -Jy -Jy -Jy -Jy -ZG -yl -ZI -ZI -XF -sG -XF +eE +eE +EW +vo +hl +qv +pa +pa +bR +CA +bR kL kL kL @@ -18621,44 +23853,44 @@ eE eq pq pa -kL -kL -kL -kL -kL -kL -kL -kL -Mv -jE -jE -jE -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv sZ sZ sZ sZ -Mv +kf +Ly +yJ +XE +SD +oO +oO +oO +PX +kJ +xE +Ly +vD +AU +AU +qh +ZH +ZH +ZH +ZH +Ff +jk +lF kL -Za +Yw ai -Za +Yw kL lF lF cC zf Qc -zI +xo XK XK Pj @@ -18667,111 +23899,111 @@ Ck hk rO EY -yE -Ke +Pz +fK Ws Qa Qa -Qa -HQ +wm +bF Qa MA mb Gs -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +xA +fc +fc +fc +fc +fc +fc +fc +kL +eO +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (54,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +im +Be +Be +Be +Be +Be +Be +VC +lQ +GZ +GZ +GZ +GZ +hZ +VC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO py CG Wp @@ -18779,32 +24011,32 @@ aW XC fM WZ -oS zb +oS HA Gh QJ -Xu -RB +yX +ME py ZI Dc Dc Dc -np -pF +gU +Sq AU AU pa -ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI +pa +pa +pa +pa +pa +pa +pa +pa +pa Cu py py @@ -18819,34 +24051,34 @@ sZ sZ sZ sZ -sZ -sZ -sZ -kL -Mv -gz -gz -gz -Mv -sZ -sZ -sZ -Fd -sZ -sZ -sZ -sZ -hM -sZ -sZ -sZ -sZ -Mv -Ji -Za +kf +Ly +yJ +XE +Pd +pm +pm +pm +vl +kJ +xE +Ly +vD +AU +AU +qh +ZH +ZH +ZH +ZH +ZH +ZH +lF +eO +Yw ai -Za -Ji +Yw +eO lF ZH hH @@ -18861,113 +24093,113 @@ Sp kZ Bp EY -ur -Ke +zk +fK IJ IJ cc WJ -NN +OI WJ MA mb Gs -ZH -ZH -ZH -ZH +xA +xA +xA +xA ZH ZH ZH lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(55,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(55,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +im +kO +NZ +NZ +NZ +NZ +Be +zD +RL +GZ +GZ +GZ +GZ +GZ +xj +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO py -Xu +ky US Hb Hb @@ -18978,21 +24210,21 @@ zb HA Gh cA -Xu -RB +Am +ME py ZI Dc Dc Dc -Aj -pF +dI +Sq AU AU pa py Cu -Wv +mp Cu Cu Cu @@ -19005,7 +24237,7 @@ py py py py -Ji +eO py py kL @@ -19013,29 +24245,29 @@ sZ sZ sZ or -sZ -sZ -sZ -kL -Mv -gz -gz -gz -Mv -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -hM -sZ -sZ -sZ -sZ -Mv +kf +Ly +cS +XE +Pd +pm +pm +gM +vl +kJ +yU +Ly +vD +AU +AU +qh +ZH +ZH +ZH +ZH +ZH +ZH +lF kL py Vd @@ -19054,13 +24286,13 @@ Iv Sp Sp Sp -Sp -yE -Ke +mK +Pz +fK IJ IJ Bh -Gs +na Gs qx Gs @@ -19068,100 +24300,100 @@ Gs Gs Gs Gs -Gs -Et -Gs -ZH ZH +xA +qh +qh +qh lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (56,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +bt +be +iC +NZ +NZ +NZ +Be +zD +IY +GZ +Yb +XJ +GZ +GZ +xj +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO py -Xu +ky hY Hb zb @@ -19174,15 +24406,15 @@ hW Nl CG CG -Ji +eO ij tT vP vP vP vP -VM -VM +Pr +qw ij Cu BT @@ -19207,29 +24439,29 @@ sZ sZ sZ Cv -sZ -sZ -sZ -kL -Mv -gz -gz -gz -Mv -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -Mv +kf +Ly +yJ +XE +Pd +pm +pm +pm +vl +kJ +xE +Ly +vD +AU +AU +qh +qh +qh +vc +qh +qh +qh +lF kL py Vd @@ -19237,7 +24469,7 @@ py kL lF lF -hH +jB ZH ZH EY @@ -19247,113 +24479,113 @@ op Iv Sp fw -Sp -kM -yE -Ke +lD +EY +ar +fK IJ IJ Bh -na +AZ Yy EF EF -lo +Xb EF -yH -na -Pz -Bh +Iw Gs ZH +xA +qh +ZH +ZH +ZH ZH lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (57,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +zz +be +iC +NZ +NZ +NZ +Be +zD +RL +GZ +Dv +xO +Ak +cQ +VC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO ZI -Ji +eO py CG Tw @@ -19369,16 +24601,16 @@ wv tD Ow py +Bm +NU +zV +NU +eh +vP +nS +nS ij -Rh -Rh -Rh -Rh -Rh -Rh -Rh -ij -Wv +mp BT mR mR @@ -19395,35 +24627,35 @@ mR mR mR BT -Ji +eO kL LS sZ sZ sZ -sZ -sZ -sZ -kL -Mv -nM -nM -nM -Mv -Mv -Mv -sZ -sZ -sZ -aq -aq -sZ -sZ -sZ -sZ -sZ -sZ -Mv +kf +Ly +yJ +XE +Tb +cG +cG +cG +Nn +kJ +xE +Ly +vD +AU +AU +qh +GA +Qu +Wh +Wh +Wh +Zg +lF kL py Vd @@ -19443,8 +24675,8 @@ Sp Sp sE kM -yE -ed +Pz +SO IJ IJ Bh @@ -19454,101 +24686,101 @@ cw gY cw FP -ol -na -Pz -Bh +cw Gs ZH +xA +gd +ZH +ZH ZH ZH lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (58,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +zz +be +iC +NZ +NZ +NZ +Be +VC +gs +GZ +GZ +yb +VC +VC +VC +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ZI -Ji +eO CG yg bZ @@ -19563,14 +24795,14 @@ tt vg WW CK -uL -JK -ji -ji -ji -ji -Rh -Rh +EC +dH +dH +Wd +fL +GM +cZ +nS ij Cu BT @@ -19595,34 +24827,34 @@ kL kL kL kL -kL -sZ -sZ -kL -Mv -gz -gz -gz -gz -MX -ih -sZ -sZ -sZ -sZ -sZ -sZ -hM -sZ -sZ -sZ -sZ -Mv -Ji -Za +kf +Ly +yJ +Gk +oF +oF +oF +oF +kl +Wz +xE +Ly +vD +Cn +Cn +qh +TK +aS +jk +jk +jk +fG +lF +eO +Yw ai -Za -Ji +Yw +eO lF ZH hH @@ -19637,8 +24869,8 @@ Sp EA LM kM -yE -ed +Pz +SO IJ IJ fu @@ -19647,102 +24879,102 @@ Qa Qa Qa Qa -Qa -Qa -Qa -Vl -Bh +xh +IJ Gs ZH +xA +qh +ZH +ZH +ZH ZH lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (59,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +zz +be +QC +kO +kO +kO +Be +VC +CH +Cr +GZ +Oz +xj +Ye +Ye +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ZI -Ji +eO CG Hb Sq @@ -19754,17 +24986,17 @@ CG Th Zy gx -xu +CR Xy py -ij -Rh -Rh -Rh -Rh -ji -Rh -Rh +Lv +NU +KD +NU +EH +vP +cZ +nS ij Cu BT @@ -19786,39 +25018,39 @@ BT py py py -Ji +eO py py -kL -kL -sZ -kL -Mv -gz -gz -gz -gz -MX -dn -sZ -sZ -sZ -sZ -sZ -sZ -hM -sZ -sZ -sZ -sZ -Mv -kL -Za -ai -Za -kL +kf +Ly +AD +tP +bG +In +fF +rM +dW +tP +Aw +Ly +WU +GW +GW +qh +TK +jk +jk +jk +jk +fG +lF lF +JT +CP +JT lF +lF +ZH hH ZH ZH @@ -19831,8 +25063,8 @@ ae EY EY EY -yE -ed +Pz +aC WJ WJ Cl @@ -19841,108 +25073,108 @@ Hg og og HC -Qo -fW -fm -LE -cH +Jw +IJ Gs ZH +xA +qh +ZH +ZH +ZH ZH lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (60,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -ZI -ZI -ZI -Ji -CG -Dc -Dc -Dc -Dc -zb +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +bt +Bb +IM +IM +IM +lb +VC +VC +CH +Cr +oI +cg +xj +Ye +Ye +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ZI +ZI +ZI +eO +CG +Rv +Dc +Dc +Dc +zb IZ CG ZQ @@ -19955,10 +25187,10 @@ ij ij ij ij -Rh -ji -Rh -Rh +vP +vP +cZ +nS ij Cu BT @@ -19984,35 +25216,35 @@ UK UK py py -kL -kL -kL -Mv -gz -gz -KX -KX -Vg -ZA -mg -mg -mg -mg -mg -sZ -Mv -Mv -mO -Mv -Mv -Mv -kL -Za -ai -Za -kL -lF -lF +Ly +Ly +Ly +Ly +Ly +Ly +Fn +Ly +Ly +Ly +Ly +WU +GW +GW +eV +TK +jk +jk +jk +jk +fG +sm +ZH +ZH +Rx +ZH +ZH +eV +ZH jh ZH Wi @@ -20025,8 +25257,8 @@ TL MJ qs EY -yE -Cy +Pz +Fq Gs Gs Gs @@ -20034,106 +25266,106 @@ Gs Fk Gs Gs -KA -PZ -PZ -KA -Gs Gs +yQ +yQ Gs ZH -ZH +xA +qh +qh +qh lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (61,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +im +Tp +Tp +Tp +Tp +qA +VC +VC +VC +VC +kr +Oz +xj +Ye +Ye +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ZI ZI py CG -Dc -Dc +JN +JN Dc Dc zb @@ -20143,16 +25375,16 @@ KY Nz Nz fT -Lk +aQ Dl wK wK wK SH -Rh -ji -Rh -Rh +nS +nS +cZ +nS ij Cu BT @@ -20172,41 +25404,41 @@ FC qg UK MU -lX -lX +vM +vM MU UK UK py -kL -Mv -Mv Mv -Mv -gz -KX -KX -Xx -KP -mg -mg -mg -mg -mg -sZ -Mv -sZ -sZ -sZ -sZ -kL -kL -Za -ai -Za -kL -lF -lF +Bj +Bj +Bj +Ly +RR +iV +KG +Ly +WU +WU +WU +Vk +wx +PQ +GG +jk +jk +jk +jk +fG +jk +iY +ZH +Rx +ZH +ZH +ZH +ZH Yj ZH Wi @@ -20219,21 +25451,21 @@ De Sx Ha kM -yE -Cy -aR +Pz +Fq +Gs ZH ZH qh pM -ph -ZH -KA -eC -eC -KA -ZH -ZH +XT +xA +Bv +fi +fi +On +xA +xA ZH ZH ZH @@ -20241,91 +25473,91 @@ ZH lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (62,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +im +lO +Tp +IO +Tp +cq +Nx +vE +bL +VP +QO +un +VC +Ye +Ye +Yw +Yw +Yw +Yw +Yw ZI ZI Dc Dc ZI py -Xu +ky vi vi Dc @@ -20337,18 +25569,18 @@ WZ zb zb Tm -Lk +JJ Dl wK wK wK SH -Rh -ji -Rh -Rh +nS +cZ +cZ +nS ij -Wv +mp BT qg FC @@ -20365,41 +25597,41 @@ oC FC qg UK -VT -dO -lX -lX +iM +Lh +kx +kx jg UK -Ji -Ji -Mv -vU -vU -dN -gz -KX -KX -Xx -KP -mg -mg -mg -mg -mg -sZ -Mv -sZ -sZ -LS -sZ -kL -Ji -Za -ai -Za -Ji -lF +eO +eO +Bj +CI +CI +Ly +gg +vX +xv +Ly +WU +GW +GW +Qg +GW +qh +Tc +wH +wH +wH +Gt +KC +qh +qh +qh +ML +ZH +ZH +qh uk Fs ZH @@ -20413,21 +25645,21 @@ Sy Xd UF EY -jx -uo -aR +an +IW +Gs ZH ZH qh pM -ZH -ZH -KA -eC -OA -KA -ZH -ZH +xA +xA +Bv +fi +fi +On +xA +su ZH ZH ZH @@ -20436,82 +25668,82 @@ lF lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (63,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +bt +im +im +bt +im +im +VC +jR +go +js +dD +Ia +VC +Ye +Ye +Yw +Yw +Yw +Yw ZI ZI Dc @@ -20519,30 +25751,30 @@ Dc Dc ZI py -Xu -tY -tY +ky +WG +Pm Dc Dc zb Dm -DQ +WF sr QQ QQ kW -Gb +Qx Dl wK wK wK SH -Rh -ji -Rh -Rh +nS +cZ +nS +nS ij -Wv +mp BT qg FC @@ -20565,36 +25797,36 @@ lX lX ZF UK -eI -Mv -Mv -gz -gz -dN -gz -KX -KX -Xx -KP -mg -mg -mg -mg -mg -sZ -Mv -sZ -sZ -sZ -sZ -kL -kL -Za -ai -Za -kL -lF -lF +fO +Bj +Bj +Cj +Cj +Ly +Ly +FS +Ly +ZW +WU +GW +GW +Qg +GW +qh +vc +qh +qh +qh +qh +qh +qh +PP +qh +ML +ZH +ZH +qh +qh qh qh Wi @@ -20606,15 +25838,15 @@ An aN fx QL -ae -MS -Cy -aR -ZH +Hh +To +Fq +Gs +Hj ZH qh pM -ZH +xA KA KA PZ @@ -20623,7 +25855,7 @@ KA KA KA KA -KA +VF KA KA KA @@ -20631,86 +25863,86 @@ KA KA uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (64,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Yw +Yw +Yw +Yw +Yw +ZI +ZI +ZI +ZI ZI ZI -Dc -Dc -Dc -Dc ZI py CG @@ -20719,7 +25951,7 @@ vi Dc Dc zb -nU +sp CG dK AA @@ -20727,16 +25959,16 @@ oL BY CG ij -SC -SC -SC +SH +SH +SH ij -Rh -ji -Rh -Rh +nS +cZ +kR +Uy ij -Wv +mp BT qg FC @@ -20759,36 +25991,36 @@ lX lX os UK -Ji -Mv -Mv -gz -gz -nM -gz -KX -KX -Tt -KP -mg -mg -mg -mg -mg -sZ -Mv -sZ -sZ -sZ -kL -kL -kL -Za -ai -Za -kL -lF -lF +eO +Bj +Bj +Cj +Cj +Ad +Cj +Gc +Cj +Cj +WU +GW +GW +Qg +qh +qh +ZH +ZH +ZH +ZH +ZH +PP +PP +PP +qh +nQ +ZH +ZH +ZH +qh Bd Bd Wi @@ -20801,14 +26033,14 @@ LT bY LA kM -yE -Cy -aR -qh -yu +Pz +Fq +Gs +ZH +ZH qh pM -ZH +xA KA Qf eC @@ -20826,79 +26058,79 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (65,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI Dc Dc @@ -20906,29 +26138,29 @@ Dc Dc Dc ZI -Ji +eO CG CG -lK -lK +qc +qc CG -lK -lK +qc +qc CG -bo -bo -bo -ic +VG +VG +VG +FO CG ij -Rh -Rh -Rh -Rh -Rh -ji -Rh -Rh +nS +nS +nS +nS +nS +cZ +ce +kR ij Cu BT @@ -20953,36 +26185,36 @@ lX lX UK UK -Ji -Mv -Mv -gz -gz -nM -gz -KX -KX -Tt -Vg -Sf -Sf -Ec -Ec -mg -sZ -xf -sZ -sZ -sZ -kL -kL -kL -Za -ai -Za -kL -lF -lF +eO +Bj +Bj +Cj +Cj +Ad +Cj +qK +aB +aB +vR +wx +wx +Gg +qh +ZH +ZH +PP +ZH +ZH +ZH +ZH +ZH +PP +qh +ML +ZH +ZH +qb +qh xA xA vj @@ -20994,15 +26226,15 @@ Jb mI Sp QL -ae -MS -OD -aR -ZH +Hh +To +Lg +Gs ZH ZH +qh pM -ZH +xA KA SK eC @@ -21020,79 +26252,79 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (66,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI Dc Dc @@ -21100,29 +26332,29 @@ Dc Dc Dc ZI -Ji -Ji +eO +eO py py py py -Ji -Ji -Ji +eO +eO +eO py py py -Ji +eO ij ij -Gm -Rh -Rh -Rh -ji -ji -Rh -Rh +Dx +nS +nS +nS +nS +cZ +ce +kR ij Cu BT @@ -21147,35 +26379,35 @@ bM Fo UK py -Ji -Ji -Mv -gz -gz -Mv -gz -KX -KX -KX -KX -Iy -Iy -Iy -Ec -mg -sZ -Mv -sZ -sZ -sZ -sZ -kL -Ji -py -ql -py -Ji -lF +eO +eO +Bj +Cj +Cj +Bj +Cj +Gc +Cj +Cj +NM +GW +GW +GW +qh +ZH +PP +bf +bf +bf +ZH +ZH +ZH +PP +qh +ML +ZH +ZH +ZH ZH xA xA @@ -21189,14 +26421,14 @@ Sy Sp UF EY -yE -OD -aR -ZH +Pz +Lg +Gs ZH ZH +yu pM -ZH +xA KA JH eC @@ -21214,79 +26446,79 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (67,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ij @@ -21309,12 +26541,12 @@ ij ij ij Rh -Rh -Rh -Rh -Rh -ji -He +nS +nS +nS +nS +nS +xl pJ pJ ij @@ -21340,37 +26572,37 @@ UK hx es UK -Ji -Ji -Mv -Mv -Mv -gz -Mv -gz -gz -gz -gz -gz -gz -gz -gz -hM -sZ -sZ -Mv -Mv -Mv -sZ -kL -kL -kL -Ji -Gz -Ji +eO +eO +Bj +Bj +Bj +Cj +Bj +Cj +Gc +Cj +Cj +Bj +GW +GW +GW +qh +ZH +ZH +bf +bf +bf +ZH +Ny +PP +PP kL +Nb +Un lF -lF +ZH +ZH xA xA vj @@ -21383,14 +26615,14 @@ OJ zr Xo kM -yE -OD -aR -ZH +Pz +Lg +Gs ZH ZH +qh pM -ZH +xA KA YK eC @@ -21408,82 +26640,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (68,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn Rh Rh Rh @@ -21500,15 +26732,15 @@ Rh Rh Rh Rh +qP +nS +nS +nS +nS +nS Rh Rh -ji -ji -ji -ji -ji -ji -Fu +Ut OF Tx ij @@ -21534,38 +26766,38 @@ UK UK UK UK -Ji -Ji -Mv -Mv -Mv -Mv -Mv -gz -gz -gz -gz -gz -gz -gz -gz -hM -sZ -sZ -Mv -Mv -Mv -kL -kL -kL -kL -Ji -Wv -Ji +eO +eO +Bj +Bj +Bj +Bj +Bj +Cj +ID +Cj +Cj +Bj +GW +GW +GW +qh +ZH +ZH +ZH +ZH +ZH +ZH +PP +PP +PP kL +ai +Yw lF -lF -mG +Ry +ZH +xA xA vj vj @@ -21574,17 +26806,17 @@ vj vj EY EY -Ig +Bl EY EY -yE -OD -aR -ZH -ZH -ZH -pM +Pz +Lg +Gs +Hj ZH +qh +hd +xA KA Yu eC @@ -21602,82 +26834,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (69,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn Rh Rh pu @@ -21694,19 +26926,19 @@ Qr Qr bq Rh +nS +nS +nS +nS +nS +nS Rh Rh -ji -Rh -Rh -Rh -Rh -Rh -li +BW PY yW ij -Wv +mp BT mR mR @@ -21723,60 +26955,60 @@ mR mR mR BT -Ji -Du -py -py -py -py -Ji -Mv -Mv -Mv -Ji -Mv -Mv -Mv -Un -Un -Mv -wI -wI -wI -Mv -Un -Un -Mv -Mv -Mv -Ji -kL -kL -kL -Ji -Wv -Ji -kL +eO +RN +py +py +py +py +eO +Bj +Bj +Bj +MD +Bj +Bj +Bj +jm +jm +Bj +Vv +Vv +Vv lF +JT +JT lF +lF +lF +lF +lF +lF +lF +kL +ai +Yw +lF +sb +ZH xA -xA +ZH ak GW GW GW GW -rC -PD -Wh -Wh -Wh -ff -Cy -aR +SY +Rq +Qa +Qa +Qa +XO +Fq +Gs ZH ZH -xA +qh UW tu XI @@ -21796,82 +27028,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (70,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn Rh Rh pu @@ -21888,15 +27120,15 @@ zb Qr Qr Rh -Rh -Rh +nS +nS +cZ +cZ +cZ +cZ +ji +ji ji -Rh -Rh -Rh -Rh -Rh -Rh PY tc ij @@ -21917,41 +27149,41 @@ BT BT BT BT -Ji -Ji -Ji -Ji -Ji -Ji -Ji -XF -Ji -Ji +eO +eO +eO +eO +eO +eO +eO +bR +eO +eO py py py py py -Ji -Un -yZ -yZ -yZ -Un -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Wv -Ji -Ji +eO +Xg +pw +pw +pw +Xg +eO +eO +eO +eO +eO +eO +eO +eO +eO +Yw +ai +Yw lF +Pu ZH xA xA @@ -21960,19 +27192,19 @@ GW GW GW GW -rC -Tc -wH -wH -wH -wH -gV -aR +Lo +yn +WJ +WJ +WJ +tH +lR +Gs ZH ZH -xA -wD -rn +qh +Hy +bx KA Yk eC @@ -21990,136 +27222,136 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (71,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt -Rh -Rh -Jy -HS -Dc -Dc -cL -cL -cL -cL -cL -zb -zb -zb -Qi -Rh -Rh -Rh -ji -Rh -Rh -Rh -pJ -iE -Rh -PY -zU -ij -py +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn +Rh +Rh +Jy +HS +Dc +Dc +cL +cL +cL +cL +cL +zb +zb +zb +Qi +Rh +nS +nS +cZ +Rh +Rh +Rh +pJ +iE +Rh +PY +AC +ij +py Cu -Wv +mp Cu Cu Cu Cu -Wv -Wv +mp +mp py si py -Wv -Wv -Wv +mp +mp +mp Cu -Wv -Wv +mp +mp Cu Cu -UQ -UQ -Wv -Wv -sG -Wv +hj +hj +mp +mp +CA +mp Cu TV TV @@ -22127,46 +27359,46 @@ TV Cu Cu Cu -YN -sF -sF -sF -YN -Wv +yh +qV +qV +qV +yh +mp Cu Cu -UQ -UQ +hj +hj TV -Wv -Wv -Ji -Ji -Wv -Ji -kL +mp +mp +eO +eO +mp +eO lF -lF -xA +ZH +ZH xA +qb ak vT pL GW GW -Ib -aR -aR -aR -aR -aR -ea -aR -ZH -ZH -xA -wD -SL +Gs +Gs +Gs +Gs +Gs +Gs +CU +Gs +qh +qh +qh +Hy +mS KA Eq eC @@ -22184,82 +27416,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (72,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn Rh Rh pu @@ -22276,9 +27508,9 @@ zb Qr Qr Rh -Rh -Rh -ji +nS +nS +cZ Rh He ld @@ -22288,32 +27520,32 @@ PY PY Tx ij -ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI +Ab +Ab +Ab +Ab +Ab +Ab +Ab +Ab ZI Cu py Cu -Ji -Ji -Ji +eO +eO +eO py -Ji -Ji +eO +eO py py -Ji -Ji -Ji -Ji -XF -Ji +eO +eO +eO +eO +bR +eO py py py @@ -22321,36 +27553,36 @@ py py py py -Un -GE -GE -GE -Un -Ji +Xg +JV +JV +JV +Xg +eO py py -Ji -Ji +eO +eO py -Ji -Ji -Wv -Ji -Wv -Ji -kL +eO +eO +mp +eO +mp +eO lF lF +ZH xA -xA +ZH ak uw nR GW GW ak -ZH -ZH +Hz +gZ ZH ZH ZH @@ -22358,9 +27590,9 @@ vA ZH ZH ZH -xA -wD ZH +Hy +xA KA VZ EG @@ -22378,82 +27610,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (73,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Sn Rh Rh pu @@ -22470,9 +27702,9 @@ Qr Qr eF Rh -Rh -Rh -ji +nS +nS +cZ Rh Fu xJ @@ -22482,32 +27714,32 @@ lJ SW Of ij -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI +ne +ne +ne +ne +ne +ne +ne +Ab ZI py hQ py -Ji -Ji -Ji +eO +eO +eO py -Ji -Ji +eO +eO py py -Ji -Ji -Ji -Ji -XF -Ji +eO +eO +eO +eO +bR +eO py py py @@ -22515,28 +27747,28 @@ py py py py -Un -gz -gz -gz -Un -Ji +Xg +GW +GW +GW +Xg +eO py py -Ji -Ji +eO +eO py -Ji -Ji -Ji +eO +eO +eO hQ py py -kL lF lF +ZH xA -xA +ZH ak ak ak @@ -22546,15 +27778,15 @@ RJ xA xA iQ -iQ -Ar -Hu +Jg +rl +fr yt yt yt yt -iw -ZH +ah +qn KA KA KA @@ -22571,82 +27803,82 @@ KA KA uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (74,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ij ij ij @@ -22664,9 +27896,9 @@ Rh Rh Rh Rh -Rh -Rh -ji +nS +nS +cZ ij ij pJ @@ -22676,14 +27908,14 @@ ij pJ ij ij -ZI -Dc -ZI -ZI -ZI -Dc -ZI -ZI +Ab +ne +Ab +Ab +Ab +ne +Ab +Ab ZI py ql @@ -22691,44 +27923,44 @@ py kL kL kL -Ji +eO kL kL kL -Ji +eO kL kL kL -Ji +eO kL kL kL -Ji +eO kL kL kL -Ji -Mv -Mv -gz -gz -gz +eO Mv +WU +GW +GW +GW +WU Mv -Ji +eO kL kL kL -Ji +eO kL kL kL -Wv -Ji -Ji -kL +mp +eO +eO lF lF +ZH xA xA UD @@ -22737,10 +27969,10 @@ ak GW GW UD -lF -lF -lF -lF +ZH +ZH +ZH +Av lF lF lF @@ -22749,7 +27981,7 @@ ZH lF lF lF -ZH +lF lF lF lF @@ -22764,103 +27996,103 @@ lF ZH lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (75,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw vr ij ij Rh Rh -Rh +pi EL Rh Rh ji ji +Fa +JB +Fa ji ji -ji -ji -ji -ji -ji -ji +cZ +cZ +cZ ij vr vr @@ -22870,18 +28102,18 @@ vr vr vr vr +Ab +Ab +Ab +Ab +Ab +Ab +Ab +Ab ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI -XF -sG -XF +bR +CA +bR kL UD UD @@ -22904,9 +28136,9 @@ UD UD WU WU -UV -UV -UV +Vv +Vv +Vv WU WU UD @@ -22917,24 +28149,24 @@ UD UD UD UD -Ts -EJ -Ts -UD -UD -UD -jH -UD +eO +mp +eO +lF +lF +ZH +xA +lF UD UD UD GW -GW +kU UD -wV -wV -wV -wV +cM +cM +cM +wU cM cM cM @@ -22957,86 +28189,86 @@ lF lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (76,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Ab xd xd @@ -23052,9 +28284,9 @@ xd xd xd ij -ld -ld -ld +it +it +it ij Ab ne @@ -23114,124 +28346,124 @@ UD Xg yh Xg -UD -UD -UD -Bq -UD +lF +lF +lF +ot +lF UD UD GW GW GW UD -wV -wV -wV -wV -cM cM cM +wV +pE cM -sx cM cM cM -wV cM cM cM -wV cM +GK cM cM -wV +GK +GK +GK +GK +GK +GK cM cM cM cM -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (77,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Ab Ab Ab @@ -23243,22 +28475,22 @@ SI ne ne ne -ne -ne +Pi +Pi vP bH bH bH vP +HX ne -ne -Kl -Kl -Kl -Kl -Kl -Pw -Kl +SI +SI +SI +SI +SI +Vn +SI ne ne Hn @@ -23267,9 +28499,9 @@ ne Ab Ab kL -Za +Yw KE -Za +Yw kL UD UD @@ -23279,7 +28511,7 @@ sD sD ak GW -GW +qJ GW GW GW @@ -23287,7 +28519,7 @@ qX GW GW GW -GW +qJ GW GW gF @@ -23299,7 +28531,7 @@ GW gF GW GW -GW +qJ GW GW GW @@ -23308,7 +28540,7 @@ GW vs CX KU -GW +aX qX GW GW @@ -23318,117 +28550,117 @@ GW GW GW GW -rQ -wV -wV -wV -wV -wV -sx -wV -wV -sx -wV -wV +ak wV wV wV +pE +pE +wU +pE +pE cM -wV -wV -wV -wV -wV +Jj +Ae +By +GK +GK cM +GK +GK +GK +GK +GK cM cM cM -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (78,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Ab Ab Ab @@ -23444,15 +28676,15 @@ VM VM VM vP +fs +ne +SI +ne +ne ne ne -Kl -Hn -Hn -Hn -Hn Hn -Kl +sP ne ne Hn @@ -23461,9 +28693,9 @@ ne Ab Ab kL -Za +Yw ai -Za +Yw kL UD UD @@ -23513,20 +28745,19 @@ GW GW GW ak -kq -wV -sx -sx -sx -sx wV wV -sx wV wV wV +sx wV +pE cM +pW +GK +fA +GK cM cM cM @@ -23534,135 +28765,136 @@ cM cM cM cM -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (79,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ab -Ab -Ab -TN -ne -ne -SI -ne -ne -vP -bH -bH -bH -vP -SI -Kl -Kl -Hn -ne -ne -ne -Hn -Kl -Kl -Kl -Pw -Kl -ne -Ab -Ab -kL -Za -Za -ai -kL -UD -UD -Bx -sD +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ab +Ab +Ab +TN +ne +ne +SI +ne +ne +pJ +bH +bH +bH +pJ +SI +SI +SI +ak +ak +ak +ak +ak +SI +SI +SI +Vn +SI +ne +Ab +Ab +kL +Yw +Yw +ai +kL +UD +UD +Bx +sD sD GW HP @@ -23680,9 +28912,9 @@ GW GW gF GW -GW -GW -GW +dR +ZY +aG GW gF GW @@ -23707,20 +28939,19 @@ GW GW GW ak -vu -wV -sx -wV -wV -sx wV wV sx sx sx sx -sx +wV +pE cM +QP +GK +fA +Ae cM cM cM @@ -23728,12 +28959,13 @@ cM cM cM cM -Za -Za -Za -Za -Za -Za +cM +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -23748,77 +28980,77 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (80,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Ab Ab va @@ -23828,31 +29060,31 @@ SI SI SI ZK -eX -eX -eX +PM +Lw +PM ZK SI ne TN -Hn -ne -ne -ne -Hn +ak +UA +ku +yT +ak Gf Hn Hn Hn -Kl +SI ne ne Ab -Ji -Za +eO +Yw Dz -Za -Wv +Yw +mp yh Rm sD @@ -23876,7 +29108,7 @@ ak ak ak ak -xc +LK ak ak ak @@ -23893,8 +29125,8 @@ Xg UD UD ak -Bq ak +Bq ak ak ak @@ -23906,28 +29138,28 @@ sx sx wV wV -Dj -ok -ok -sx -wV -wV -wV +rU wV +pE cM cM cM +HV cM cM -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +cM +cM +cM +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -23942,57 +29174,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (81,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24012,8 +29244,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab ne @@ -24021,31 +29253,31 @@ ne fs ne eN -vP -bH +pJ bH +Ep bH -vP -ne +pJ +ow ne va -Hn -ne -ne -ne -ne +ak +Wr +sD +JO +ak ne ne ne Hn -Kl +SI ne Ab Ab kL -Za -Za -Za +Yw +Yw +Yw kL UD UD @@ -24070,8 +29302,8 @@ Rc HD Rc Rc -jC -Xq +PV +Ma Rc Rc Ey @@ -24087,41 +29319,41 @@ py kL cM cM -ok -wV -wV wV -sx -wV -wV -sx wV wV wV wV wV -sx wV -ok sx +Gp +CE +HY wV wV +sx wV -wV -wV +pE cM -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +Xn +GK +fA +GK +up +cM +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24136,57 +29368,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (82,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24206,8 +29438,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab ne @@ -24215,31 +29447,31 @@ ne fs ne cD -vP -bH +pJ bH +Ep bH -vP +pJ ne ne Hn -Hn -ne -ne -ne -ne +ak +sD +sD +sD +ak ne ne ne Hn -Kl +SI ne Ab Ab kL -Za -Za -Za +Yw +Yw +Yw kL UD UD @@ -24264,9 +29496,9 @@ HD HD HD hs -Rc +PV +jC jC -Rc Rc Ey Rc @@ -24281,41 +29513,41 @@ py kL cM cM -ok wV wV wV -sx wV wV -sx wV wV +sx +Gp wV wV wV +aZ sx sx -Dj -sx -wV -wV -wV -wV +wU cM +ug +GK +fA +ev cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24330,57 +29562,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (83,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24400,33 +29632,33 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab ne ne ne +SR fs fs -fs -vP -bH +pJ bH +Ep bH -vP -ak -ak -ak +pJ ak ak ak ak +GW +GW +GW ak ak ak ak ak -rX +mz ak UD UD @@ -24458,10 +29690,10 @@ HD HD HD bK +PV Rc jC -mD -tV +Rc Ey Rc Rc @@ -24475,41 +29707,41 @@ py kL cM cM -ok wV wV wV -sx -wV -wV -sx wV wV wV wV -wV -sx -wV -ok sx wV wV wV +HY +aZ +sx wV +pE cM +Uc +GK +fA +GK cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24524,57 +29756,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (84,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24594,8 +29826,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab ne @@ -24603,11 +29835,11 @@ ne lU ne ne -vP -bH -bH +pJ bH +Ep bH +Ux GW GW GW @@ -24620,7 +29852,7 @@ GW GW GW GW -GW +aG GW GW gF @@ -24651,29 +29883,29 @@ Rc HD HD HD -Ey -Ey -jC -Ey -Ey +Rc +PV +Rc +AP +Rc Ey Rc Rc Rc Rc HD -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO cM wV -ok wV wV wV -sx +wV +wV wV wV sx @@ -24684,26 +29916,26 @@ sx sx sx wV -ok -Dj -ok -ok -ok -wV +pE +kF +fA +fA +fA +Ql cM cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24718,57 +29950,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (85,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24788,8 +30020,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab ne @@ -24797,11 +30029,11 @@ ne wu ne ne -vP -bH -bH -bH +pJ +Za +Ep bH +Ux GW GW GW @@ -24814,7 +30046,7 @@ GW GW GW GW -GW +aG GW GW gF @@ -24836,10 +30068,9 @@ GW Mq ak UD +HO Rc Rc -Rc -jC jC jC jC @@ -24847,57 +30078,58 @@ jC uU jC jC -jC -jC -jC -uU -jC +PV +Rc +Ey +Ey +Ey +Rc Rc Rc HD HD kL -Za +Yw ai -Za +Yw kL cM cM -ok -wV wV wV -sx -wV wV -sx wV wV wV -FI wV sx wV wV -sx -wV wV -ok +FI wV +sx wV +Ju cM -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +BC +GK +fA +GK +up +cM +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24912,57 +30144,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (86,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24982,8 +30214,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab Ab @@ -24991,32 +30223,32 @@ ne ne ne ne -vP -bH -bH +pJ bH +Ep bH +Ux GW GW GW +hh GW GW GW GW GW +hh GW GW -GW -GW -GW +aG GW GW gF +hh GW GW GW -GW -GW +hh qX GW GW @@ -25024,7 +30256,7 @@ GW GW GW GW -GW +hh GW GW Mq @@ -25040,25 +30272,25 @@ HD HD HD GL -Rc -Rc -Rc -Rc -Ey -jC -Rc -Rc +PV +PV +PV +PV +uM +PV +PV +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM -Dj sx +rU sx sx sx @@ -25072,26 +30304,26 @@ Me wV sx wV -wV -sx -wV -wV -ok -wV +pE cM +ec +GK +fA +HH cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25106,57 +30338,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (87,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25176,33 +30408,33 @@ Dz Dz Dz Dz -Za -Za -Ab -Ab +Yw +Yw Ab -ra -TU -TU -TU -ra -ix +Zw +Zw +Sl +Ra +Ra +Ra +Sl ix +iz ix -vP -ak -ak -ak -ak -ak -ak -ak +ij +SC +Tn +SC +ij +GW +GW +GW ak ak ak ak ak -rX +mz ak UD UD @@ -25239,53 +30471,53 @@ Ey Ey Ey Ey -uU Ey Ey +uM HD HD kL -Za +Yw ai -Za +Yw kL cM cM -ok -ok -ok -ok -Dj -ok -wV -sx wV wV wV -ok wV sx wV wV sx +wV +wV +wV +ok +wV sx -sx -Dj -sx +wV +pE cM cM +lg +wW cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +cM +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25300,57 +30532,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (88,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25370,41 +30602,41 @@ Dz Dz Dz Dz -Za -Za -Ji -Ab -Ab -TU -sZ -sZ -sZ -TU -bH +Yw +Yw +eO +Zw +Zw +Ra +LN +LN +bv +Ra bH +Ep bH -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -ne -ne -Ab -Ji -Za -Za -Za -Ji +SC +PC +Hq +Nd +SC +sD +sD +sD +ak +sn +sn +Jf +sn +TH +sn +sn +Zw +eO +Yw +Yw +Yw +eO HD HK HK @@ -25416,12 +30648,12 @@ Rc Rc Rc Rc -HD -HD +Rc HD Rc Rc Rc +Rc jC Rc HD @@ -25431,18 +30663,18 @@ Rc Rc Rc Rc -Ey Rc -jC Rc +Ey Rc +PV Rc HD -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO cM wV wV @@ -25450,7 +30682,7 @@ wV wV wV sx -ok +wV wV sx wV @@ -25460,26 +30692,26 @@ ok wV sx wV -wV -sx -wV -wV -ok -wV +pE cM +OT +SF +Iu +Mt cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25494,57 +30726,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (89,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25564,40 +30796,40 @@ Dz Dz Dz Dz -Za -Za -Ji -aw -Ab -TU -sZ -sZ -sZ -WX -bH +Yw +Yw +eO +eO +Zw +Ra +LN +LN +LN +mv bH +Ep bH -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -eN -Ab -Ab +Tn +id +VA +Fu +ij +sD +sD +sD +ak +sn +sn +jM +sn +TH +rE +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -25625,17 +30857,17 @@ Rc Rc Rc Rc -Ey Rc -jC Rc +Ey Rc +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -25644,36 +30876,36 @@ wV wV wV sx -Dj +HF sx sx -wV -wV -wV -ok -wV sx sx sx +HF sx -wV -wV -ok -wV -wV +sx +sx +wU cM -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +OT +Fe +Iu +Fe +Fe +wE +bh +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25688,57 +30920,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (90,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25758,40 +30990,40 @@ Dz Dz Dz Dz -Za -Za -Ji -aw -Ab -TU -sZ -sZ -sZ -WX -bH +Yw +Yw +eO +eO +Zw +Ra +LN +LN +LN +mv bH +Ep bH -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -cD -Ab -Ab +SC +db +ld +fz +SC +sD +sD +sD +ak +sn +sn +Jf +mW +TH +ov +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -25819,17 +31051,17 @@ Rc Rc Rc Rc +Rc +Rc Ey Rc -jC -jC -jC +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -25838,36 +31070,36 @@ wV wV wV sx -ok wV -sx wV +sx wV wV -ok -kq sx ok -ok -Dj -ok -ok -ok +kq +vu wV +pE cM -cM -cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +yo +yo +dr +Fe +Fe +wE +bh +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25882,57 +31114,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (91,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25952,40 +31184,40 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -TU -sZ -sZ -sZ -TU -bH -bH +Yw +Yw +Yw +eO +Zw +Ra +LN +LN +LN +Ra bH -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -ne -Ab -Ab +Ep +ZM +ij +ij +ij +nx +ij +ak +GW +ak +ak +sn +sn +Jf +sn +TH +sn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -26007,23 +31239,23 @@ HD HD HD HD -HD -Zm -sU -sU -sU -sU -sU -sU -uU -sU -jC +nd +sQ +bl +bl +bl +bl +bl +bl +bl +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -26032,36 +31264,36 @@ wV wV wV sx -ok -wV -sx -wV wV wV -ok -vu -sx -ok -wV sx wV wV -ok -wV -cM -cM +sx +za +ni +pE +pE +pE cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Fe +Fe +Fe +Fe +Fe +wE +bh +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26076,57 +31308,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (92,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26146,41 +31378,41 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -ra -TU -TU -TU -ra -vP -vH -vP -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -ne -ne -Ab -Ji -Za -Za -Za -Ji +Yw +Yw +Yw +eO +Zw +Sl +Ra +Ra +Ra +Sl +Zp +Eg +Zp +Zp +Zp +Zp +Ze +Ze +Ze +Ze +Ze +Jf +sn +sn +iG +sn +TH +sn +sn +Zw +eO +Yw +Yw +Yw +eO HD HK HK @@ -26195,30 +31427,30 @@ KZ HD HD HD -Ji -HD +eO HD HD -Ji HD +eO HD -Zm -MV -MV -MV -MV -MV -MV -MV -sU -jC +nd +sQ +aD +aD +aD +aD +aD +aD +aD +Ve +PV Rc HD -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO cM wV wV @@ -26226,36 +31458,36 @@ wV wV wV sx -ok +wV wV sx -sx -sx -sx -Dj -sx -sx -ok +wV wV sx wV wV ok wV +wV cM -cM -cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +oM +oM +bd +Fe +Fe +wE +kL +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26270,57 +31502,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (93,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26340,40 +31572,40 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -gl -ne -Kl -Kl -Kl -Kl -Kl -ne -Hn -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +eO +Zw +jZ +sn +dw +sn +Zp +CB +qo +kB +vK +Rb +Zp +Ze +Ze +Ze +Ze +Ze +Jf +sn +sn +Jf +sn +TH +sn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -26388,30 +31620,30 @@ mA HK Rc HD -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw Dz -HD -Zm -MV -MV -MV -MV -MV -MV -MV -sU -jC +nd +sQ +aD +aD +aD +aD +aD +aD +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -26420,16 +31652,10 @@ wV wV wV sx -ok -wV -wV wV wV sx -ok -ok -ok -ok +wV wV sx wV @@ -26438,18 +31664,24 @@ ok wV wV cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +OT +SF +Iu +Fe +Fe +wE +bh +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26464,57 +31696,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (94,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26534,40 +31766,40 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -ne -Hn -ne -ne -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Ab -Ab +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +dE +Lp +rf +rf +mF +PR +Ze +Ze +Ze +Ze +Ze +Jf +Jf +Jf +Jf +sn +TH +kn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -26582,30 +31814,30 @@ mA HD HD HD -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw Dz -HD -Zm -MV -MT -MT -MT -Tq -Tq -MV -sU -jC +nd +sQ +aD +kd +kd +kd +Xp +Xp +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -26614,36 +31846,36 @@ wV wV wV sx -ok -wV -wV wV wV sx wV wV -wV -wV -wV sx wV wV ok wV +wV cM +OT +Fe +Iu +FR cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26658,57 +31890,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (95,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26728,40 +31960,40 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -Ab -Ab -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +Cd +Oj +yF +Jo +Jm +Zp +Ze +Ze +Ze +Ze +Ze +Jf +sn +sn +Jf +sn +TH +sn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -26777,29 +32009,29 @@ HD HD HD Dz -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw Dz -HD -Zm -MV -qH -qH -qH -Rj -Tq -MV -sU -jC +nd +sQ +aD +LQ +LQ +LQ +LU +Xp +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -26808,14 +32040,8 @@ sx sx sx sx -ok -sx -sx -sx -sx -sx -sx -sx +wV +wV sx sx sx @@ -26824,20 +32050,26 @@ sx sx Dj sx +sx cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +cM +cM +cM +cM +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26852,57 +32084,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (96,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26922,41 +32154,41 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -ne -Ab -Ji -Za -Za -Za -Ji +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +bb +fa +yF +xK +AG +Zp +Jf +Jf +Jf +Jf +Jf +Jf +sn +sn +Jf +sn +TH +sn +sn +Zw +eO +Yw +Yw +Yw +eO HD HK HK @@ -26966,44 +32198,44 @@ mA Rc Rc Rc -mA +CF HD HD HD Dz -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw Dz -HD -Zm -MV -Tq -mH -qH -Rj -Tq -MV -sU -jC +nd +sQ +aD +Xp +iH +LQ +LU +Xp +aD +bl +PV Rc HD -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO Kh hb ba ba zW +Ld sx wV -ok -sx +wV wV wV wV @@ -27016,22 +32248,22 @@ wV wV wV wV -ok +wV wV cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27046,57 +32278,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (97,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27116,92 +32348,92 @@ Dz Dz Dz Dz -Za -Za -Za -aw -aw -Ab -ne -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +eO +LB +Zw +sn +dw +sn +Zp +HN +TX +yF +Jo +vO +Zp +sn +sn +sn +sn +sn +sn +sn +dw +YX +dw +TH +sn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD -Ey +HD mZ mZ mZ -Ey +HD mA Rc -Rc +Jr Rc HD -Ji -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw Dz -Ji -Zm -MV -qH -qH -qH -Rj -Tq -MV -sU -jC +eO +sQ +aD +LQ +LQ +LQ +LU +Xp +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM zW tm Sb YR -Dj -ok -ok -Dj -ok -ok -ok -ok +Ld +jF +wV +wV +wV +wV +wV +wV wV wV wV @@ -27210,22 +32442,22 @@ wV wV wV wV -ok +wV wV wV cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27240,186 +32472,186 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (98,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +rV +ZX +ax +Jo +vO +Zp +dw +dw +dw +dw +dw +dw +dw +dw +Jf +mW +TH +TH +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD -Ey +HD OW OW OW -Ey +HD HK Rc -mA -HD +nJ HD HD -Za -Za -Za -Za -Za -Za -Za HD -Zm -MV -Np -Np -Np -Tq -Tq -MV -sU -jC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nd +sQ +aD +qU +qU +qU +Xp +Xp +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM hb QB YR PF +Ld sx -ok wV -sx wV wV wV -ok -ok -ok -ok -Dj -ok -ok -ok -ok -ok +wV +wV +wV +wV +wV +rU +wV +wV +wV +wV +wV wV cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27434,158 +32666,158 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (99,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +lq +qm +Jo +Jo +vO +Zp +dw +Jf +Jf +Jf +Jf +ws +Jf +Jf +Jf +sn +sn +TH +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD -Ey +HD OW OW OW -Ey +HD HK Rc -mA +nJ HD HD HD -Za -Za -Za -Za -Za -Za -Za -HD -Zm -MV -MV -MV -MV -MV -MV -MV -sU -jC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nd +sQ +aD +aD +aD +aD +aD +aD +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM uE MC sM +YR JR sx -ok wV -sx +wV wV wV wV @@ -27603,17 +32835,17 @@ wV cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27628,158 +32860,158 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (100,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -ne -Ab -Ji -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +GU +QY +QY +we +Ce +Zp +dw +Jf +sn +sn +sn +sn +sn +sn +Jf +sn +sn +TH +sn +Zw +eO +Yw +Yw +Yw +eO +HD +HD HD -Ey -Ey OW OW OW -Ey +HD HK mA -mA +nJ HK HD -Ji -Za -Za -Za -Za -Za -Za -Za -HD -Zm -MV -MV -MV -TT -MV -MV -MV -sU -jC +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nd +sQ +aD +aD +aD +BZ +aD +aD +aD +bl +PV Rc HD -Ji +eO py Cu py -Ji +eO Kh xI uE MR JR +JR sx -ok wV -sx +wV wV wV wV @@ -27797,17 +33029,17 @@ wV cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27822,106 +33054,106 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (101,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +Zp +Zp +fg +Zp +Zp +Zp +dw +Zw +Zw +sn +Zw +Zw +Zw +sn +Zw +Zw +Zw +TH +Zw +Zw kL py py @@ -27929,41 +33161,41 @@ py kL HD HD -Ey -Ey -Ey +HD +HD +HD HD HD HK mA -mA -HD +nJ HD HD -Za -Za -Za -Za -Za -Za -Za HD -Zm -Zm -ti -lA -Zm -Zm -MV -MV -Zm -jC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nd +sQ +sQ +Vs +Uz +sQ +sQ +aD +aD +sQ +PV HD HD kL -Ji -Wv -Ji +eO +mp +eO kL cM cM @@ -27971,7 +33203,7 @@ qR cM cM cM -ok +sx cM cM cM @@ -27990,18 +33222,18 @@ cM wV cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -28016,110 +33248,110 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (102,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +dw +dw +dw +dw +dw +dw +dw +dw +dw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +gy +Zw +Zw kL -Ji -Ji -Ji +eO +eO +eO kL nH nH @@ -28130,17 +33362,17 @@ nH nH nw nw -ke +se nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -28151,13 +33383,13 @@ sQ sQ aD sQ -ou +tE nw nw kL -Ji -Wv -Ji +eO +mp +eO kL cM cM @@ -28165,11 +33397,11 @@ cM cM cM cM -Dj cM cM cM cM +HF cM cM cM @@ -28185,17 +33417,17 @@ cM cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -28210,93 +33442,93 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (103,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -Zw -sn -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +kL +kL Zw sn -Zw -Zw -Zw sn -Zw +sn +sn +sn +sn +sn +sn +sn +sn Zw Zw sn @@ -28307,7 +33539,7 @@ sn Zw Zw Zw -sn +TH Zw Zw kL @@ -28324,7 +33556,7 @@ nH nH wM wM -uv +Dt nw nw nw @@ -28345,13 +33577,13 @@ sQ aD aD sQ -uv +lI nw nw kL -Ji -Wv -Ji +eO +mp +eO kL IF IF @@ -28359,11 +33591,11 @@ HE IF IF IF -oa +HE IF IF IF -HE +oa IF IF IF @@ -28379,17 +33611,17 @@ IF IF kL kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -28404,82 +33636,82 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (104,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO Zw sn sn @@ -28501,14 +33733,14 @@ sn sn Jf sn -sn +TH sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX xH Ge @@ -28518,18 +33750,18 @@ Ge Ip wM wM -uv +LD wM fX -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +eO +eO +eO +eO +eO +eO +eO +eO +eO rA pc aD @@ -28539,25 +33771,25 @@ tx aD ft bl -uv +lI wM fX -Ji +eO py Cu py -Ji +eO IF HE HE HE HE HE -oa HE -Ic HE +Ic HE +oa HE IF HE @@ -28571,109 +33803,109 @@ HE HE IF IF -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (105,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw @@ -28695,13 +33927,13 @@ sn sn Jf sn -sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -28709,10 +33941,10 @@ Ge Ge Ge Ge -MM -uv -uv -uv +nv +wM +wM +LD nw nw nw @@ -28733,13 +33965,13 @@ rm aD aD bl -uv +lI nw nw kL -Za +Yw ai -Za +Yw kL IF IF @@ -28748,10 +33980,10 @@ HE HE HE oa -HE -Ic -HE -HE +oa +sL +oa +oa IF IF IF @@ -28765,111 +33997,111 @@ IF IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (106,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw @@ -28881,42 +34113,42 @@ Zw Zw Zw Zw -Jf -Jf -Jf -Jf -Jf -Jf -Jf sn sn +sn +sn +sn +sn +Jf +sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -CW +kv Ge CW CW Ip wM wM -NW +hR nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -28927,13 +34159,13 @@ Xp aD Vf bl -uv +lI nw nw kL -Za +Yw ai -Za +Yw kL IF IF @@ -28942,7 +34174,7 @@ HE HE HE oa -HE +JA Ic HE HE @@ -28957,121 +34189,121 @@ IF IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (107,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO kL kL kL -Ji +eO Zw Zw Zw @@ -29081,15 +34313,15 @@ sn sn sn sn -Jf -sn +ws sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -29100,17 +34332,17 @@ CW Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -29121,13 +34353,13 @@ fy aD aD bl -uv +lI nw nw kL -Za +Yw ai -Za +Yw kL IF IF @@ -29143,130 +34375,130 @@ HE IF IF IF -Ji +eO IF IF IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(108,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(108,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO Zw sn sn @@ -29276,15 +34508,15 @@ sn sn sn Jf -sn -sn +mW +TH sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX xH CW @@ -29294,18 +34526,18 @@ CW Ip wM wM -uv +LD wM fX -Ji -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO rA QW aD @@ -29315,14 +34547,14 @@ Ci aD ft bl -uv +lI wM fX -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO IF HE oa @@ -29336,130 +34568,130 @@ HE HE HE IF -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (109,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO Zw Zw Zw @@ -29471,13 +34703,13 @@ sn sn Jf sn -sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -29488,17 +34720,17 @@ Ge Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -29509,13 +34741,13 @@ mV aD aD bl -uv +lI nw nw kL -Za +Yw ai -Za +Yw kL IF Ic @@ -29523,155 +34755,155 @@ sL Ic Ic Ic -oa -HE +KB +Ic +Ic +Ic Ic -HE -HE IF IF IF -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(110,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(110,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Zw +Zw +Zw +Zw +Zw Zw Zw Zw Jf Jf Jf -Jf -Jf -Jf -Jf -Jf -Jf +sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -29682,14 +34914,14 @@ fd Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za +Yw +Yw +Yw +Yw Dz Dz Dz @@ -29703,7 +34935,7 @@ Jc aD uV bl -uv +lI nw nw kL @@ -29718,113 +34950,113 @@ ei Ng Ic oa -HE -Ic -Ic Ic +HE +HE +HE IF IF IF -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (111,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -29832,40 +35064,40 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO Zw +UB +Rf +UB +xW +UB +UB Zw sn sn -Jf -sn -sn -sn -sn sn sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -29876,7 +35108,7 @@ xy Ip wM wM -uv +LD nw nw nw @@ -29897,13 +35129,13 @@ iU aD aD bl -uv +lI nw nw kL -Ji -Wv -Ji +eO +mp +eO kL IF Ph @@ -29912,113 +35144,113 @@ qy Wu Ic oa -HE Ic HE HE +HE IF IF IF -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(112,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(112,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30026,41 +35258,41 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Zw +UB +UB +UB +UB +UB +UB Zw -sn -sn -sn -Jf -sn -sn sn sn sn sn +TH sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX PO ej @@ -30070,18 +35302,18 @@ xy Ip wM wM -uv +LD wM fX -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +eO +eO +eO +eO +eO +eO +eO +eO +eO rA Xp en @@ -30091,128 +35323,128 @@ QW aD aD bl -uv +Ag DZ fX -Ji -Ji -Wv -Ji -Ji -IF -Ph +eO +eO +mp +eO +eO +Md Ph Ph Ph Ic +Ic oa -HE Ic HE HE HE +HE IF -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (113,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30220,40 +35452,40 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO Zw -sn -sn -Jf -sn -sn -sn -sn -sn -sn +BJ +UB +UB +UB +UB +bg +zF +TH +TH +TH +TH +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -30264,7 +35496,7 @@ Ip Ip wM wM -uv +LD nw nw nw @@ -30285,128 +35517,128 @@ QW aD ft bl -uv +Ag nw nw kL -Ji -Wv -Ji +eO +mp +eO kL IF -Ph -Ph +RD Ph uR Ic -oa HE +oa Ic HE HE +HE IF IF IF -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (114,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30414,61 +35646,61 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +ps +UB +UB +UB +UB +UB +bg Zw sn sn -Jf -sn -sn -sn sn sn sn Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -ej +wT ej ej ex Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -30479,7 +35711,7 @@ aD aD ya bl -uv +ey nw nw kL @@ -30489,118 +35721,118 @@ py kL IF Ph -Ph lp pU Ic -oa HE +oa Ic -Ic -Ic +HE +HE +HE IF IF IF -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (115,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30608,61 +35840,61 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +ps +UB +UB +UB +UB +UB +bg Zw -sn -sn Jf -sn -sn -sn -sn -sn -sn +Jf +Jf +ws +Jf Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -ej +SB ej ej ex Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -30673,128 +35905,128 @@ aD aD pt oX -jc +OO nw nw kL -Za -Za +Yw +Yw ai kL IF -Ph -lp -lp +LI +NH pU Ic -oa HE +oa Ic HE HE +HE IF IF IF -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (116,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30802,62 +36034,62 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +ps +UB +UB +UB +UB +UB +HL Zw sn sn sn -Jf -sn -sn -sn -sn sn sn sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX PO -ej +SB ej QU Ip Ip Ip wM -uv +LD wM fX -Ji -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO rA QW Xp @@ -30870,125 +36102,125 @@ bl ey FW fX -Ji -Za -Za -Za -Wv +eO +Yw +Yw +Yw +mp tQ -pU -pU +zc pU lp Ic -oa HE +oa Ic HE HE HE +HE IF -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (117,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30996,61 +36228,61 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ps +UB +UB +UB +UB +UB +UB Zw sn sn -Jf -sn -sn -sn sn sn sn Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -ej +SB ej ej iW WM Ip wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -31070,119 +36302,119 @@ py py kL IF -IF +KB Ic Ic Ic -Ic -oa HE +oa +Ic Ic HE HE IF IF IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (118,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -31190,61 +36422,61 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw -Jf -Jf -Jf -Jf -Jf -Jf -Jf -Jf -Jf +Zw +Zw +Zw +Zw +Zw +sn +sn +sn +sn +sn Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -ej +SB ej ej Ip SQ Ip wM -NW +hR nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -31259,12 +36491,12 @@ ey nw nw nw -Ji -Ji -Ji +eO +eO +eO kL IF -IF +oa HE HE HE @@ -31277,106 +36509,106 @@ HE IF IF IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (119,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -31384,22 +36616,22 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO Zw Zw Zw @@ -31415,20 +36647,20 @@ sn Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -zi +WK ej ej Dy kK Ip wM -uv +LD nw nw nw @@ -31458,143 +36690,143 @@ nw fX nw IF -IF +oa HE HE HE HE oa -HE -Ic +oa +fq HE HE IF IF IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (120,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO Zw sn sn @@ -31608,32 +36840,32 @@ sn sn sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX PO -zi +WK ej ej Ip Ip Ip wM -uv +LD wM fX -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +eO +eO +eO +eO +eO +eO +eO +eO +eO SJ kN ON @@ -31664,130 +36896,130 @@ HE HE HE IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (121,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw @@ -31809,14 +37041,14 @@ py kL nH nH -zi +Sg ej ej nH nH wM wM -uv +LD nw nw nw @@ -31859,129 +37091,129 @@ HE IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (122,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw @@ -31997,30 +37229,30 @@ Zw Zw Zw kL -Ji -Ji -Ji +eO +eO +eO kL nH nH -Si +em Ip nH nH nH nw sJ -JZ +OE nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw mY SJ SJ @@ -32031,13 +37263,13 @@ SJ nw nw wM -NW +Od nw nw nw -Ji -Ji -Ji +eO +eO +eO kL IF IF @@ -32053,129 +37285,129 @@ rN IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (123,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL Zw @@ -32183,11 +37415,11 @@ sn Zw Zw kL -Ji +eO kL -Za +Yw kL -Ji +eO kL kL kL @@ -32197,24 +37429,24 @@ py kL nw nw -ey +kA DZ FW nw nw wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw mY SJ SJ @@ -32223,9 +37455,9 @@ Mp hA SJ nw +jw wM -wM -uv +lI nw nw kL @@ -32235,11 +37467,11 @@ py kL kL kL -Ji +eO kL -Za +Yw kL -Ji +eO IF IF IF @@ -32247,169 +37479,169 @@ HE IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (124,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL Zw sn sn Zw -Ji -Ji -Za -Za -Za -Ji +eO +eO +Yw +Yw +Yw +eO kL kL -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO nw -uv -ey -uv -uv -uv -uv -uv -uv -uv +wM +kA +wM +wM +wM +wM +wM +wM +LD wM nw -Ji -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO RM Cx Mp @@ -32419,191 +37651,191 @@ kN wM wM wM -uv +lI wM nw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO kL kL -Ji -Za -Za -Za -Ji -Ji +eO +Yw +Yw +Yw +eO +eO IF HE HE IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (125,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw sn sn Zw -Ji -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw kL kL kL -Za -Za -Za +Yw +Yw +Yw kL nw nw -ey -wM -wM -wM -uv -wM -wM -wM +rz +HB +RY +nK +nK +nK +nK +BG wM nw -Ji -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO RM Cx EV @@ -32613,177 +37845,177 @@ kN wM wM wM -uv +lI nw nw kL -Za -Za -Za +Yw +Yw +Yw kL kL kL -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +eO IF HE HE IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (126,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw sn sn Zw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za +Yw +Yw +Yw kL nw nw -ey -NB +rr +wM +wM wM wM -uv wM wM wM @@ -32791,11 +38023,11 @@ nw nw nw nw -Ji +eO nw nw nw -Ji +eO nw mY SJ @@ -32803,371 +38035,371 @@ SJ kN kN kN -uv -uv -uv -uv -uv +lI +lI +lI +lI +lI nw nw kL -Za -Za -Za +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw IF HE HE IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (127,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Zw -sn -sn -Zw -Za -Za -Za -Za -Za -Za -Za -kL -kL -Za -Za -Za -kL -nw -nw -Lf -nw -nw -nw -JZ -sJ -sJ -sJ -nw -nw -nw -nw -nw -nw -nw -nw -nw -nw -nw -nw -nw -wM -wM -wM -uv -nw -nw -nw -nw -nw -nw -kL -Za -Za -Za -kL -kL -Za -Za -Za -Za -Za -Za -Za -IF -HE -HE -IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Zw +sn +sn +Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +kL +kL +Yw +Yw +Yw +kL +nw +nw +po +nw +nw +nw +JZ +sJ +sJ +sJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +wM +wM +wM +lI +nw +nw +nw +nw +nw +nw +kL +Yw +Yw +Yw +kL +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +IF +HE +HE +IF +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (128,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw sn sn Zw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Ji +Yw +Yw +Yw +eO nw wM -oD +kA wM wM nw @@ -33191,169 +38423,169 @@ nw wM wM wM -uv +lI nw wM -wM +nw wM wM nw -Ji -Za -Za -Za +eO +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw IF HE HE IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(129,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(129,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw Zw -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL py py @@ -33361,7 +38593,7 @@ py kL nw nw -oD +kA wM wM nw @@ -33385,10 +38617,10 @@ wM wM wM wM -uv +lI nw wM -wM +WC wM nw nw @@ -33397,165 +38629,165 @@ py py py kL -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw IF IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (130,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL -Ji -Ji -Ji +eO +eO +eO kL nw nw -oD +kA wM wM nw @@ -33579,169 +38811,169 @@ nw wM wM wM -NW +Od nw wM -wM +fB wM nw nw kL -Ji -Ji -Ji +eO +eO +eO kL -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (131,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL py py @@ -33749,7 +38981,7 @@ py kL nw nw -oD +Ga wM wM nw @@ -33770,11 +39002,11 @@ wM nw nw nw -uv -uv -uv -uv -nw +lI +lI +lI +lI +GC wM wM wM @@ -33785,356 +39017,356 @@ py py py kL -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (132,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -kL -kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -nw -VH -hm -wM -wM -nw -wM -wM -wM -uv -nw -nw -nw -WN -wM -wM -RP -wM -wM -wM -nw -nw -nw -uv -wM -wM -wM -nw -nw -nw -nw -wM -nw -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +nw +VH +hm +wM +wM +nw +wM +wM +wM +uv +nw +nw +nw +WN +wM +wM +RP +wM +wM +wM +nw +nw +nw +lI +wM +wM +wM +nw +wM +wM +wM +wM +nw +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +kL +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (133,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO nw nw nw @@ -34158,182 +39390,182 @@ nw nw nw wM -uv +lI wM wM wM nw -Za -Ji nw nw +wM +wM nw -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(134,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(134,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO kL kL -Ji -Ji -Za +eO +eO +Yw nw nw wM @@ -34352,377 +39584,377 @@ nw nw nw nw -uv +lI wM wM kL kL -Za -Ji -Ji -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(135,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -Ji -Ji -Za -Za +Yw nw wM wM -uv -nw -cl -wM -Cb -Cb -sK -sK -ga -tp -Ah -nw -nw nw -uv -wM -wM -kL -Za -Za -Ji -Ji -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(136,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(135,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO kL -Ji -Ji -Ji -Za -Za +kL +eO +eO +Yw +Yw +nw +wM +wM +uv +nw +cl +wM +Cb +Cb +sK +sK +ga +tp +Ah +nw +nw +nw +lI +wM +wM +kL +Yw +Yw +nw +wM +wM +nw +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(136,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +kL +eO +eO +eO +Yw +Yw nw nw wM @@ -34740,184 +39972,184 @@ oj nw nw nw -uv +lI wM nw kL -Za -Za -Ji -Ji -Ji -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(137,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +nw +wM +wM +nw +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(137,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO kL -Ji -Ji -Ji -Za -Za -Za +eO +eO +eO +Yw +Yw +Yw nw wM uv @@ -34934,4645 +40166,4645 @@ Ah nw nw nw -uv -wM -nw -Za -Za -Za -Ji -Ji -Ji -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(138,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -Ji -Ji -Ji -Za -Za -Za -nw -wM -uv -wM -wM -nw -nw -gH -nw -nw -nw +lI wM nw +Yw +Yw +Yw nw wM wM -uv -wM nw -Za -Za -Za -Ji -Ji -Ji -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(139,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(138,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +kL +eO +eO +eO +Yw +Yw +Yw nw wM uv -nw +wM wM nw nw +gH nw nw nw -nw -UJ -nw -nw -wM -nw -uv wM nw -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(140,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -nw -wM -uv nw wM -nw wM +lI wM nw +Yw +Yw +Yw nw nw -wM -wM -nw -wM nw -uv -wM nw -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(141,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Za -Za -Za -Za -Za -Za +(139,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw nw wM -tj -uv uv -JZ -uv -wM -wM nw wM -wM -uv -JZ -uv -uv -uv -wM -nw -Za -Za -Za -Za -Za -Za -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(142,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -nw -nw -nw -nw -nw -nw -uv nw nw nw nw nw -uv -nw nw +UJ nw nw +wM nw +lI +wM nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(143,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -eg -nw +(140,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw nw -uv wM +uv nw -nw +wM nw wM -uv +wM nw nw -eg -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(144,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -BX -Ji nw -uv wM wM -wq -FW +nw wM -uv nw -Ji -BX -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +lI +wM +nw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(145,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -BX -Ji +(141,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw nw +wM +tj +uv +uv +JZ uv wM wM -xb -DZ +nw +wM +wM +lI +YP +lI +lI +lI wM -NW nw -Ji -BX -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(146,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -SN -EM +(142,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nw +nw +nw +nw nw nw -uv -uv -uv -uv -uv -uv uv nw nw -OS -bE -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(147,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za nw nw -wM -wM -wM -wM -wM -wM -wM nw +lI nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(148,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za nw nw nw nw -wM -wM -wM nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(143,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +RF nw nw +uv +wM nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(149,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za nw nw wM -wM -wM +lI nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(150,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +RF +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(144,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Wo +eO nw +uv wM wM +wq +FW wM +lI nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Wo +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(151,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -nw -nw -nw +(145,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Wo +eO nw +uv +wM +wM +xb +DZ +wM +lI nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Wo +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(152,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -lP -lP -lP -lP -so -lP -lP -Za -Za -Za -Za -Za -nw +(146,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Zk +Kq nw nw +cX +lI +lI +lI +lI +lI +lI nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +ly +XR +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(153,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -tJ -Vm -Mx -au -xS -TS -Pa -Za -Za -Za -Za -Za -nw +(147,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw nw nw +wM +wM +wM +wM +wM +wM +Jx nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(154,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -lP -Re -WT -LP -NV -gi -ao -Za -Za -Za -Za -Za -Za +(148,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw nw nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(155,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -lP -Oc -pp -vx -Vy -Sj -Pa -Za -Za -Za -Za -Za -Za nw +wM +wM +wM nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(156,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -lP -Mw -Ew -Ew -zt -hX -Pa -Za -Za -Za -Za -Za -Za nw nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(149,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nw +nw +wM +wM +wM nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(157,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(150,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nw +wM +wM +wM +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(151,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +Au +Au +Au +Au +Au +Au +Au +Au +Yw +Yw +Yw +Yw +nw +nw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(152,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au lP lP lP lP +so lP lP -Pa -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Au +Yw +Yw +Yw +Yw +nw +nw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(153,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +tJ +Vm +Mx +au +xS +TS +Pa +Au +Yw +Yw +Yw +Yw +nw +nw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(154,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +lP +Re +WT +LP +NV +gi +ao +Au +Yw +Yw +Yw +Yw +Yw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(155,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +lP +Oc +pp +vx +Vy +xG +Pa +Au +Yw +Yw +Yw +Yw +Yw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(158,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(156,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +lP +Mw +Ew +Ew +zt +hX +Pa +Au +Yw +Yw +Yw +Yw +Yw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(157,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +lP +lP +lP +lP +lP +lP +Pa +Au +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(158,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +Au +Au +Au +Au +Au +Au +Au +Au +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (159,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (160,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (161,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -39595,178 +44827,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(162,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(162,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -39789,178 +45021,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (163,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -39983,178 +45215,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (164,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40177,178 +45409,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(165,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(165,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40371,178 +45603,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (166,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40565,178 +45797,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (167,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40759,178 +45991,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(168,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(168,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40953,178 +46185,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (169,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41147,178 +46379,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (170,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41341,178 +46573,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(171,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(171,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41535,178 +46767,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (172,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41729,178 +46961,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (173,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41923,178 +47155,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (174,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -42117,3560 +47349,3560 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (175,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (176,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(177,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(178,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(177,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(178,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (179,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (180,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(181,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(182,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(181,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(182,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (183,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (184,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(185,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(186,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(185,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(186,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (187,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (188,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(189,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(190,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(189,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(190,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (191,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (192,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} diff --git a/maps/euthenia/levels/misc.dmm b/maps/euthenia/levels/misc.dmm index 4a77e983cf..d48eec6a7b 100644 --- a/maps/euthenia/levels/misc.dmm +++ b/maps/euthenia/levels/misc.dmm @@ -18,10 +18,44 @@ /obj/item/chess/bbishop, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"ae" = ( +/obj/structure/railing, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) "af" = ( /obj/effect/floor_decal/sign/dock/one, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_checker) +"aj" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"am" = ( +/turf/unsimulated/wall, +/area/centcom/suppy) +"ax" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "az" = ( /obj/structure/railing, /turf/simulated/floor/holofloor/space, @@ -40,6 +74,15 @@ }, /turf/simulated/floor/holofloor/carpet, /area/space) +"aJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "aS" = ( /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) @@ -55,6 +98,9 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/holodorm/source_seating) +"ba" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/bar) "be" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/holodorm/source_space) @@ -73,9 +119,55 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"bC" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"bN" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"bP" = ( +/obj/machinery/computer/communications, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "bR" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"bS" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"bU" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"bV" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/escape) "bX" = ( /obj/structure/table/holotable, /obj/effect/floor_decal/corner/red/full{ @@ -95,6 +187,16 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"ck" = ( +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "co" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -110,6 +212,20 @@ }, /turf/simulated/floor/holofloor/reinforced, /area/holodeck/source_wildlife) +"cr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "cu" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -126,6 +242,27 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"cv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "cB" = ( /obj/effect/floor_decal/carpet{ dir = 9 @@ -136,6 +273,25 @@ /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"cE" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"cP" = ( +/obj/structure/table/reinforced, +/obj/machinery/keycard_auth{ + pixel_x = -24; + pixel_y = -8 + }, +/obj/item/storage/secure/briefcase, +/obj/item/multitool, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "cR" = ( /obj/effect/overlay/palmtree_l, /turf/simulated/floor/holofloor/beach/sand, @@ -164,10 +320,23 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"dy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "dK" = ( /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_checker) +"dO" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "dU" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" @@ -199,6 +368,15 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"el" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "em" = ( /obj/structure/lattice, /obj/structure/railing, @@ -213,6 +391,9 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"eL" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "eM" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/carpet, @@ -220,6 +401,11 @@ "eR" = ( /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/holodorm/source_beach) +"eT" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "eW" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove{ @@ -228,6 +414,21 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"eZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"fl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "fn" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -242,13 +443,49 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_basketball) +"fz" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "fD" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"fE" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless/carry{ + dir = 1 + }, +/area/shuttle/supply) "fF" = ( /turf/space, /area/space) +"fK" = ( +/obj/structure/window/reinforced, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_x = -32 + }, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "fN" = ( /obj/structure/window/reinforced, /turf/unsimulated/wall, @@ -257,10 +494,87 @@ /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"fT" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"fW" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"fY" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"ge" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = 26 + }, +/obj/structure/bed/chair/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"gf" = ( +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "gg" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, /area/holodeck/holodorm/source_desert) +"gl" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"go" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"gr" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "gz" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, @@ -283,6 +597,15 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_theatre) +"gW" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "gX" = ( /obj/structure/bed/chair/holochair, /obj/effect/floor_decal/carpet{ @@ -290,6 +613,20 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/holodorm/source_seating) +"hf" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"hl" = ( +/obj/structure/closet/walllocker/autolok_wall, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "ho" = ( /obj/effect/floor_decal/sign/c, /turf/simulated/floor/holofloor/wood, @@ -347,6 +684,15 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"hC" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "hG" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -354,6 +700,39 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"hM" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"hQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"ib" = ( +/turf/simulated/floor/reinforced, +/area/space) "ic" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, @@ -361,6 +740,12 @@ "ie" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"ii" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/escape) "ij" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) @@ -383,6 +768,31 @@ /obj/item/clothing/head/pin/flower, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) +"iN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) +"iO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "iR" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -421,6 +831,18 @@ }, /turf/simulated/floor/holofloor/space, /area/space) +"js" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "jv" = ( /obj/effect/floor_decal/sign/dock/three, /turf/simulated/floor/holofloor/wood, @@ -448,6 +870,25 @@ "jL" = ( /turf/unsimulated/wall, /area/space) +"jP" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/fans/tiny, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/machinery/door/airlock/glass_external/public{ + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "jY" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -507,15 +948,30 @@ }, /turf/simulated/floor/holofloor/carpet, /area/space) +"kG" = ( +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "kH" = ( /obj/effect/debris/cleanable/dirt, /obj/structure/holostool, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"kP" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) "kS" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"kT" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/communications, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "lf" = ( /obj/effect/floor_decal/carpet{ dir = 1 @@ -543,6 +999,15 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"lu" = ( +/obj/machinery/button/windowtint{ + id = "emergency_security"; + pixel_x = 24; + pixel_y = -8 + }, +/obj/structure/bed/chair/shuttle, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "lF" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, @@ -551,6 +1016,16 @@ }, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"lH" = ( +/obj/structure/sign/warning/docking_area, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"lJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "ma" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -571,12 +1046,44 @@ /obj/structure/window/reinforced, /turf/unsimulated/wall, /area/space) +"mq" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) "ms" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) +"mB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel, +/obj/machinery/door/blast/regular/open{ + id = "emergency_shuttle_lockdown"; + name = "Emergency Shuttle Blast Door" + }, +/obj/spawner/window/full/firelocks, +/turf/simulated/floor/reinforced, +/area/shuttle/escape) +"nn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "np" = ( /turf/simulated/floor/holofloor/beach/water, /area/holodeck/holodorm/source_beach) +"nA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "nB" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -606,6 +1113,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/holodorm/source_seating) +"oE" = ( +/obj/machinery/door/airlock/command{ + name = "Cockpit" + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "oM" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -637,6 +1150,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"pj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "pp" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -663,6 +1182,9 @@ /obj/structure/flora/tree/pine, /turf/simulated/floor/holofloor/snow, /area/holodeck/source_snowfield) +"py" = ( +/turf/unsimulated/floor/steel, +/area/centcom/simulated/terminal) "pJ" = ( /obj/item/chess/bknight, /turf/simulated/floor/holofloor/tiled/dark, @@ -673,6 +1195,21 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_boxingcourt) +"pR" = ( +/obj/machinery/door/airlock/command{ + name = "Cockpit" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"pW" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"qb" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "qd" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -680,6 +1217,16 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"qe" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "supply_shuttle_hatch"; + locked = 1; + name = "Shuttle Hatch" + }, +/turf/simulated/shuttle/floor, +/area/shuttle/supply) "qk" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -693,6 +1240,24 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"ql" = ( +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/fuel_port{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"qm" = ( +/obj/structure/table/standard, +/obj/random/plushie, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "qo" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -714,12 +1279,36 @@ /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"qK" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"qT" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"qZ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "rb" = ( /obj/effect/floor_decal/corner/red{ dir = 6 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"rc" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "re" = ( /obj/effect/floor_decal/sign/dock/one, /turf/simulated/floor/holofloor/wood, @@ -728,6 +1317,24 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/holofloor/grass, /area/holodeck/holodorm/source_garden) +"rk" = ( +/obj/machinery/door/airlock/medical{ + name = "Shuttle Medical" + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"rm" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"rp" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/airless, +/area/shuttle/supply) "rs" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -740,10 +1347,29 @@ /obj/item/beach_ball, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"rz" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"rD" = ( +/turf/unsimulated/floor/dark, +/area/centcom/suppy) "rF" = ( /obj/structure/catwalk, /turf/simulated/floor/holofloor/reinforced, /area/space) +"rG" = ( +/obj/machinery/vending/blood, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"rN" = ( +/obj/machinery/door/airlock/security{ + name = "Shuttle Security" + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "sa" = ( /obj/structure/window/reinforced/holowindow{ dir = 1 @@ -759,6 +1385,15 @@ /obj/item/chess/bpawn, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"sw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "sE" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 8 @@ -776,6 +1411,19 @@ /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"sO" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/turf/unsimulated/floor/steel, +/area/centcom/simulated/terminal) +"sP" = ( +/turf/simulated/floor/reinforced, +/area/shuttle/escape) "tg" = ( /obj/structure/window/reinforced/holowindow, /obj/machinery/door/window/holowindoor{ @@ -792,10 +1440,35 @@ "tl" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"tm" = ( +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "tv" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_desert) +"tz" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/structure/handrail, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"tB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) "tP" = ( /obj/machinery/door/window/holowindoor{ name = "Red Team" @@ -806,6 +1479,32 @@ /obj/item/chess/brook, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"uc" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdown"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/turf/space/transit/west, +/area/space) +"ue" = ( +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "ui" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, @@ -816,6 +1515,21 @@ "ul" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"un" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"ur" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "ut" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -847,6 +1561,25 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"uU" = ( +/obj/machinery/holoplant{ + pixel_y = 6 + }, +/obj/structure/table/glass, +/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 = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "uW" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -856,6 +1589,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"ve" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "vv" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 4 @@ -865,6 +1604,16 @@ "vw" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_meetinghall) +"vx" = ( +/obj/structure/table/standard, +/obj/item/defib_kit/loaded, +/obj/item/storage/firstaid/clotting{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/firstaid/adv, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "vC" = ( /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, @@ -875,6 +1624,22 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"vI" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"vK" = ( +/obj/machinery/status_display, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"vM" = ( +/obj/machinery/computer/shuttle_control/emergency{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "vO" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, @@ -891,6 +1656,13 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"vR" = ( +/obj/machinery/door/window/brigdoor/southright{ + dir = 4; + name = "holding cell" + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "vV" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_seating) @@ -898,10 +1670,35 @@ /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"wb" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "wc" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"wi" = ( +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/fuel_port{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"wj" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "wm" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -919,6 +1716,24 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"wp" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "ws" = ( /obj/machinery/door/window/holowindoor{ name = "Red Team" @@ -945,6 +1760,24 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"wX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "xa" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -968,12 +1801,56 @@ }, /turf/simulated/floor/holofloor/carpet, /area/space) +"xm" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "xv" = ( /obj/effect/floor_decal/corner/red/full{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"xx" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/obj/machinery/meter, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/handrail, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"xy" = ( +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"xB" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"xI" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "xO" = ( /obj/structure/window/reinforced/holowindow/disappearing{ dir = 1 @@ -983,6 +1860,17 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"xR" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "xS" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -1012,6 +1900,12 @@ /obj/structure/flora/grass/green, /turf/simulated/floor/holofloor/snow, /area/holodeck/holodorm/source_snow) +"yE" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/escape) "yH" = ( /obj/structure/catwalk, /obj/structure/table/holotable, @@ -1025,6 +1919,26 @@ /obj/item/chess/bking, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"za" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + landmark_tag = "supply_cc"; + name = "Centcom Supply Depot" + }, +/turf/simulated/shuttle/plating/airless/carry{ + dir = 1 + }, +/area/shuttle/supply) +"zg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "zm" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, @@ -1073,6 +1987,20 @@ /obj/structure/lattice, /turf/simulated/floor/holofloor/space, /area/space) +"As" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 + }, +/obj/machinery/button/windowtint{ + id = "emergency_cockpit"; + pixel_x = -24; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"AB" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/shuttle/supply) "AG" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/source_space) @@ -1082,6 +2010,15 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"AJ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "AQ" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1111,6 +2048,10 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"Bj" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/escape) "Bn" = ( /obj/landmark{ name = "Wolfgirl Spawn" @@ -1124,6 +2065,15 @@ }, /turf/simulated/floor/holofloor/reinforced, /area/space) +"Bq" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Br" = ( /obj/structure/railing{ dir = 4 @@ -1141,24 +2091,82 @@ /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"BK" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "BO" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"Cb" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Cd" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_desert) +"Ce" = ( +/turf/space/transit/west, +/area/space) +"Cg" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "Ch" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" }, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) +"Ck" = ( +/obj/machinery/status_display/supply_display, +/turf/unsimulated/wall, +/area/centcom/suppy) +"Cm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "Co" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"Cp" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/unsimulated/floor/steel, +/area/centcom/simulated/main_hall) "Cu" = ( /obj/structure/window/reinforced/holowindow{ dir = 4 @@ -1178,10 +2186,44 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"Cy" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/machinery/camera/network/crescent{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) +"Cz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"CU" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "CW" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"CX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/escape) +"Db" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) "Dj" = ( /obj/item/beach_ball/holoball, /obj/effect/floor_decal/corner/red{ @@ -1227,6 +2269,19 @@ /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"Dt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"DD" = ( +/obj/spawner/window/full/firelocks, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "DF" = ( /obj/structure/table/woodentable/holotable, /obj/effect/floor_decal/carpet{ @@ -1238,6 +2293,32 @@ /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, /area/space) +"DS" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"DU" = ( +/obj/machinery/vending/medical, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "DW" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -1284,19 +2365,51 @@ /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"Ex" = ( +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/escape) "Ey" = ( /obj/item/chess/bqueen, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"EH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) "EO" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"EZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/crew, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Fd" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"Ff" = ( +/obj/item/handcuffs, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Fh" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Fl" = ( /turf/simulated/floor/holofloor/desert, /area/holodeck/holodorm/source_desert) @@ -1329,6 +2442,24 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"FO" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"FS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "FU" = ( /obj/structure/holostool, /obj/structure/window/reinforced/holowindow{ @@ -1340,6 +2471,19 @@ /obj/effect/debris/cleanable/dirt, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"Gb" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/shuttle_control/emergency, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Gc" = ( +/obj/structure/table/standard, +/obj/item/material/ashtray/glass, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"Gk" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "Gm" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -1353,6 +2497,16 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"Gz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/structure/handrail, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "GI" = ( /obj/structure/railing{ dir = 8 @@ -1369,16 +2523,39 @@ /obj/effect/floor_decal/sign/a, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"GM" = ( +/obj/machinery/door/airlock/glass_external/public, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "GW" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"Hf" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/camera/network/crescent{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "Hj" = ( /obj/structure/table/holotable, /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"Hq" = ( +/obj/structure/sign/warning/nosmoking_2, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"Ht" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "Hz" = ( /obj/effect/floor_decal/carpet{ dir = 1 @@ -1399,6 +2576,18 @@ /obj/structure/window/reinforced/holowindow, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"HK" = ( +/obj/effect/step_trigger/teleporter/random, +/turf/space, +/area/space) +"HQ" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/industrial/danger/corner, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"Im" = ( +/turf/simulated/floor/tiled, +/area/shuttle/escape) "Io" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_theatre) @@ -1417,6 +2606,47 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"IC" = ( +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"IL" = ( +/obj/spawner/window/full/firelocks, +/turf/simulated/floor, +/area/shuttle/escape) +"IO" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"IR" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) +"IU" = ( +/obj/effect/step_trigger/teleporter/random, +/turf/space/basic, +/area/space) +"IZ" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Jd" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/camera/network/crescent{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "Jg" = ( /obj/effect/floor_decal/corner/red{ dir = 5 @@ -1453,6 +2683,15 @@ /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"JX" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"JZ" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/restaurant) "Kb" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1481,6 +2720,21 @@ /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"Kl" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Ko" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, @@ -1514,6 +2768,21 @@ }, /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_basic) +"KG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) +"KK" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/camera/network/crescent{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "KQ" = ( /obj/item/checker/redking, /obj/item/checker/redking, @@ -1545,16 +2814,72 @@ }, /turf/unsimulated/wall, /area/space) +"Lq" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/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/steel_grid, +/area/shuttle/escape) "Ls" = ( /obj/item/inflatable_duck, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"LC" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/fans/tiny, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/door/airlock/glass_external/public{ + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"LD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "LF" = ( /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, /area/space) +"LY" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "supply_shuttle"; + pixel_x = 26; + req_one_access = list(13,31); + tag_door = "supply_shuttle_hatch" + }, +/turf/simulated/shuttle/floor, +/area/shuttle/supply) "Mf" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -1563,6 +2888,10 @@ /obj/item/chess/wqueen, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"Mm" = ( +/obj/machinery/power/pointdefense, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) "MG" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -1578,6 +2907,17 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"MZ" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/firstaid/surgery, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Na" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1594,9 +2934,38 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"Nh" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "Nk" = ( /turf/simulated/floor/holofloor/carpet, /area/space) +"Np" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"NA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"NC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "NF" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1608,10 +2977,25 @@ /obj/item/clothing/gloves/boxing/hologlove, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"NX" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Oa" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/holofloor/grass, /area/holodeck/holodorm/source_garden) +"Ob" = ( +/turf/simulated/shuttle/floor, +/area/shuttle/supply) "Oe" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, @@ -1622,6 +3006,10 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"Oh" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "Oj" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -1661,11 +3049,23 @@ "OA" = ( /turf/simulated/floor/holofloor/lino, /area/holodeck/source_meetinghall) -"ON" = ( -/obj/effect/floor_decal/carpet{ - dir = 5 +"OM" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 }, -/obj/effect/floor_decal/carpet{ +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"ON" = ( +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/obj/effect/floor_decal/carpet{ dir = 6 }, /obj/effect/floor_decal/carpet{ @@ -1699,6 +3099,16 @@ "Pf" = ( /turf/simulated/floor/holofloor/reinforced, /area/holodeck/source_wildlife) +"Ph" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "Pk" = ( /obj/machinery/door/window/holowindoor, /turf/simulated/floor/holofloor/tiled, @@ -1706,6 +3116,27 @@ "Pl" = ( /turf/simulated/floor/holofloor/beach/water, /area/holodeck/source_beach) +"Pz" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "PF" = ( /obj/effect/floor_decal/sign/dock/three, /turf/simulated/floor/holofloor/wood, @@ -1713,6 +3144,11 @@ "PI" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_thunderdomecourt) +"PO" = ( +/obj/structure/medical_stand/anesthetic, +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "PX" = ( /obj/structure/flora/grass/both, /turf/simulated/floor/holofloor/snow, @@ -1743,10 +3179,44 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"Qf" = ( +/obj/structure/table/standard, +/obj/item/deck/cards, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"Qn" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"Qq" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/main_hall) "Qr" = ( /obj/effect/overlay/palmtree_r, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"Qs" = ( +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Qw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Qx" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -1758,6 +3228,17 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"QB" = ( +/obj/machinery/atmospherics/component/binary/pump/fuel{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "QP" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1765,6 +3246,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"QR" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/escape) "QU" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove{ @@ -1779,12 +3266,37 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) +"Rc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"Rm" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/centcom/terminal; + base_turf = /turf/unsimulated/floor/techfloor_grid; + landmark_tag = "escape_cc"; + name = "Escape Shuttle Centcom" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "Rs" = ( /obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"Rx" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/folder/blue, +/obj/item/pen, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "RC" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -1803,11 +3315,48 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"RM" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"RO" = ( +/obj/machinery/sleep_console{ + dir = 4 + }, +/obj/machinery/button/windowtint{ + id = "emergency_medical"; + pixel_x = -24; + pixel_y = -8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"RP" = ( +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = 26 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "RT" = ( /obj/structure/catwalk, /obj/structure/bed/chair/sofa/black/right, /turf/simulated/floor/holofloor/reinforced, /area/space) +"RV" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "RX" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -1821,6 +3370,60 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"Se" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "emergency_shuttle_lockdown"; + name = "Emergency Blast Doors"; + pixel_x = 24; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Sg" = ( +/obj/structure/table/reinforced, +/obj/machinery/keycard_auth{ + pixel_x = 24; + pixel_y = -8 + }, +/obj/item/folder/blue, +/obj/item/radio{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/radio, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Sp" = ( +/obj/structure/window/reinforced, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_x = 32 + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"Sr" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "SE" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1833,6 +3436,18 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"SG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "SI" = ( /obj/structure/railing, /obj/structure/lattice, @@ -1862,9 +3477,37 @@ /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, /area/holodeck/holodorm/source_seating) +"SY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Te" = ( /turf/space/basic, /area/space) +"Tk" = ( +/obj/item/paper{ + info = "You're not supposed to be here."; + name = "unnerving letter" + }, +/turf/unsimulated/floor/dark, +/area/centcom/suppy) +"Tn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "Tt" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_basic) @@ -1902,6 +3545,13 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"Uf" = ( +/obj/effect/shuttle_landmark{ + landmark_tag = "escape_transit"; + name = "Escape Transit" + }, +/turf/space/transit/west, +/area/space) "Us" = ( /obj/item/chess/wrook, /turf/simulated/floor/holofloor/tiled/dark, @@ -1913,6 +3563,36 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"Uw" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"UF" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"UJ" = ( +/turf/simulated/shuttle/wall, +/area/shuttle/supply) +"UN" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"UQ" = ( +/obj/machinery/pointdefense_control, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "UT" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -1921,6 +3601,21 @@ /obj/item/chess/bknight, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"UW" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "UZ" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -1940,9 +3635,51 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"Vi" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/obj/machinery/meter, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/handrail, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Vk" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"Vo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/escape) +"Vv" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "VO" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1954,6 +3691,32 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"VQ" = ( +/obj/structure/closet/crate, +/turf/unsimulated/floor/dark, +/area/centcom/suppy) +"VR" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "VW" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red/full{ @@ -1961,6 +3724,26 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"Wg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/structure/handrail, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Ws" = ( +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Wt" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -1970,6 +3753,32 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"Wv" = ( +/obj/structure/sign/warning{ + name = "\improper STAND AWAY FROM TRACK EDGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"WA" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"WM" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"WO" = ( +/obj/structure/table/glass, +/obj/random/action_figure, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "WU" = ( /obj/item/chess/bbishop, /turf/simulated/floor/holofloor/tiled/dark, @@ -1984,15 +3793,59 @@ /obj/structure/bed/holobed, /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_basic) +"Xp" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"Xt" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"Xu" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "XI" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_checker) "XT" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) +"XU" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "XX" = ( /turf/simulated/floor/holofloor/tiled, /area/space) +"Ye" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/unsimulated/floor/steel, +/area/centcom/simulated/terminal) "Yg" = ( /obj/structure/railing{ dir = 4 @@ -2050,6 +3903,30 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"Zh" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/escape) +"Zj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) +"Zl" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "Zq" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -2069,1767 +3946,30 @@ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_basketball) -"ZH" = ( -/turf/simulated/floor/holofloor/snow, -/area/holodeck/source_snowfield) -"ZJ" = ( -/obj/structure/holohoop{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_basketball) - -(1,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(2,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(3,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(4,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(5,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(6,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(7,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(8,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(9,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(10,1,1) = {" +/area/holodeck/source_basketball) +"ZB" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"ZH" = ( +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"ZJ" = ( +/obj/structure/holohoop{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"ZO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) + +(1,1,1) = {" Te Te Te @@ -4023,7 +4163,7 @@ Te Te Te "} -(11,1,1) = {" +(2,1,1) = {" Te Te Te @@ -4217,7 +4357,7 @@ Te Te Te "} -(12,1,1) = {" +(3,1,1) = {" Te Te Te @@ -4411,7 +4551,7 @@ Te Te Te "} -(13,1,1) = {" +(4,1,1) = {" Te Te Te @@ -4605,7 +4745,7 @@ Te Te Te "} -(14,1,1) = {" +(5,1,1) = {" Te Te Te @@ -4799,7 +4939,7 @@ Te Te Te "} -(15,1,1) = {" +(6,1,1) = {" Te Te Te @@ -4993,7 +5133,7 @@ Te Te Te "} -(16,1,1) = {" +(7,1,1) = {" Te Te Te @@ -5187,7 +5327,7 @@ Te Te Te "} -(17,1,1) = {" +(8,1,1) = {" Te Te Te @@ -5381,7 +5521,7 @@ Te Te Te "} -(18,1,1) = {" +(9,1,1) = {" Te Te Te @@ -5575,7 +5715,7 @@ Te Te Te "} -(19,1,1) = {" +(10,1,1) = {" Te Te Te @@ -5769,7 +5909,7 @@ Te Te Te "} -(20,1,1) = {" +(11,1,1) = {" Te Te Te @@ -5963,7 +6103,7 @@ Te Te Te "} -(21,1,1) = {" +(12,1,1) = {" Te Te Te @@ -6157,7 +6297,7 @@ Te Te Te "} -(22,1,1) = {" +(13,1,1) = {" Te Te Te @@ -6351,7 +6491,7 @@ Te Te Te "} -(23,1,1) = {" +(14,1,1) = {" Te Te Te @@ -6545,7 +6685,7 @@ Te Te Te "} -(24,1,1) = {" +(15,1,1) = {" Te Te Te @@ -6739,7 +6879,7 @@ Te Te Te "} -(25,1,1) = {" +(16,1,1) = {" Te Te Te @@ -6933,7 +7073,7 @@ Te Te Te "} -(26,1,1) = {" +(17,1,1) = {" Te Te Te @@ -7127,7 +7267,7 @@ Te Te Te "} -(27,1,1) = {" +(18,1,1) = {" Te Te Te @@ -7321,7 +7461,7 @@ Te Te Te "} -(28,1,1) = {" +(19,1,1) = {" Te Te Te @@ -7515,7 +7655,7 @@ Te Te Te "} -(29,1,1) = {" +(20,1,1) = {" Te Te Te @@ -7709,11 +7849,7 @@ Te Te Te "} -(30,1,1) = {" -Te -Te -Te -Te +(21,1,1) = {" Te Te Te @@ -7725,6 +7861,35 @@ Te Te Te Te +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB Te Te Te @@ -7877,6 +8042,8 @@ Te Te Te Te +"} +(22,1,1) = {" Te Te Te @@ -7888,6 +8055,35 @@ Te Te Te Te +lH +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +mq +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +mq +ZB +ZB +ZB +ZB +ZB +ZB +Wv Te Te Te @@ -7902,8 +8098,6 @@ Te Te Te Te -"} -(31,1,1) = {" Te Te Te @@ -8042,6 +8236,8 @@ Te Te Te Te +"} +(23,1,1) = {" Te Te Te @@ -8053,6 +8249,35 @@ Te Te Te Te +ZB +FO +Hf +FO +RM +FO +FO +FO +FO +RM +FO +FO +FO +FO +RM +FO +FO +FO +FO +RM +FO +FO +FO +FO +RM +FO +Hf +FO +ZB Te Te Te @@ -8096,8 +8321,6 @@ Te Te Te Te -"} -(32,1,1) = {" Te Te Te @@ -8207,6 +8430,8 @@ Te Te Te Te +"} +(24,1,1) = {" Te Te Te @@ -8218,6 +8443,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +IC +IC +IC +IC +IC +IC +IC +bV +Nh +NC +NA +mB +mB +NA +nn +IC +IC +IC +IC +IC +IC +IC +IC +ZB Te Te Te @@ -8290,8 +8544,6 @@ Te Te Te Te -"} -(33,1,1) = {" Te Te Te @@ -8372,6 +8624,8 @@ Te Te Te Te +"} +(25,1,1) = {" Te Te Te @@ -8383,6 +8637,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +IC +IC +Zh +lJ +NA +mB +NA +NA +NA +KG +bN +bN +bN +eT +zg +RV +Bj +IC +IC +IC +IC +IC +IC +ZB Te Te Te @@ -8484,8 +8767,6 @@ Te Te Te Te -"} -(34,1,1) = {" Te Te Te @@ -8537,6 +8818,8 @@ Te Te Te Te +"} +(26,1,1) = {" Te Te Te @@ -8548,6 +8831,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +Mm +Db +fY +KG +ue +gl +fz +NX +Gk +fT +ZO +vR +ZO +Bq +zg +NA +RV +Bj +IC +bC +bC +bC +IC +ZB Te Te Te @@ -8678,8 +8990,6 @@ Te Te Te Te -"} -(35,1,1) = {" Te Te Te @@ -8702,6 +9012,8 @@ Te Te Te Te +"} +(27,1,1) = {" Te Te Te @@ -8713,6 +9025,35 @@ Te Te Te Te +ZB +pW +IC +Gk +Db +IL +Gk +ue +fK +ck +tm +tm +xR +Gk +ge +tm +tm +rc +Db +tB +ql +Db +Db +Qn +nA +sw +Dt +qK +ZB Te Te Te @@ -8865,6 +9206,8 @@ Te Te Te Te +"} +(28,1,1) = {" Te Te Te @@ -8872,12 +9215,39 @@ Te Te Te Te -"} -(36,1,1) = {" Te Te Te Te +ZB +pW +Gk +Gk +Db +UQ +vK +VR +Oh +iO +tm +aj +bS +Gk +lu +tm +tm +Ff +Gk +Vi +FS +AJ +jP +WA +WA +py +qT +qK +ZB Te Te Te @@ -9030,6 +9400,8 @@ Te Te Te Te +"} +(29,1,1) = {" Te Te Te @@ -9041,6 +9413,35 @@ Te Te Te Te +ZB +pW +Db +Db +cP +Xu +IL +tz +tm +hQ +tm +Kl +UW +Db +Gk +rN +IL +vK +Db +Gz +rm +gr +LC +WA +WA +py +qT +qK +ZB Te Te Te @@ -9066,8 +9467,6 @@ Te Te Te Te -"} -(37,1,1) = {" Te Te Te @@ -9195,6 +9594,8 @@ Te Te Te Te +"} +(30,1,1) = {" Te Te Te @@ -9206,6 +9607,35 @@ Te Te Te Te +ZB +pW +IL +kT +As +hl +IL +Fh +rz +rz +rz +rz +ax +WO +Pz +tm +XU +uU +IL +Np +QB +EH +EH +Uw +LD +py +qT +qK +ZB Te Te Te @@ -9260,8 +9690,6 @@ Te Te Te Te -"} -(38,1,1) = {" Te Te Te @@ -9360,6 +9788,8 @@ Te Te Te Te +"} +(31,1,1) = {" Te Te Te @@ -9371,6 +9801,35 @@ Te Te Te Te +ZB +pW +IL +Gb +IO +tm +oE +tm +qm +Gc +Qf +qm +tm +tm +tm +tm +tm +eL +xm +wj +pj +RV +Bj +ae +LD +py +qT +qK +ZB Te Te Te @@ -9454,8 +9913,6 @@ Te Te Te Te -"} -(39,1,1) = {" Te Te Te @@ -9525,6 +9982,8 @@ Te Te Te Te +"} +(32,1,1) = {" Te Te Te @@ -9536,6 +9995,35 @@ Te Te Te Te +ZB +pW +IL +EZ +Se +hl +IL +Qw +vI +vI +vI +vI +Ws +UF +Lq +tm +wX +cr +IL +js +bU +Db +Db +kP +LD +py +qT +qK +ZB Te Te Te @@ -9648,8 +10136,6 @@ Te Te Te Te -"} -(40,1,1) = {" Te Te Te @@ -9690,6 +10176,8 @@ Te Te Te Te +"} +(33,1,1) = {" Te Te Te @@ -9701,6 +10189,35 @@ Te Te Te Te +ZB +pW +Db +Db +Sg +wb +IL +Wg +tm +cv +tm +SY +Sr +Db +Gk +rk +IL +vK +Db +Gz +IZ +AJ +jP +WA +WA +py +qT +qK +ZB Te Te Te @@ -9842,8 +10359,6 @@ Te Te Te Te -"} -(41,1,1) = {" Te Te Te @@ -9855,6 +10370,8 @@ Te Te Te Te +"} +(34,1,1) = {" Te Te Te @@ -9866,6 +10383,35 @@ Te Te Te Te +ZB +pW +Gk +Gk +Db +Rx +vK +DS +Oh +Vv +tm +Cb +go +Gk +RO +tm +WM +WM +Gk +xx +SG +gr +LC +WA +WA +py +qT +qK +ZB Te Te Te @@ -10018,6 +10564,8 @@ Te Te Te Te +"} +(35,1,1) = {" Te Te Te @@ -10029,6 +10577,35 @@ Te Te Te Te +ZB +pW +IC +Gk +Db +IL +Gk +gf +Sp +ck +tm +tm +xR +Gk +RP +tm +tm +Cg +Db +tB +wi +Db +Db +Uw +LD +py +qT +qK +ZB Te Te Te @@ -10036,8 +10613,6 @@ Te Te Te Te -"} -(42,1,1) = {" Te Te Te @@ -10183,6 +10758,8 @@ Te Te Te Te +"} +(36,1,1) = {" Te Te Te @@ -10194,6 +10771,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +Mm +Db +hM +iN +gf +xy +wp +OM +Gk +DU +tm +tm +tm +rG +zg +NA +RV +Bj +ae +LD +py +qT +qK +ZB Te Te Te @@ -10230,8 +10836,6 @@ Te Te Te Te -"} -(43,1,1) = {" Te Te Te @@ -10348,6 +10952,8 @@ Te Te Te Te +"} +(37,1,1) = {" Te Te Te @@ -10359,6 +10965,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +IC +IC +yE +Tn +NA +mB +NA +NA +NA +iN +MZ +Qs +PO +vx +zg +RV +Bj +IC +ae +LD +py +qT +qK +ZB Te Te Te @@ -10424,8 +11059,6 @@ Te Te Te Te -"} -(44,1,1) = {" Te Te Te @@ -10513,6 +11146,8 @@ Te Te Te Te +"} +(38,1,1) = {" Te Te Te @@ -10524,6 +11159,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +IC +IC +IC +IC +IC +IC +IC +bV +el +JX +Cm +mB +mB +Cm +ve +IC +IC +IC +ae +LD +py +qT +qK +ZB Te Te Te @@ -10618,8 +11282,6 @@ Te Te Te Te -"} -(45,1,1) = {" Te Te Te @@ -10678,6 +11340,8 @@ Te Te Te Te +"} +(39,1,1) = {" Te Te Te @@ -10689,6 +11353,35 @@ Te Te Te Te +ZB +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +Qn +LD +py +qT +qK +ZB Te Te Te @@ -10812,8 +11505,6 @@ Te Te Te Te -"} -(46,1,1) = {" Te Te Te @@ -10843,6 +11534,8 @@ Te Te Te Te +"} +(40,1,1) = {" Te Te Te @@ -10854,6 +11547,35 @@ Te Te Te Te +Zl +aJ +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +BK +py +qT +xB +ZB Te Te Te @@ -11007,8 +11729,7 @@ Te Te Te "} -(47,1,1) = {" -Te +(41,1,1) = {" Te Te Te @@ -11020,6 +11741,35 @@ Te Te Te Te +CU +kG +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +qT +xB +ZB Te Te Te @@ -11172,6 +11922,8 @@ Te Te Te Te +"} +(42,1,1) = {" Te Te Te @@ -11183,6 +11935,35 @@ Te Te Te Te +Xt +Zj +dy +dy +dy +dy +dy +dy +gW +py +py +py +py +py +py +py +py +py +py +py +HQ +dy +dy +dy +dy +dy +eZ +xB +ZB Te Te Te @@ -11200,8 +11981,6 @@ Te Te Te Te -"} -(48,1,1) = {" Te Te Te @@ -11337,6 +12116,8 @@ Te Te Te Te +"} +(43,1,1) = {" Te Te Te @@ -11348,6 +12129,35 @@ Te Te Te Te +ZB +hC +cE +cE +cE +cE +cE +hf +LD +py +py +Ye +qZ +Ph +sO +Ph +Cy +IR +py +py +qT +xI +cE +cE +cE +cE +cE +pW +ZB Te Te Te @@ -11394,8 +12204,6 @@ Te Te Te Te -"} -(49,1,1) = {" Te Te Te @@ -11502,6 +12310,8 @@ Te Te Te Te +"} +(44,1,1) = {" Te Te Te @@ -11513,6 +12323,35 @@ Te Te Te Te +ZB +Ht +Jd +ur +ZB +ZB +ZB +ZB +ZB +ZB +ZB +Hq +Qq +Cp +Cp +Cp +Qq +JZ +JZ +JZ +JZ +JZ +JZ +JZ +ba +ur +KK +Ht +ZB Te Te Te @@ -11588,8 +12427,6 @@ Te Te Te Te -"} -(50,1,1) = {" Te Te Te @@ -11667,6 +12504,8 @@ Te Te Te Te +"} +(45,1,1) = {" Te Te Te @@ -11678,6 +12517,35 @@ Te Te Te Te +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL Te Te Te @@ -11782,8 +12650,6 @@ Te Te Te Te -"} -(51,1,1) = {" Te Te Te @@ -11832,6 +12698,8 @@ Te Te Te Te +"} +(46,1,1) = {" Te Te Te @@ -11976,8 +12844,6 @@ Te Te Te Te -"} -(52,1,1) = {" Te Te Te @@ -12026,6 +12892,8 @@ Te Te Te Te +"} +(47,1,1) = {" Te Te Te @@ -12170,8 +13038,6 @@ Te Te Te Te -"} -(53,1,1) = {" Te Te Te @@ -12220,6 +13086,8 @@ Te Te Te Te +"} +(48,1,1) = {" Te Te Te @@ -12364,8 +13232,6 @@ Te Te Te Te -"} -(54,1,1) = {" Te Te Te @@ -12414,6 +13280,8 @@ Te Te Te Te +"} +(49,1,1) = {" Te Te Te @@ -12558,8 +13426,6 @@ Te Te Te Te -"} -(55,1,1) = {" Te Te Te @@ -12608,6 +13474,8 @@ Te Te Te Te +"} +(50,1,1) = {" Te Te Te @@ -12639,6 +13507,14 @@ Te Te Te Te +ib +ib +eL +fW +fW +eL +ib +ib Te Te Te @@ -12752,8 +13628,6 @@ Te Te Te Te -"} -(56,1,1) = {" Te Te Te @@ -12794,6 +13668,8 @@ Te Te Te Te +"} +(51,1,1) = {" Te Te Te @@ -12825,6 +13701,14 @@ Te Te Te Te +ib +dO +Ex +fW +fW +Ex +eL +ib Te Te Te @@ -12946,8 +13830,6 @@ Te Te Te Te -"} -(57,1,1) = {" Te Te Te @@ -12980,6 +13862,8 @@ Te Te Te Te +"} +(52,1,1) = {" Te Te Te @@ -13011,6 +13895,14 @@ Te Te Te Te +ib +Ex +Ex +vM +Xp +Ex +Ex +ib Te Te Te @@ -13140,8 +14032,6 @@ Te Te Te Te -"} -(58,1,1) = {" Te Te Te @@ -13166,6 +14056,8 @@ Te Te Te Te +"} +(53,1,1) = {" Te Te Te @@ -13197,6 +14089,14 @@ Te Te Te Te +ib +Ex +bP +qb +qb +Im +Ex +ib Te Te Te @@ -13334,8 +14234,6 @@ Te Te Te Te -"} -(59,1,1) = {" Te Te Te @@ -13352,6 +14250,8 @@ Te Te Te Te +"} +(54,1,1) = {" Te Te Te @@ -13383,6 +14283,14 @@ Te Te Te Te +ib +Ex +Im +Im +Im +Im +Ex +ib Te Te Te @@ -13528,8 +14436,6 @@ Te Te Te Te -"} -(60,1,1) = {" Te Te Te @@ -13538,6 +14444,8 @@ Te Te Te Te +"} +(55,1,1) = {" Te Te Te @@ -13569,6 +14477,14 @@ Te Te Te Te +ib +Ex +Im +Im +Im +Im +Ex +ib Te Te Te @@ -13723,15 +14639,7 @@ Te Te Te "} -(61,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te +(56,1,1) = {" Te Te Te @@ -13763,6 +14671,14 @@ Te Te Te Te +ib +Ex +Ex +DD +pR +Ex +Ex +ib Te Te Te @@ -13917,15 +14833,7 @@ Te Te Te "} -(62,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te +(57,1,1) = {" Te Te Te @@ -13957,6 +14865,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14111,23 +15027,7 @@ Te Te Te "} -(63,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +(58,1,1) = {" Te Te Te @@ -14159,6 +15059,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14304,8 +15212,6 @@ Te Te Te Te -"} -(64,1,1) = {" Te Te Te @@ -14314,6 +15220,8 @@ Te Te Te Te +"} +(59,1,1) = {" Te Te Te @@ -14345,6 +15253,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14499,7 +15415,8 @@ Te Te Te "} -(65,1,1) = {" +(60,1,1) = {" +Te Te Te Te @@ -14530,6 +15447,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14683,6 +15608,8 @@ Te Te Te Te +"} +(61,1,1) = {" Te Te Te @@ -14692,8 +15619,6 @@ Te Te Te Te -"} -(66,1,1) = {" Te Te Te @@ -14716,6 +15641,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14869,6 +15802,8 @@ Te Te Te Te +"} +(62,1,1) = {" Te Te Te @@ -14886,8 +15821,6 @@ Te Te Te Te -"} -(67,1,1) = {" Te Te Te @@ -14902,6 +15835,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -15055,6 +15996,8 @@ Te Te Te Te +"} +(63,1,1) = {" Te Te Te @@ -15080,14 +16023,20 @@ Te Te Te Te -"} -(68,1,1) = {" Te Te Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -15241,6 +16190,8 @@ Te Te Te Te +"} +(64,1,1) = {" Te Te Te @@ -15272,10 +16223,16 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te -"} -(69,1,1) = {" Te Te Te @@ -15427,6 +16384,8 @@ Te Te Te Te +"} +(65,1,1) = {" Te Te Te @@ -15458,6 +16417,14 @@ Te Te Te Te +Ex +Db +qb +Im +Im +qb +Db +Ex Te Te Te @@ -15468,8 +16435,6 @@ Te Te Te Te -"} -(70,1,1) = {" Te Te Te @@ -15613,6 +16578,8 @@ Te Te Te Te +"} +(66,1,1) = {" Te Te Te @@ -15644,6 +16611,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +GM Te Te Te @@ -15662,8 +16637,6 @@ Te Te Te Te -"} -(71,1,1) = {" Te Te Te @@ -15799,6 +16772,8 @@ Te Te Te Te +"} +(67,1,1) = {" Te Te Te @@ -15830,6 +16805,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +GM Te Te Te @@ -15856,8 +16839,6 @@ Te Te Te Te -"} -(72,1,1) = {" Te Te Te @@ -15985,6 +16966,8 @@ Te Te Te Te +"} +(68,1,1) = {" Te Te Te @@ -16016,6 +16999,14 @@ Te Te Te Te +Ex +qb +Im +Im +Rm +Im +Im +Db Te Te Te @@ -16050,8 +17041,6 @@ Te Te Te Te -"} -(73,1,1) = {" Te Te Te @@ -16171,6 +17160,8 @@ Te Te Te Te +"} +(69,1,1) = {" Te Te Te @@ -16202,6 +17193,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +Db Te Te Te @@ -16244,8 +17243,6 @@ Te Te Te Te -"} -(74,1,1) = {" Te Te Te @@ -16357,6 +17354,8 @@ Te Te Te Te +"} +(70,1,1) = {" Te Te Te @@ -16388,6 +17387,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +GM Te Te Te @@ -16438,8 +17445,6 @@ Te Te Te Te -"} -(75,1,1) = {" Te Te Te @@ -16543,6 +17548,8 @@ Te Te Te Te +"} +(71,1,1) = {" Te Te Te @@ -16574,6 +17581,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +GM Te Te Te @@ -16632,8 +17647,6 @@ Te Te Te Te -"} -(76,1,1) = {" Te Te Te @@ -16729,6 +17742,8 @@ Te Te Te Te +"} +(72,1,1) = {" Te Te Te @@ -16760,6 +17775,14 @@ Te Te Te Te +Ex +Db +Ex +Im +Ex +Ex +Ex +Db Te Te Te @@ -16826,8 +17849,6 @@ Te Te Te Te -"} -(77,1,1) = {" Te Te Te @@ -16915,6 +17936,8 @@ Te Te Te Te +"} +(73,1,1) = {" Te Te Te @@ -16946,6 +17969,14 @@ Te Te Te Te +ib +Ex +fl +un +un +Cz +Ex +ib Te Te Te @@ -17020,8 +18051,6 @@ Te Te Te Te -"} -(78,1,1) = {" Te Te Te @@ -17101,6 +18130,8 @@ Te Te Te Te +"} +(74,1,1) = {" Te Te Te @@ -17132,6 +18163,14 @@ Te Te Te Te +ib +CX +Rc +UN +Rc +Rc +ii +ib Te Te Te @@ -17214,8 +18253,6 @@ Te Te Te Te -"} -(79,1,1) = {" Te Te Te @@ -17287,6 +18324,8 @@ Te Te Te Te +"} +(75,1,1) = {" Te Te Te @@ -17318,6 +18357,14 @@ Te Te Te Te +ib +tB +Vo +Vo +Vo +Vo +tB +ib Te Te Te @@ -17408,8 +18455,6 @@ Te Te Te Te -"} -(80,1,1) = {" Te Te Te @@ -17473,6 +18518,8 @@ Te Te Te Te +"} +(76,1,1) = {" Te Te Te @@ -17504,6 +18551,14 @@ Te Te Te Te +ib +sP +sP +QR +sP +sP +QR +ib Te Te Te @@ -17602,8 +18657,6 @@ Te Te Te Te -"} -(81,1,1) = {" Te Te Te @@ -17659,6 +18712,8 @@ Te Te Te Te +"} +(77,1,1) = {" Te Te Te @@ -17676,7 +18731,28 @@ Te Te Te Te +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU Te +ib +sP +sP +sP +sP +sP +sP +ib Te Te Te @@ -17796,8 +18872,6 @@ Te Te Te Te -"} -(82,1,1) = {" Te Te Te @@ -17832,6 +18906,8 @@ Te Te Te Te +"} +(78,1,1) = {" Te Te Te @@ -17849,7 +18925,28 @@ Te Te Te Te +IU +am +am +am +am +am +am +am +am +am +am +am +IU Te +ib +sP +sP +sP +sP +sP +sP +ib Te Te Te @@ -17990,8 +19087,6 @@ Te Te Te Te -"} -(83,1,1) = {" Te Te Te @@ -18005,6 +19100,8 @@ Te Te Te Te +"} +(79,1,1) = {" Te Te Te @@ -18022,6 +19119,19 @@ Te Te Te Te +IU +am +VQ +VQ +VQ +VQ +rD +rD +VQ +VQ +VQ +am +IU Te Te Te @@ -18185,7 +19295,7 @@ Te Te Te "} -(84,1,1) = {" +(80,1,1) = {" Te Te Te @@ -18203,6 +19313,19 @@ Te Te Te Te +IU +am +rD +rD +rD +rD +rD +rD +rD +rD +rD +am +IU Te Te Te @@ -18365,6 +19488,8 @@ Te Te Te Te +"} +(81,1,1) = {" Te Te Te @@ -18378,12 +19503,23 @@ Te Te Te Te -"} -(85,1,1) = {" Te Te Te Te +IU +am +VQ +VQ +VQ +rD +Tk +rD +VQ +VQ +VQ +am +IU Te Te Te @@ -18546,6 +19682,8 @@ Te Te Te Te +"} +(82,1,1) = {" Te Te Te @@ -18563,6 +19701,19 @@ Te Te Te Te +IU +am +VQ +VQ +VQ +rD +rD +rD +VQ +VQ +VQ +am +IU Te Te Te @@ -18572,8 +19723,6 @@ Te Te Te Te -"} -(86,1,1) = {" Te Te Te @@ -18727,6 +19876,8 @@ Te Te Te Te +"} +(83,1,1) = {" Te Te Te @@ -18744,6 +19895,19 @@ Te Te Te Te +IU +am +rD +rD +rD +rD +rD +rD +rD +rD +rD +am +IU Te Te Te @@ -18766,8 +19930,6 @@ Te Te Te Te -"} -(87,1,1) = {" Te Te Te @@ -18908,6 +20070,8 @@ Te Te Te Te +"} +(84,1,1) = {" Te Te Te @@ -18925,6 +20089,19 @@ Te Te Te Te +IU +am +VQ +VQ +VQ +VQ +rD +rD +VQ +VQ +VQ +am +IU Te Te Te @@ -18960,8 +20137,6 @@ Te Te Te Te -"} -(88,1,1) = {" Te Te Te @@ -19089,6 +20264,8 @@ Te Te Te Te +"} +(85,1,1) = {" Te Te Te @@ -19106,6 +20283,19 @@ Te Te Te Te +HK +am +am +am +am +Ck +rD +rD +Ck +am +am +am +HK Te Te Te @@ -19154,8 +20344,6 @@ Te Te Te Te -"} -(89,1,1) = {" Te Te Te @@ -19270,6 +20458,8 @@ Te Te Te Te +"} +(86,1,1) = {" Te Te Te @@ -19287,6 +20477,19 @@ Te Te Te Te +HK +fF +AB +UJ +UJ +UJ +qe +qe +UJ +UJ +AB +fF +HK Te Te Te @@ -19348,8 +20551,6 @@ Te Te Te Te -"} -(90,1,1) = {" Te Te Te @@ -19451,6 +20652,8 @@ Te Te Te Te +"} +(87,1,1) = {" Te Te Te @@ -19468,6 +20671,19 @@ Te Te Te Te +HK +AB +AB +Ob +Ob +Ob +Ob +Ob +Ob +Ob +AB +AB +HK Te Te Te @@ -19542,8 +20758,6 @@ Te Te Te Te -"} -(91,1,1) = {" Te Te Te @@ -19632,6 +20846,8 @@ Te Te Te Te +"} +(88,1,1) = {" Te Te Te @@ -19649,6 +20865,19 @@ Te Te Te Te +HK +fE +rp +Ob +Ob +Ob +Ob +Ob +Ob +Ob +Ob +UJ +HK Te Te Te @@ -19736,8 +20965,6 @@ Te Te Te Te -"} -(92,1,1) = {" Te Te Te @@ -19813,6 +21040,8 @@ Te Te Te Te +"} +(89,1,1) = {" Te Te Te @@ -19830,6 +21059,19 @@ Te Te Te Te +HK +za +rp +Ob +Ob +Ob +Ob +Ob +Ob +Ob +Ob +UJ +HK Te Te Te @@ -19930,8 +21172,6 @@ Te Te Te Te -"} -(93,1,1) = {" Te Te Te @@ -19994,6 +21234,8 @@ Te Te Te Te +"} +(90,1,1) = {" Te Te Te @@ -20011,6 +21253,19 @@ Te Te Te Te +HK +fE +rp +Ob +Ob +Ob +Ob +Ob +Ob +Ob +Ob +UJ +HK Te Te Te @@ -20124,8 +21379,6 @@ Te Te Te Te -"} -(94,1,1) = {" Te Te Te @@ -20175,6 +21428,8 @@ Te Te Te Te +"} +(91,1,1) = {" Te Te Te @@ -20192,6 +21447,19 @@ Te Te Te Te +HK +AB +AB +Ob +Ob +LY +Ob +Ob +Ob +Ob +AB +AB +HK Te Te Te @@ -20318,8 +21586,6 @@ Te Te Te Te -"} -(95,1,1) = {" Te Te Te @@ -20356,6 +21622,8 @@ Te Te Te Te +"} +(92,1,1) = {" Te Te Te @@ -20373,6 +21641,19 @@ Te Te Te Te +HK +fF +AB +UJ +UJ +UJ +UJ +UJ +UJ +UJ +AB +fF +HK Te Te Te @@ -20512,8 +21793,6 @@ Te Te Te Te -"} -(96,1,1) = {" Te Te Te @@ -20537,6 +21816,8 @@ Te Te Te Te +"} +(93,1,1) = {" Te Te Te @@ -20554,6 +21835,19 @@ Te Te Te Te +HK +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +HK Te Te Te @@ -20706,8 +22000,6 @@ Te Te Te Te -"} -(97,1,1) = {" Te Te Te @@ -20718,6 +22010,8 @@ Te Te Te Te +"} +(94,1,1) = {" Te Te Te @@ -20735,6 +22029,7 @@ Te Te Te Te +HK Te Te Te @@ -20746,6 +22041,7 @@ Te Te Te Te +HK Te Te Te @@ -20900,8 +22196,6 @@ Te Te Te Te -"} -(98,1,1) = {" Te Te Te @@ -20910,6 +22204,8 @@ Te Te Te Te +"} +(95,1,1) = {" Te Te Te @@ -20927,6 +22223,7 @@ Te Te Te Te +HK Te Te Te @@ -20938,6 +22235,7 @@ Te Te Te Te +HK Te Te Te @@ -21094,14 +22392,14 @@ Te Te Te Te -"} -(99,1,1) = {" Te Te Te Te Te Te +"} +(96,1,1) = {" Te Te Te @@ -21119,6 +22417,7 @@ Te Te Te Te +HK Te Te Te @@ -21130,6 +22429,7 @@ Te Te Te Te +HK Te Te Te @@ -21288,12 +22588,12 @@ Te Te Te Te -"} -(100,1,1) = {" Te Te Te Te +"} +(97,1,1) = {" Te Te Te @@ -21311,6 +22611,7 @@ Te Te Te Te +HK Te Te Te @@ -21322,6 +22623,7 @@ Te Te Te Te +HK Te Te Te @@ -21482,10 +22784,10 @@ Te Te Te Te -"} -(101,1,1) = {" Te Te +"} +(98,1,1) = {" Te Te Te @@ -21503,6 +22805,7 @@ Te Te Te Te +HK Te Te Te @@ -21514,6 +22817,7 @@ Te Te Te Te +HK Te Te Te @@ -21677,9 +22981,7 @@ Te Te Te "} -(102,1,1) = {" -Te -Te +(99,1,1) = {" Te Te Te @@ -21697,6 +22999,7 @@ Te Te Te Te +HK Te Te Te @@ -21708,6 +23011,7 @@ Te Te Te Te +HK Te Te Te @@ -21871,11 +23175,7 @@ Te Te Te "} -(103,1,1) = {" -Te -Te -Te -Te +(100,1,1) = {" Te Te Te @@ -21893,6 +23193,7 @@ Te Te Te Te +HK Te Te Te @@ -21904,6 +23205,7 @@ Te Te Te Te +HK Te Te Te @@ -21972,6 +23274,39 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22033,6 +23368,8 @@ Te Te Te Te +"} +(101,1,1) = {" Te Te Te @@ -22050,6 +23387,19 @@ Te Te Te Te +HK +HK +HK +HK +HK +HK +HK +HK +HK +HK +HK +HK +HK Te Te Te @@ -22064,8 +23414,6 @@ Te Te Te Te -"} -(104,1,1) = {" Te Te Te @@ -22115,6 +23463,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22176,6 +23562,8 @@ Te Te Te Te +"} +(102,1,1) = {" Te Te Te @@ -22258,8 +23646,6 @@ Te Te Te Te -"} -(105,1,1) = {" Te Te Te @@ -22271,6 +23657,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22332,6 +23756,8 @@ Te Te Te Te +"} +(103,1,1) = {" Te Te Te @@ -22425,6 +23851,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22452,8 +23916,6 @@ Te Te Te Te -"} -(106,1,1) = {" Te Te Te @@ -22488,6 +23950,8 @@ Te Te Te Te +"} +(104,1,1) = {" Te Te Te @@ -22581,6 +24045,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22642,12 +24144,12 @@ Te Te Te Te +"} +(105,1,1) = {" Te Te Te Te -"} -(107,1,1) = {" Te Te Te @@ -22737,6 +24239,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22798,6 +24338,8 @@ Te Te Te Te +"} +(106,1,1) = {" Te Te Te @@ -22840,8 +24382,6 @@ Te Te Te Te -"} -(108,1,1) = {" Te Te Te @@ -22893,6 +24433,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22954,6 +24532,8 @@ Te Te Te Te +"} +(107,1,1) = {" Te Te Te @@ -23034,8 +24614,6 @@ Te Te Te Te -"} -(109,1,1) = {" Te Te Te @@ -23049,6 +24627,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23110,6 +24726,8 @@ Te Te Te Te +"} +(108,1,1) = {" Te Te Te @@ -23203,6 +24821,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23228,8 +24884,6 @@ Te Te Te Te -"} -(110,1,1) = {" Te Te Te @@ -23266,6 +24920,8 @@ Te Te Te Te +"} +(109,1,1) = {" Te Te Te @@ -23359,6 +25015,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23420,10 +25114,10 @@ Te Te Te Te +"} +(110,1,1) = {" Te Te -"} -(111,1,1) = {" Te Te Te @@ -23515,6 +25209,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23576,6 +25308,8 @@ Te Te Te Te +"} +(111,1,1) = {" Te Te Te @@ -23616,8 +25350,6 @@ Te Te Te Te -"} -(112,1,1) = {" Te Te Te @@ -23671,6 +25403,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23732,6 +25502,8 @@ Te Te Te Te +"} +(112,1,1) = {" Te Te Te @@ -23810,8 +25582,6 @@ Te Te Te Te -"} -(113,1,1) = {" Te Te Te @@ -23827,6 +25597,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23888,6 +25696,8 @@ Te Te Te Te +"} +(113,1,1) = {" Te Te Te @@ -23981,6 +25791,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24004,8 +25852,6 @@ Te Te Te Te -"} -(114,1,1) = {" Te Te Te @@ -24044,6 +25890,8 @@ Te Te Te Te +"} +(114,1,1) = {" Te Te Te @@ -24137,6 +25985,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24293,44 +26179,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24487,44 +26373,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24681,44 +26567,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24875,44 +26761,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25069,44 +26955,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25263,44 +27149,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25392,72 +27278,34 @@ yM Ee nV bR -nV -bR -aA -Ks -tl -Oy -aI -aI -aI -Nk -xi -kj -Nk -aI -aI -aI -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +nV +bR +aA +Ks +tl +Oy +aI +aI +aI +Nk +xi +kj +Nk +aI +aI +aI +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy Te Te Te @@ -25495,6 +27343,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25651,44 +27537,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25845,44 +27731,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26039,44 +27925,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26233,44 +28119,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26427,44 +28313,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26621,44 +28507,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26815,44 +28701,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27009,44 +28895,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Uf +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27203,44 +29089,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27397,44 +29283,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27591,44 +29477,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27720,72 +29606,34 @@ pf iR pf iR -SQ -iR -Jn -iR -XI -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +SQ +iR +Jn +iR +XI +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy Te Te Te @@ -27823,6 +29671,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27979,44 +29865,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28173,44 +30059,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28367,44 +30253,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28561,44 +30447,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28755,44 +30641,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28949,44 +30835,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29143,44 +31029,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +uc +uc +uc +uc +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29337,44 +31223,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29531,44 +31417,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29725,44 +31611,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29919,44 +31805,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30048,72 +31934,34 @@ Kd Kd bh yH -yH -ip -YC -YC -YC -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +yH +ip +YC +YC +YC +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy Te Te Te @@ -30151,6 +31999,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30307,44 +32193,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30501,44 +32387,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30695,44 +32581,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30889,44 +32775,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -31083,44 +32969,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -31277,44 +33163,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te diff --git a/maps/euthenia/shuttle_stub.dm b/maps/euthenia/shuttle_stub.dm new file mode 100644 index 0000000000..e13be1c60f --- /dev/null +++ b/maps/euthenia/shuttle_stub.dm @@ -0,0 +1,10 @@ +/datum/shuttle/autodock/ferry/emergency/escape/tether + name = "Escape" + location = FERRY_LOCATION_OFFSITE + shuttle_area = /area/shuttle/escape + warmup_time = 10 + landmark_offsite = "escape_cc" + landmark_station = "escape_station" + landmark_transition = "escape_transit" + move_time = SHUTTLE_TRANSIT_DURATION_RETURN + move_direction = WEST diff --git a/maps/generic/turbolifts.dm b/maps/generic/turbolifts.dm index c4bfdc2a9f..73fd8510eb 100644 --- a/maps/generic/turbolifts.dm +++ b/maps/generic/turbolifts.dm @@ -94,9 +94,55 @@ /area/turbolift/t_station/level2 ) +/obj/turbolift_map_holder/tether/two + dir = WEST + areas_to_use = list( + /area/turbolift/t_surface/elevator_two/level1, + /area/turbolift/t_surface/elevator_two/level2, + /area/turbolift/t_surface/elevator_two/level3, + /area/turbolift/tether/elevator_two/transit, + /area/turbolift/t_station/elevator_two/level1, + /area/turbolift/t_station/elevator_two/level2 + ) +/**Euthenia Lifts + */ +/obj/turbolift_map_holder/euthenia_medical + name = "Medical Elevator" + dir = NORTH + depth = 4 + lift_size_x = 2 + lift_size_y = 2 + icon = 'icons/obj/turbolift_preview_3x3.dmi' + wall_type = null // Don't make walls + floor_type = /turf/simulated/floor/glass/reinforced + areas_to_use = list( + /area/turbolift/medical/EutheniaDeck0, + /area/turbolift/medical/EutheniaDeck1, + /area/turbolift/medical/EutheniaDeck2, + /area/turbolift/medical/EutheniaDeck3 + ) + + +/obj/turbolift_map_holder/euthenia_cargo + name = "Cargo Elevator" + dir = SOUTH + depth = 5 + lift_size_x = 3 + lift_size_y = 2 + icon = 'icons/obj/turbolift_preview_3x3.dmi' + wall_type = null // Don't make walls + floor_type = /turf/simulated/floor/tiled/techfloor/monogrid + areas_to_use = list( + /area/turbolift/cargo/EutheniaDeck0, + /area/turbolift/cargo/EutheniaDeck1, + /area/turbolift/cargo/EutheniaDeck2, + /area/turbolift/cargo/EutheniaDeck3, + /area/turbolift/cargo/EutheniaDeck4 + ) +// I love finding these kevvy /* SHUT UP /datum/turbolift music = list('sound/music/elevator1.ogg', 'sound/music/elevator2.ogg') // Woo elevator music! diff --git a/maps/map_levels/140x140/fueldepot.dmm b/maps/map_levels/140x140/fueldepot.dmm index 9afa68ae9d..b4923e8bb1 100644 --- a/maps/map_levels/140x140/fueldepot.dmm +++ b/maps/map_levels/140x140/fueldepot.dmm @@ -297,8 +297,7 @@ dir = 6 }, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /turf/simulated/floor/airless, diff --git a/maps/map_levels/140x140/lavaland_dungeon.dmm b/maps/map_levels/140x140/lavaland_dungeon.dmm index 18ce1ba21c..b883bd7697 100644 --- a/maps/map_levels/140x140/lavaland_dungeon.dmm +++ b/maps/map_levels/140x140/lavaland_dungeon.dmm @@ -968,10 +968,7 @@ /turf/simulated/floor/tiled/steel_dirty/lavaland, /area/lavaland/dungeon/facility) "Sk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "1-8" }, diff --git a/maps/map_levels/140x140/talon/talon1.dmm b/maps/map_levels/140x140/talon/talon1.dmm index edaa06a6a1..cff249acb7 100644 --- a/maps/map_levels/140x140/talon/talon1.dmm +++ b/maps/map_levels/140x140/talon/talon1.dmm @@ -1,7 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -25 }, /obj/machinery/lathe/autolathe, @@ -242,10 +241,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) "ct" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/structure/handrail{ dir = 8 }, @@ -384,8 +380,7 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_port) "dx" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -412,9 +407,7 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/starboard_solar) "dO" = ( @@ -502,8 +495,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /turf/simulated/floor/tiled/eris/white/orangecorner, @@ -656,18 +648,14 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 29 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/dark/brown_perforated, /area/talon/deckone/starboard_eng) "ge" = ( /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -732,8 +720,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/steel, @@ -984,8 +971,7 @@ dir = 1; icon_state = "4-8" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/cable/green{ @@ -1319,10 +1305,7 @@ /turf/simulated/wall/rshull, /area/talon/maintenance/deckone_port) "lr" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 29 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/atmospherics/portables_connector{ dir = 8; @@ -1782,8 +1765,7 @@ /area/talon/deckone/brig) "pN" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24; req_access = list(301) }, @@ -2117,8 +2099,7 @@ name = "Talon Starboard SMES Connection"; name_tag = "TLN-SBD-SMES" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/dark/cyancorner, @@ -2521,8 +2502,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /turf/simulated/floor/plating, @@ -2577,8 +2557,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -2603,9 +2582,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /turf/simulated/floor/tiled/eris/steel/cargo, /area/talon/deckone/workroom) "wG" = ( @@ -2780,7 +2757,7 @@ pixel_x = 22 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "talon_port"; name = "interior access button"; @@ -2861,8 +2838,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -2901,8 +2877,7 @@ /turf/space, /area/space) "yl" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -29 }, /obj/machinery/atmospherics/portables_connector{ @@ -2952,8 +2927,7 @@ /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/starboard_solar) "yR" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/eris/dark/brown_platform, @@ -3358,10 +3332,7 @@ name = "Talon Port SMES Connection"; name_tag = "TLN-PRT-SMES" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/port_solar) "BU" = ( @@ -3532,11 +3503,7 @@ /turf/simulated/wall, /area/talon/deckone/bridge_hallway) "CR" = ( -/obj/machinery/firealarm/alarms_hidden{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/eris/steel, @@ -3545,7 +3512,7 @@ /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "talon_port"; name = "exterior access button"; @@ -3879,8 +3846,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -3934,8 +3900,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /turf/simulated/floor/tiled/eris/dark/orangecorner, @@ -4179,10 +4144,7 @@ /area/talon/deckone/armory) "Hp" = ( /obj/structure/closet/crate/solar, -/obj/machinery/firealarm/alarms_hidden{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/talon/deckone/starboard_eng_store) "Hr" = ( @@ -4364,8 +4326,7 @@ /area/talon/deckone/port_engine) "IU" = ( /obj/structure/catwalk, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/cable/green{ @@ -4409,8 +4370,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/disposalpipe/segment{ @@ -4524,13 +4484,11 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -25 }, /obj/machinery/recharger, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -4635,9 +4593,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "KW" = ( @@ -4673,8 +4629,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/deckone_starboard) "Ls" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/eris/white/orangecorner, @@ -4835,8 +4790,7 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/talon/deckone/brig) "Nf" = ( -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -5382,15 +5336,12 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/port_solar) "St" = ( /obj/structure/catwalk, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/cable/green{ @@ -5547,8 +5498,7 @@ /turf/simulated/floor/tiled/eris/white/danger, /area/talon/deckone/armory) "TG" = ( -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /obj/structure/cable/green, @@ -5607,8 +5557,7 @@ /turf/simulated/floor/tiled/eris/dark/brown_perforated, /area/talon/deckone/port_engine) "Up" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/dark/cyancorner, @@ -5772,8 +5721,7 @@ /obj/structure/mopbucket, /obj/item/mop, /obj/item/reagent_containers/glass/bucket, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /turf/simulated/floor/tiled/eris/dark/brown_platform, @@ -5802,8 +5750,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /turf/simulated/floor/tiled/eris/white/orangecorner, diff --git a/maps/map_levels/140x140/talon/talon2.dmm b/maps/map_levels/140x140/talon/talon2.dmm index e7ee7c96a3..dde478fa6f 100644 --- a/maps/map_levels/140x140/talon/talon2.dmm +++ b/maps/map_levels/140x140/talon/talon2.dmm @@ -9,14 +9,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2; - req_one_access = list(301) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Mess Hall" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/kitchen) "ax" = ( @@ -67,8 +66,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet, @@ -505,8 +503,7 @@ }, /obj/structure/table/standard, /obj/item/paper/talon_shields, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, @@ -685,8 +682,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, @@ -831,6 +827,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/bar) "ki" = ( @@ -1054,8 +1053,7 @@ "mw" = ( /obj/item/bedsheet, /obj/structure/bed/padded, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /obj/landmark/spawnpoint/job/talon_guard, @@ -1318,10 +1316,7 @@ "pp" = ( /obj/item/bedsheet, /obj/structure/bed/padded, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/landmark/spawnpoint/job/talon_engineer, /turf/simulated/floor/carpet, /area/talon/decktwo/eng_room) @@ -1360,8 +1355,7 @@ /turf/simulated/open, /area/talon/maintenance/decktwo_aft) "pC" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -30 }, /turf/simulated/floor/wood, @@ -1409,8 +1403,7 @@ /turf/simulated/wall, /area/talon/decktwo/med_room) "pW" = ( -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -1453,8 +1446,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /turf/simulated/floor/carpet, @@ -1535,8 +1527,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/decktwo/central_hallway) "rS" = ( -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -1716,8 +1707,7 @@ /obj/item/flashlight/glowstick, /obj/item/storage/box/metalfoam, /obj/item/survivalcapsule/luxury, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -1843,16 +1833,13 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet, /area/talon/decktwo/eng_room) "vP" = ( -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /obj/machinery/light_switch{ dir = 1; on = 0; @@ -1878,6 +1865,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/kitchen) "wQ" = ( @@ -2191,8 +2181,7 @@ /turf/simulated/floor/wood, /area/talon/decktwo/med_room) "zT" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -30 }, /turf/simulated/floor/wood, @@ -2308,8 +2297,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/cable/green{ @@ -2500,9 +2488,7 @@ /turf/simulated/open, /area/talon/maintenance/decktwo_starboard) "DF" = ( -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -2597,8 +2583,7 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/decktwo_solars) "Eb" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -30 }, /obj/machinery/light, @@ -2644,14 +2629,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2; - req_one_access = list(301) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Bar" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/bar) "Ew" = ( @@ -2815,8 +2799,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /turf/simulated/floor/carpet, @@ -2824,16 +2807,14 @@ "Gy" = ( /obj/item/bedsheet, /obj/structure/bed/padded, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /obj/landmark/spawnpoint/job/talon_pilot, /turf/simulated/floor/carpet, /area/talon/decktwo/pilot_room) "GA" = ( -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /obj/structure/cable/green{ @@ -3000,10 +2981,7 @@ "Ja" = ( /obj/item/bedsheet, /obj/structure/bed/padded, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/landmark/spawnpoint/job/talon_doctor, /turf/simulated/floor/carpet, /area/talon/decktwo/med_room) @@ -3254,8 +3232,7 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/decktwo_solars) "LU" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -30 }, /turf/simulated/floor/tiled/eris/steel, @@ -3890,8 +3867,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/decktwo_aft) "Tm" = ( -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /obj/structure/cable/green{ @@ -4473,8 +4449,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/decktwo_port) "ZE" = ( -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /obj/structure/cable/green{ diff --git a/maps/map_levels/192x192/fueldepot.dmm b/maps/map_levels/192x192/fueldepot.dmm index 5ae2be2cce..7397596b9c 100644 --- a/maps/map_levels/192x192/fueldepot.dmm +++ b/maps/map_levels/192x192/fueldepot.dmm @@ -414,8 +414,7 @@ dir = 6 }, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /turf/simulated/floor/airless, diff --git a/maps/minitest/levels/minitest.dmm b/maps/minitest/levels/minitest.dmm index dcf043c5dd..7243199041 100644 --- a/maps/minitest/levels/minitest.dmm +++ b/maps/minitest/levels/minitest.dmm @@ -22,12 +22,7 @@ /obj/machinery/camera/network/telecom{ c_tag = "Telecoms Main Computer Room" }, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "af" = ( @@ -74,8 +69,7 @@ }, /obj/item/radio/intercom{ name = "General Listening Channel"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) @@ -158,11 +152,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "ay" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -174,7 +164,6 @@ /area/space) "aA" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - icon_state = "map"; dir = 4 }, /turf/simulated/floor/plating, @@ -192,7 +181,6 @@ /area/tcommsat/computer) "aD" = ( /obj/machinery/atmospherics/component/unary/freezer{ - dir = 2; icon_state = "freezer_1"; set_temperature = 73; use_power = 1 @@ -252,7 +240,6 @@ frequency = 1381; id_tag = "server_access_airlock"; name = "Server Access Airlock"; - pixel_x = 0; pixel_y = 25; tag_airpump = "server_access_pump"; tag_chamber_sensor = "server_access_sensor"; @@ -421,14 +408,12 @@ "aX" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/plating, /area/engineering/engine_room) "aY" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - icon_state = "intact"; dir = 5 }, /obj/structure/cable{ @@ -495,12 +480,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; initial_gas_mix = "n2=100;TEMP=80" @@ -609,8 +589,7 @@ "bq" = ( /obj/machinery/air_alarm{ dir = 4; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -643,11 +622,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/engineering/engine_room) "bx" = ( @@ -781,8 +756,7 @@ /area/hallway/secondary/engineering_hallway) "bP" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/light{ icon_state = "tube1"; @@ -859,8 +833,7 @@ /area/tcommsat/chamber) "ca" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -875,8 +848,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/engineering_hallway) @@ -929,11 +901,7 @@ "cj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -32 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -948,7 +916,6 @@ }, /obj/machinery/air_alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -1289,8 +1256,7 @@ "dd" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/medical/medbay) @@ -1425,6 +1391,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/medical/medbay) "ds" = ( @@ -1498,8 +1467,7 @@ "dE" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -1514,11 +1482,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay) "dG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -1563,12 +1527,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/civilian_hallway_aft) "dL" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -1738,11 +1697,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay2) "ef" = ( -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /turf/simulated/floor/tiled, /area/medical/medbay2) @@ -1759,8 +1714,7 @@ "eh" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1891,8 +1845,7 @@ /area/medical/medbay) "eB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -1908,8 +1861,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -2029,11 +1981,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/bar) "eT" = ( -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -2056,8 +2004,7 @@ "eW" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2119,11 +2066,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/civilian_hallway_fore) "fe" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -2134,8 +2077,7 @@ "ff" = ( /obj/machinery/air_alarm{ dir = 4; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2144,7 +2086,6 @@ "fg" = ( /obj/machinery/air_alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2236,12 +2177,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "fq" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -2264,8 +2200,7 @@ /area/hallway/primary/fore) "fs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2380,8 +2315,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/primary/fore) @@ -2399,12 +2333,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) "fJ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -2464,8 +2393,7 @@ "fS" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) @@ -2578,21 +2506,11 @@ /turf/simulated/floor/tiled, /area/bridge) "gi" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/bridge) "gj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -2629,8 +2547,7 @@ "go" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/bridge) @@ -2653,8 +2570,7 @@ /area/bridge) "gs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2916,7 +2832,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ id_tag = "station_hangar"; layer = 3.1; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/tiled, @@ -3004,10 +2919,119 @@ /obj/landmark/spawnpoint/overflow/station, /turf/simulated/floor/tiled, /area/bridge) +"jV" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/techmaint, +/area/storage/surface_eva/external) +"ko" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "kU" = ( /obj/structure/shuttle, /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/overmapdemo) +"lm" = ( +/obj/machinery/light, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"lA" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Public External Airlock" + }, +/obj/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"lH" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/rift/surfaceeva/airlock/main) +"lQ" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"lX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"nY" = ( +/turf/space/basic, +/area/space) +"ok" = ( +/obj/machinery/embedded_controller/radio/airlock/phoron{ + dir = 8; + id_tag = "civ_airlock"; + pixel_x = 25; + pixel_y = -30 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/airlock_sensor/phoron{ + id_tag = "civ_airlock_sensor"; + pixel_x = 25; + pixel_y = -40 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"oO" = ( +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/space) +"pG" = ( +/turf/simulated/wall/prepainted, +/area/rift/surfaceeva/airlock/main) +"qb" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) "ql" = ( /obj/machinery/door/airlock/external{ frequency = 1379; @@ -3024,17 +3048,231 @@ }, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/overmapdemo) +"qN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"qR" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1379; + id_tag = "eva_port_pump" + }, +/obj/machinery/airlock_sensor{ + pixel_y = -28 + }, +/obj/machinery/camera/network/command, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) +"rJ" = ( +/obj/machinery/atmospherics/pipe/tank/air, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"sc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"si" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"sn" = ( +/turf/simulated/mineral, +/area/storage/surface_eva/external) +"sq" = ( +/obj/structure/railing, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"sv" = ( +/turf/unsimulated/mineral/virgo3b, +/area/space) "sA" = ( /obj/structure/shuttle/engine/heater, /turf/space, /turf/simulated/shuttle/plating/carry, /area/shuttle/multidemo) +"sQ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"tk" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"tU" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4"; + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"vl" = ( +/obj/machinery/access_button/airlock_exterior{ + master_tag = "civ_airlock"; + pixel_x = -8; + pixel_y = -25 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "civ_airlock_outer"; + locked = 1 + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/steel_grid, +/area/storage/surface_eva/external) +"vm" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "eva_port_airlock"; + pixel_y = 28 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) +"vo" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "civ_airlock_outer"; + locked = 1 + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/steel_grid, +/area/storage/surface_eva/external) "vP" = ( /obj/machinery/computer/ship/engines{ dir = 8 }, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/overmapdemo) +"ws" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"wN" = ( +/obj/machinery/access_button{ + command = "cycle_int"; + frequency = 1379; + master_tag = "eva_port_airlock"; + name = "interior access button"; + pixel_y = -10; + req_one_access = list(18) + }, +/turf/simulated/wall/prepainted/command, +/area/ai_monitored/storage/eva) +"wQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"xb" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/access_button{ + command = "cycle_ext"; + frequency = 1379; + master_tag = "eva_port_airlock"; + name = "exterior access button"; + pixel_x = 4; + pixel_y = -26; + req_access = list(18) + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"xP" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/bridge) +"yj" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"yy" = ( +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"yO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled, +/area/bridge) "zf" = ( /obj/effect/wingrille_spawn/reinforced, /turf/simulated/shuttle/floor/voidcraft/external/light, @@ -3047,22 +3285,185 @@ /obj/overmap/entity/visitable/ship/landable/overmapdemo, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/overmapdemo) +"Bg" = ( +/turf/simulated/wall, +/area/storage/surface_eva/external) +"BU" = ( +/obj/structure/railing, +/obj/machinery/embedded_controller/radio/airlock/phoron{ + dir = 8; + id_tag = "central_airlock"; + name = "Frost Lock Controller"; + pixel_x = 26; + pixel_y = -5 + }, +/obj/machinery/airlock_sensor/phoron{ + dir = 8; + id_tag = "central_airlock_sensor"; + name = "frostlock sensor"; + pixel_x = 24; + pixel_y = 6 + }, +/obj/structure/grille, +/obj/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"BW" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "civ_airlock_inner"; + locked = 1 + }, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/steel_grid, +/area/storage/surface_eva/external) +"BZ" = ( +/obj/structure/railing, +/obj/structure/grille, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "civ_airlock_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"Cu" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Public External Airlock" + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/machinery/access_button/airlock_interior{ + dir = 4; + master_tag = "central_airlock"; + pixel_x = 2; + pixel_y = -26 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"EK" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"FK" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"FZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/bridge) "Gz" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/overmapdemo) +"GK" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379; + id_tag = "central_airlock_pump" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/cable/green, +/obj/machinery/power/apc/west_mount, +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"GR" = ( +/turf/unsimulated/wall/planetary/lythios43c{ + desc = "Glacial permafrost, compacted harder than stone."; + icon_state = "icerock-dark" + }, +/area/space) +"Jn" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/storage/surface_eva/external) "JA" = ( /obj/overmap/entity/visitable/sector/citadel_minitest/station, /turf/space, /area/space) +"JD" = ( +/turf/simulated/wall, +/area/space) +"JJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"JZ" = ( +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/storage/surface_eva/external) "LJ" = ( /obj/machinery/computer/shuttle_control/web{ - dir = 2; my_doors = list("webdemo_docker_hatch"="Hatch"); name = "Web-Demo Console"; shuttle_tag = "Web-Demo" }, /turf/simulated/shuttle/floor, /area/shuttle/webdemo) +"Ms" = ( +/obj/machinery/atmospherics/component/binary/pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"MC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/tiled, +/area/medical/medbay) "ML" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ id_tag = "station_dock2"; @@ -3071,6 +3472,12 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"NX" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "Oc" = ( /obj/machinery/light, /obj/machinery/embedded_controller/radio/simple_docking_controller{ @@ -3092,35 +3499,268 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/engineering/engine_room) +"OX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/signnew/cryogenics{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"Pa" = ( +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) +"Pe" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379; + id_tag = "central_airlock_pump" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) "Pg" = ( /obj/structure/shuttle/engine/propulsion, /turf/space, /turf/simulated/shuttle/plating/carry, /area/shuttle/multidemo) +"Ps" = ( +/turf/simulated/wall/r_wall, +/area/storage/surface_eva/external) +"QI" = ( +/obj/machinery/atmospherics/pipe/tank{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"QT" = ( +/obj/machinery/atmospherics/pipe/tank, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Ro" = ( +/obj/machinery/air_alarm, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Rs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_external, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_y = -32 + }, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"Rw" = ( +/obj/structure/railing, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/grille, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "civ_airlock_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) "RZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass/engineering, /turf/simulated/floor/plating, /area/engineering/engine_room) +"Sd" = ( +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) +"St" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Sv" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Public External Airlock" + }, +/obj/machinery/door/blast/regular/open{ + id = "main_ext_blast"; + name = "Surface External Blast Door" + }, +/obj/map_helper/airlock/door/ext_door, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) "SN" = ( /obj/machinery/door/airlock/external{ frequency = 1379; icon_state = "door_locked"; - id_tag = "station_dock2_hatch"; + id_tag = "station_dock2_hatch"; + locked = 1 + }, +/turf/simulated/floor/tiled, +/area/bridge) +"Tq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"Tv" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Public External Airlock" + }, +/obj/machinery/door/blast/regular/open{ + id = "main_ext_blast"; + name = "Surface External Blast Door" + }, +/obj/map_helper/airlock/door/ext_door, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/machinery/access_button/airlock_exterior{ + dir = 8; + master_tag = "central_airlock"; + pixel_x = -2; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"TK" = ( +/obj/machinery/atmospherics/component/binary/pump/on, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"TX" = ( +/obj/machinery/atmospherics/pipe/tank/air, +/turf/simulated/floor/tiled, +/area/bridge) +"Ud" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/sign/fire{ + pixel_y = -32 + }, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/techmaint, +/area/storage/surface_eva/external) +"Uh" = ( +/obj/machinery/computer/ship/sensors{ + dir = 1 + }, +/turf/simulated/shuttle/floor/voidcraft/light, +/area/shuttle/overmapdemo) +"UY" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Cafe"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Vk" = ( +/turf/simulated/wall/prepainted/command, +/area/ai_monitored/storage/eva) +"VE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Cafe"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Ws" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"WT" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "civ_airlock_inner"; locked = 1 }, +/obj/machinery/access_button/airlock_interior{ + master_tag = "civ_airlock"; + pixel_x = 8; + pixel_y = 25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/storage/surface_eva/external) +"WX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/bridge) -"Uh" = ( -/obj/machinery/computer/ship/sensors{ - dir = 1 +/area/medical/medbay) +"Xq" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/shuttle/floor/voidcraft/light, -/area/shuttle/overmapdemo) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "XZ" = ( /obj/machinery/computer/ship/helm, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/overmapdemo) +"Yn" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) (1,1,1) = {" aa @@ -3610,9 +4250,9 @@ aa aa aa aa -aa -aa -aa +nY +nY +nY aa aa aa @@ -3712,9 +4352,9 @@ aa aa aa aa -aa -aa -aa +nY +nY +nY aa aa aa @@ -3814,9 +4454,9 @@ aa aa aa aa -aa -aa -aa +nY +nY +nY aa aa aa @@ -3916,9 +4556,9 @@ aa aa aa aa -aa -aa -aa +nY +nY +nY aa aa aa @@ -4017,10 +4657,10 @@ aa aa aa aa -aa -aa -aa -aa +Vk +xb +Vk +nY aa aa aa @@ -4116,13 +4756,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +Vk +qR +Vk +nY aa aa aa @@ -4221,9 +4861,9 @@ aa aa aa aa -aa -aa -aa +Vk +vm +Vk aa aa aa @@ -4323,9 +4963,9 @@ aa fX ge ge -ge -ge -ge +wN +Rs +Vk ge ge ge @@ -4423,10 +5063,10 @@ aa aa aa fY -gf -go -gf -gf +TX +xP +FZ +yO go gf gf @@ -5521,12 +6161,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +JD +JD +JD +JD +JD +JD aa aa aa @@ -5616,19 +6256,19 @@ aa aa aa aa +JD +JD +JD +JD +JD +JD aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +JD +GR +GR +GR +GR +JD aa aa aa @@ -5718,19 +6358,19 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +JD +sv +sv +sv +sv +JD +nY +JD +oO +oO +oO +oO +JD aa aa aa @@ -5819,20 +6459,20 @@ aP aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +nY +JD +Yn +Pa +Pa +Sd +sn +lH +lH +lH +Sv +Tv +lH +JD aa aa aa @@ -5921,20 +6561,20 @@ aP aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bg +Bg +Bg +vo +vl +Bg +Ps +lH +yy +sq +EK +tU +GK +JD aa aa aa @@ -6023,20 +6663,20 @@ aP aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bg +JZ +BZ +yj +FK +Ud +Ps +lH +OX +sq +lX +qb +ws +JD aa aa aa @@ -6125,20 +6765,20 @@ aP aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bg +Jn +Rw +Tq +ok +jV +Ps +lH +yy +BU +tk +sQ +Pe +JD aa aa gZ @@ -6227,20 +6867,20 @@ aP aa cE cL -cL -cL -cL -cL -cL -cL -cL -cL -cL -cL -cL -cL -cS -aa +Bg +Bg +Bg +WT +BW +Bg +Ps +lH +pG +pG +lA +Cu +pG +JD aa aa aa @@ -6330,17 +6970,17 @@ aa cF cM cM -cM -dd -cM -cM -cM -cM -cM -cM +du dd -cM -cM +ko +sc +si +NX +du +rJ +lQ +sc +JJ cF aa aa @@ -6432,17 +7072,17 @@ aa cF cM cM +du +Ro +qN cM +St cM +du +Ro +St cM -cM -cM -cM -cM -cM -cM -cM -cM +qN cF aa aa @@ -6534,17 +7174,17 @@ aa cF cN cM -cM -cM -cM -cM -cM -cM du cM -cM -cM -cM +WX +MC +TK +QI +du +QT +Ms +MC +Xq cF aa aa @@ -6636,17 +7276,17 @@ aa cF cM cM -cM -cM -cM -cM -cM -cM +du +du +el +UY +du +du +du +du du cM -cM -cM -cM +VE cF aa aa @@ -6740,7 +7380,7 @@ cM cM cM cM -cM +el cM cM cM @@ -6748,7 +7388,7 @@ du cM cM cM -eC +lm cI eM eM @@ -6850,7 +7490,7 @@ du cM cM ez -cO +wQ eF eN eN @@ -6952,7 +7592,7 @@ ek cP cP df -cP +Ws eG eO eO @@ -7481,12 +8121,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa @@ -7583,12 +8223,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa @@ -7685,12 +8325,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa @@ -7787,12 +8427,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa @@ -7889,12 +8529,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa diff --git a/maps/minitest/levels/sector1.dmm b/maps/minitest/levels/sector1.dmm index 0b007721c3..17b7fa4cd6 100644 --- a/maps/minitest/levels/sector1.dmm +++ b/maps/minitest/levels/sector1.dmm @@ -128,11 +128,7 @@ "av" = ( /obj/item/storage/toolbox/electrical, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -507,7 +503,7 @@ icon_state = "intact" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1375; master_tag = "carp_airlock"; name = "interior access button"; @@ -678,7 +674,7 @@ /area/awaymission) "ca" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1375; master_tag = "carp_airlock"; name = "exterior access button"; diff --git a/maps/rift/levels/rift-01-underground3.dmm b/maps/rift/levels/rift-01-underground3.dmm index c486064ee9..a67d016326 100644 --- a/maps/rift/levels/rift-01-underground3.dmm +++ b/maps/rift/levels/rift-01-underground3.dmm @@ -246,6 +246,7 @@ "oE" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/quartermaster/mining_airlock) "oQ" = ( @@ -652,11 +653,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -833,9 +830,9 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(31) }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/quartermaster/mining_airlock) "ZA" = ( diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm index 9cd0d53d68..d86851608d 100644 --- a/maps/rift/levels/rift-02-underground2.dmm +++ b/maps/rift/levels/rift-02-underground2.dmm @@ -288,11 +288,7 @@ /obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/engineering/workshop) "aT" = ( @@ -322,8 +318,7 @@ /area/maintenance/lower/atmos) "aX" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -358,10 +353,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -1049,9 +1041,7 @@ /area/engineering/engine_room) "dD" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -1164,7 +1154,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "dY" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1196,8 +1186,7 @@ /area/rift/station/stairs_one) "ee" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -1260,11 +1249,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "ek" = ( @@ -1508,7 +1493,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -1574,10 +1558,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) "eX" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -1859,11 +1840,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/door/firedoor/glass{ dir = 8 }, @@ -1979,7 +1956,7 @@ /area/engineering/break_room) "gq" = ( /obj/machinery/door/airlock/multi_tile/glass, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monofloor{ dir = 8 }, @@ -2017,8 +1994,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -2306,11 +2282,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -2362,9 +2335,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "hz" = ( @@ -2408,11 +2379,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/door/firedoor/glass{ dir = 1 }, @@ -2439,7 +2406,6 @@ }, /obj/machinery/button/windowtint{ id = "ce_office"; - layer = 3.3; pixel_x = 26; pixel_y = 9 }, @@ -2465,10 +2431,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "hS" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -2583,7 +2546,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/effect/paint/sun, @@ -2615,7 +2577,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/structure/catwalk, @@ -2664,11 +2625,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "iD" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -2784,9 +2741,7 @@ /area/crew_quarters/public_bunker) "iZ" = ( /obj/structure/closet/secure_closet/atmos_personal, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/locker_room) "jc" = ( @@ -3058,8 +3013,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ name = "north bump"; pixel_y = 24 }, @@ -3078,9 +3032,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -3095,6 +3047,15 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) +"jL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "jM" = ( /obj/machinery/cryopod/robot, /turf/simulated/floor/tiled/techfloor, @@ -3259,10 +3220,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) "jX" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -3379,10 +3337,12 @@ name = "General Storage"; req_one_access = list(47) }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) "kq" = ( @@ -3484,8 +3444,7 @@ /turf/simulated/floor/tiled/steel, /area/engineering/locker_room) "kF" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/techfloor{ @@ -3840,7 +3799,7 @@ /turf/simulated/mineral/icerock/lythios43c, /area/engineering/engine_room) "lT" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3961,10 +3920,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -3988,7 +3944,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/machinery/button/remote/blast_door{ @@ -4063,10 +4018,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/power/apc/high{ - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/high, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4475,14 +4427,8 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4820,11 +4766,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/structure/catwalk, /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) @@ -4864,9 +4806,7 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/cryo) "oy" = ( @@ -5186,10 +5126,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, @@ -5681,10 +5618,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) "rd" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "0-2" @@ -5698,11 +5632,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/atmos) "rg" = ( @@ -5825,7 +5755,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5961,10 +5891,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "rX" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/power/sensor{ name = "Powernet Sensor - Master Grid"; name_tag = "Master" @@ -5972,6 +5899,10 @@ /obj/structure/cable, /turf/simulated/floor, /area/engineering/engine_smes) +"rZ" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel, +/area/quartermaster/miningdock) "sa" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/borderfloor/corner2{ @@ -6254,9 +6185,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_room) "tf" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -6872,11 +6801,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "vL" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -7020,8 +6946,7 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) "wn" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -7120,6 +7045,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "wG" = ( @@ -7194,11 +7122,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -7385,8 +7309,8 @@ "xs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/glass, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) "xt" = ( @@ -7461,11 +7385,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "xF" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7511,12 +7431,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ id_tag = "chapel_crematorium"; name = "Funeral Services"; req_one_access = list(27) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/chapel/main) "xK" = ( @@ -7536,6 +7456,7 @@ /turf/simulated/floor/wood, /area/chapel/observation) "xM" = ( +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monofloor{ dir = 4 }, @@ -7741,9 +7662,7 @@ /area/rift/surfacebase/underground/under2) "yJ" = ( /obj/machinery/power/emitter, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/engineering/storage) "yL" = ( @@ -7974,6 +7893,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) +"zE" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/hallway) "zG" = ( /turf/simulated/floor/tiled/monotile, /area/engineering/engine_room) @@ -8079,11 +8005,7 @@ /area/engineering/atmos/hallway) "Ah" = ( /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/cyan{ icon_state = "0-2" @@ -8218,10 +8140,7 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/miningdock) "AO" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8439,7 +8358,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-2" @@ -8875,11 +8794,7 @@ /turf/simulated/floor/carpet, /area/engineering/break_room) "Dh" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8952,9 +8867,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/bed/padded, /obj/item/bedsheet, /turf/simulated/floor/tiled/techfloor, @@ -9002,9 +8915,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "Dv" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/engine, /turf/simulated/floor, /area/engineering/engine_room) @@ -9014,8 +8925,7 @@ pixel_y = 5 }, /obj/item/storage/toolbox/electrical, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -9104,6 +9014,13 @@ /obj/machinery/washing_machine, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_waste) +"DT" = ( +/obj/structure/catwalk, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/storage) "DV" = ( /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -9271,10 +9188,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "EJ" = ( @@ -9339,11 +9253,7 @@ /turf/simulated/wall/prepainted, /area/quartermaster/miningdock) "ER" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9643,6 +9553,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/miningdock) +"Gn" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/break_room) "Gp" = ( /obj/machinery/light, /turf/simulated/floor/wood, @@ -9877,11 +9791,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -9965,10 +9876,13 @@ "Hp" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/engine_eva) +"Hq" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/foyer) "Hr" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -10043,10 +9957,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -10272,7 +10183,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/break_room) "IE" = ( @@ -10341,11 +10252,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "IR" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10460,11 +10367,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/chapel) "Jt" = ( @@ -10509,7 +10412,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(11,24) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/foyer) "JC" = ( @@ -10618,9 +10521,7 @@ /turf/simulated/floor/plating, /area/quartermaster/miningdock) "JY" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -10825,11 +10726,8 @@ /turf/simulated/floor, /area/engineering/engine_room) "KP" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -11118,11 +11016,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -11141,10 +11035,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/miningdock) "LP" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -26 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -11181,8 +11072,7 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under2) "LV" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor, @@ -11361,8 +11251,7 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/lino, @@ -11429,10 +11318,12 @@ dir = 4; name = "Radiation Prep - Cleanup" }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) "MR" = ( @@ -11472,6 +11363,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) "MX" = ( @@ -11693,10 +11587,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/chapel/observation) "NJ" = ( @@ -11839,11 +11730,7 @@ "Of" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/engineering/storage) @@ -11874,11 +11761,7 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) "Ol" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11902,9 +11785,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "Or" = ( @@ -11962,9 +11843,7 @@ /area/engineering/storage) "Oy" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/locker_room) @@ -11975,11 +11854,7 @@ /obj/machinery/computer/security/engineering{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12052,10 +11927,7 @@ /area/quartermaster/belterdock/refinery) "OP" = ( /obj/landmark/spawnpoint/job/station_engineer, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12095,11 +11967,10 @@ /obj/machinery/door/airlock/multi_tile/metal{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 - }, /obj/structure/catwalk, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/storage) "OX" = ( @@ -12399,11 +12270,7 @@ }, /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12453,7 +12320,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/metal, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/storage) "Qz" = ( @@ -12468,11 +12335,7 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "QC" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12833,6 +12696,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/lower) +"Sd" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/engineering/storage) "Se" = ( /turf/simulated/wall/prepainted/civilian, /area/chapel/office) @@ -12872,10 +12741,7 @@ /area/chapel/chapel_morgue) "Sm" = ( /obj/landmark/spawnpoint/job/shaft_miner, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12936,9 +12802,7 @@ /area/engineering/engine_room) "Sw" = ( /obj/structure/bed/chair/bay/chair/padded/yellow, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/engineering/foyer) "Sy" = ( @@ -13498,7 +13362,7 @@ desc = "A large cabinet with drawers. They seem to be ominously empty."; name = "Classified Science Records" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13560,11 +13424,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "Uz" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "UC" = ( @@ -13688,7 +13548,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 4 }, /obj/machinery/light{ dir = 1 @@ -14026,11 +13886,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "Wg" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -14049,9 +13906,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -14070,11 +13925,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/engineering/workshop) "Wm" = ( @@ -14147,9 +13998,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/bed/padded, /obj/item/bedsheet, /turf/simulated/floor/tiled/techfloor, @@ -14363,8 +14212,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "Xm" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/recharge_station, @@ -14488,7 +14336,6 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/airlock_sensor/airlock_exterior{ id_tag = "eng_al_ext_snsr"; - layer = 3.3; master_tag = "engine_room_airlock"; pixel_x = -22; req_access = list(10) @@ -14522,6 +14369,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/atmos) +"Yf" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "Yj" = ( /obj/machinery/light{ dir = 4 @@ -14634,9 +14485,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "YG" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/engineering/engine_eva) @@ -14647,10 +14496,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14762,10 +14608,7 @@ /area/maintenance/lower/mining) "Zf" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, @@ -14915,7 +14758,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) @@ -14926,9 +14769,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/toilet, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) @@ -22680,17 +22521,17 @@ Ow gN bD DI -MH +jL kp DI Xy DI -MH +jL kp DI Xy Xy -MH +jL kp Xy Xy @@ -27680,7 +27521,7 @@ Yj zY zY zY -zY +Yf zY Vf EK @@ -28480,7 +28321,7 @@ zK sR UU Vu -Qd +Sd Qd BE BF @@ -28872,7 +28713,7 @@ KF KF KF KF -BF +DT OW KF KF @@ -29640,7 +29481,7 @@ OK Ak Ak wp -wp +Hq Pr WY ce @@ -31204,7 +31045,7 @@ YJ YJ MC wF -ce +zE Im Qp cX @@ -31386,7 +31227,7 @@ rU qW qW wp -wp +Hq Pr fB nD @@ -32554,7 +32395,7 @@ uP ul Pr zq -Tt +Gn lL Ib Ko @@ -34087,7 +33928,7 @@ TU CC CC CC -CC +rZ uW CC CC diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm index f10000d25c..c9d41673aa 100644 --- a/maps/rift/levels/rift-03-underground1.dmm +++ b/maps/rift/levels/rift-03-underground1.dmm @@ -141,10 +141,7 @@ /area/engineering/atmos) "aw" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/maintenance/public_bunker) "ax" = ( @@ -260,8 +257,7 @@ /area/maintenance/engineering/upper) "aM" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -277,10 +273,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) "aO" = ( @@ -484,11 +477,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "bp" = ( @@ -629,9 +618,7 @@ pixel_y = 24 }, /obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_two) "bG" = ( @@ -656,10 +643,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/sign/directions/cargo{ dir = 1; pixel_x = 32; @@ -682,8 +666,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/sign/directions/medical{ @@ -842,9 +825,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_two) "bW" = ( @@ -860,11 +841,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_two) "bY" = ( @@ -1075,10 +1052,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1212,10 +1186,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/upper) "cN" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -1328,7 +1299,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled/steel, @@ -1520,10 +1491,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -1665,7 +1633,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/structure/cable/green{ @@ -1753,7 +1721,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/station/protean_nanite_room) "dR" = ( @@ -1821,16 +1789,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) -"eb" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "ec" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2220,9 +2178,7 @@ }, /obj/item/folder/yellow, /obj/item/pen/red, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/item/pen/blue, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos/hallway) @@ -2241,11 +2197,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2270,9 +2222,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/item/storage/single_use/med_pouch/oxyloss, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos/hallway) @@ -2286,9 +2236,7 @@ }, /obj/item/packageWrap, /obj/item/hand_labeler, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/item/toy/figure/engineer{ pixel_x = -17 }, @@ -2487,9 +2435,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) @@ -2548,6 +2494,9 @@ name = "Hangar Lockdown Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "gz" = ( @@ -3216,10 +3165,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) "jg" = ( @@ -3315,8 +3261,7 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/steel, @@ -3395,8 +3340,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "jJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/concrete/rng/indoors, @@ -3502,8 +3446,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/segment, @@ -3901,9 +3844,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/atmos) "lF" = ( @@ -4320,8 +4261,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/industrial/warning, @@ -4597,8 +4537,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) "ok" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/kafel_full/blue, @@ -4811,9 +4750,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -5178,7 +5115,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -5292,9 +5229,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) @@ -5433,8 +5368,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/underground/under1) "rw" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -5479,11 +5413,7 @@ dir = 4 }, /obj/machinery/light/small, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) @@ -5880,11 +5810,8 @@ /area/engineering/atmos) "tm" = ( /obj/structure/grille, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under1) @@ -5892,10 +5819,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/railing{ dir = 1 }, @@ -6307,15 +6231,11 @@ }, /obj/structure/catwalk, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) "uQ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techmaint, @@ -6340,11 +6260,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "uV" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -6755,8 +6672,7 @@ /turf/simulated/floor/plating, /area/rift/surfacebase/underground/under1) "ws" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/concrete/rng/indoors, @@ -7220,9 +7136,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "xJ" = ( @@ -7292,7 +7206,7 @@ "xU" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -7377,11 +7291,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "yf" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7570,19 +7480,9 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage) -"yS" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos) "yT" = ( /turf/simulated/floor/plating, /area/rift/trade_shop) @@ -8268,11 +8168,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8357,10 +8253,10 @@ /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, /area/rift/surfacebase/underground/under1) "BS" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ name = "Ready Room" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "BT" = ( @@ -8533,7 +8429,9 @@ /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "CC" = ( -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -8634,11 +8532,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "CU" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -8651,11 +8545,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8747,7 +8637,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "Dq" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; name = "Fighter Hangar"; @@ -8760,6 +8649,9 @@ name = "Hangar Lockdown Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "Ds" = ( @@ -8973,11 +8865,7 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) "Ep" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9740,9 +9628,7 @@ dir = 8; pixel_x = 22 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) "GO" = ( @@ -9790,8 +9676,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/wood, @@ -9857,10 +9742,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/crystal, /area/rift/station/adherent_maintenance) "Hn" = ( @@ -10094,8 +9976,7 @@ /area/maintenance/engineering) "Ib" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -10535,11 +10416,7 @@ /area/maintenance/engineering/upper) "JC" = ( /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10818,11 +10695,7 @@ /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage) "KG" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11946,11 +11819,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/marker_beacon/red, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12689,11 +12558,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) "Rf" = ( @@ -12711,11 +12576,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/meter, /obj/structure/cable/green{ icon_state = "0-4" @@ -12753,12 +12614,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) -"Rn" = ( -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos) "Rp" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -13018,9 +12873,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "Sr" = ( @@ -13482,12 +13335,8 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/fire_alarm/north_mount, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "Uw" = ( @@ -13645,11 +13494,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "UZ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13798,8 +13643,7 @@ /obj/machinery/light/spot{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/computer/general_air_control/large_tank_control{ @@ -13879,9 +13723,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "VT" = ( @@ -14130,6 +13972,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "WH" = ( @@ -14183,10 +14026,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "WO" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -14516,11 +14356,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -28750,7 +28586,7 @@ ae ae cW CC -eb +XF XQ dI XQ @@ -32651,7 +32487,7 @@ kl ka Zx Zx -Rn +qT NU NU NU @@ -32845,7 +32681,7 @@ eT eT Zx Zx -yS +qT Zx Zx Zx diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 0359f3104c..cb325caa62 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -202,7 +202,7 @@ req_one_access = list(47,55) }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1382; master_tag = "xenobiology_airlock_control"; name = "Xenobiology Access Control"; @@ -690,8 +690,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -1131,10 +1130,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/virologyisolation) "aPZ" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -1586,7 +1582,7 @@ /area/maintenance/starboard) "bhT" = ( /obj/structure/railing, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1637,11 +1633,7 @@ }, /obj/item/inflatable/door, /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -1892,11 +1884,7 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "boW" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 }, @@ -2339,11 +2327,7 @@ /turf/simulated/floor/wood, /area/maintenance/maint_bar) "bEN" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2621,8 +2605,7 @@ /obj/structure/bed/chair/wood{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -3069,9 +3052,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/library) "cdH" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -3176,10 +3157,7 @@ /turf/simulated/floor/water/deep/indoors, /area/rift/station/public_garden) "cfP" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/tool_storage) "cgz" = ( @@ -3263,10 +3241,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3465,11 +3440,7 @@ /turf/simulated/floor/outdoors/snow/noblend/lythios43c, /area/rift/surfacebase/outside/outside1) "crk" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3771,10 +3742,7 @@ /turf/simulated/floor/wood, /area/rift/surfacebase/outside/outside1) "cAs" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -4008,10 +3976,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4233,10 +4198,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva) "cQP" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -4248,19 +4210,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "cRN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4507,13 +4462,6 @@ /obj/item/book/bundle/custom_library/religious, /turf/simulated/floor/wood, /area/library) -"das" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "daS" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -5278,8 +5226,7 @@ /turf/simulated/floor/plating, /area/maintenance/evahallway) "dxC" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -5355,9 +5302,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/door/firedoor/glass{ dir = 4 }, @@ -5718,11 +5663,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/security/lower) "dMB" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) @@ -5834,11 +5775,7 @@ "dPu" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/research/lower) @@ -6045,10 +5982,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6069,10 +6003,7 @@ "dVj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -6183,11 +6114,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) @@ -6352,11 +6279,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych) "ecn" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/security/brig/bathroom) @@ -6480,10 +6403,7 @@ /turf/simulated/floor/plating, /area/medical/virologypurge) "egb" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /obj/structure/catwalk, /obj/structure/cable{ @@ -6758,11 +6678,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) "eqw" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/radiation, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, @@ -6913,8 +6829,7 @@ /area/engineering/engine_eva) "evh" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -7168,11 +7083,8 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "eDQ" = ( -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /obj/structure/cable/green{ icon_state = "0-8" @@ -7424,9 +7336,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/lino, @@ -7630,11 +7540,7 @@ /area/maintenance/research/lower) "eXL" = ( /obj/machinery/washing_machine, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/medical_restroom) "eYJ" = ( @@ -7861,11 +7767,7 @@ "fhR" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -7934,10 +7836,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/maintenance/starboard) "flr" = ( @@ -8374,8 +8273,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -8501,11 +8399,7 @@ "fFt" = ( /obj/structure/table/standard, /obj/item/toy/plushie/purple_fox, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 28 @@ -8735,11 +8629,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/medbreak) "fNh" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner/purple{ dir = 5 }, @@ -8802,11 +8692,8 @@ "fOz" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -9491,9 +9378,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/medical/psych) "gri" = ( @@ -9509,9 +9394,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -9574,8 +9457,7 @@ /obj/structure/closet/medical_wall{ pixel_y = 35 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/storage/firstaid/regular, @@ -9728,11 +9610,7 @@ /area/medical/patient_a) "gxe" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -9820,10 +9698,7 @@ dir = 4 }, /obj/random/trash_pile, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/maintenance/library) "gCZ" = ( @@ -10358,8 +10233,7 @@ pixel_y = 11 }, /obj/item/storage/box/syringes, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -10474,11 +10348,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10582,8 +10452,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) "gXw" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/disposal, @@ -11352,11 +11221,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/virologyisolation) "hqo" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -11625,10 +11490,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/office) "hCl" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "4-8" @@ -11748,11 +11610,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12112,10 +11970,7 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "hPI" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/holopad, /turf/simulated/floor/wood, /area/lawoffice) @@ -12320,13 +12175,13 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rift/surfaceeva) "hWp" = ( @@ -12356,7 +12211,7 @@ req_one_access = list(47,55) }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1382; master_tag = "xenobiology_airlock_control"; name = "Xenobiology Access Control"; @@ -12386,11 +12241,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/scale, /obj/structure/cable/green{ icon_state = "0-8" @@ -12490,8 +12341,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -12520,10 +12370,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/rnd/testingroom) "iaF" = ( @@ -12969,9 +12816,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "iqR" = ( @@ -13620,11 +13465,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "iHL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor, /area/maintenance/substation/medical) "iHQ" = ( @@ -13918,9 +13759,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, @@ -13948,10 +13787,7 @@ /turf/simulated/floor/plating, /area/medical/virologytransitwest) "iSw" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -14183,10 +14019,7 @@ "jaY" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -14296,11 +14129,7 @@ /turf/simulated/floor/wood, /area/library) "jdT" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/door/blast/regular{ density = 0; dir = 8; @@ -14723,11 +14552,7 @@ /turf/simulated/floor/tiled/dark, /area/prison/solitary) "jsL" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/table/woodentable, /obj/item/storage/bag/plants, /obj/item/storage/bag/plants, @@ -15011,10 +14836,7 @@ /turf/simulated/floor/plating, /area/maintenance/research/xenobio) "jCm" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "0-8" @@ -15279,10 +15101,7 @@ /turf/simulated/floor/plating, /area/storage/tools) "jLP" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/railing{ dir = 8 }, @@ -15406,11 +15225,7 @@ }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/green/bordercorner2, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/medical/virologytransiteast) @@ -15570,11 +15385,7 @@ /obj/effect/floor_decal/industrial/danger{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -15602,11 +15413,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/crate/biohazard, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) @@ -15826,10 +15633,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/office) "kfI" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/crew_quarters/game_room) @@ -16204,8 +16008,7 @@ "koz" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -16568,11 +16371,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) @@ -16859,8 +16658,7 @@ /obj/item/multitool, /obj/item/clothing/gloves/fyellow, /obj/item/flashlight, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -17068,8 +16866,7 @@ /area/tether/surfacebase/entertainment) "kNL" = ( /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/lino, @@ -17222,11 +17019,7 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/table/glass, /obj/item/storage/box/beakers{ pixel_x = 4; @@ -17367,10 +17160,7 @@ pixel_x = 2; pixel_y = 2 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/quartermaster/qm) @@ -17530,11 +17320,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -17953,9 +17739,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /obj/machinery/light{ dir = 4 }, @@ -18074,10 +17858,7 @@ "lyg" = ( /obj/item/stool/padded, /obj/landmark/spawnpoint/job/entertainer, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -18216,11 +17997,7 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/light, /obj/structure/cable/green{ icon_state = "0-4" @@ -18265,10 +18042,7 @@ /obj/item/virusdish/random, /obj/item/virusdish/random, /obj/item/virusdish/random, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/medical/virology) "lGw" = ( @@ -18624,9 +18398,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) "lRL" = ( @@ -18714,11 +18486,7 @@ /area/quartermaster/hallway) "lWh" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -18980,11 +18748,7 @@ /obj/structure/bed/chair/wood{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -19019,10 +18783,7 @@ /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "mgI" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) @@ -19094,10 +18855,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -19148,11 +18906,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -19706,11 +19460,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -19987,7 +19737,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc/high/south_bump, +/obj/machinery/power/apc/high/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20098,8 +19848,7 @@ dir = 8; light_range = 12 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -20131,10 +19880,7 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "mNo" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "4-8" @@ -20182,10 +19928,7 @@ /turf/simulated/floor/plating, /area/maintenance/research/lower) "mPx" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) @@ -20255,11 +19998,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20404,10 +20143,7 @@ dir = 5 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20744,10 +20480,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20896,11 +20629,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych) "njW" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_north) "njZ" = ( @@ -21377,8 +21106,7 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "nye" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/holopad, @@ -21625,11 +21353,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/filingcabinet/chestdrawer{ name = "Medical Forms" }, @@ -21817,9 +21541,7 @@ /area/maintenance/maint_bar) "nLc" = ( /obj/structure/bed/chair, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -22103,9 +21825,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/machinery/door/firedoor/glass{ dir = 4 @@ -22374,11 +22094,7 @@ /area/rift/surfacebase/outside/outside1) "oal" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) @@ -22464,11 +22180,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -23054,10 +22766,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -23132,8 +22841,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/power/apc/super{ - dir = 4; +/obj/machinery/power/apc/super/east_mount{ name = "east bump"; pixel_x = 24 }, @@ -23380,8 +23088,7 @@ /turf/simulated/floor/tiled/steel, /area/security/security_cell_hallway) "oHy" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/segment{ @@ -23656,10 +23363,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/psych) @@ -23718,11 +23422,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -23944,7 +23644,7 @@ /area/medical/recoveryrestroom) "oYo" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -23982,10 +23682,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 8 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/catwalk, /obj/structure/cable/green, /turf/simulated/floor/plating, @@ -24385,7 +24082,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -24430,11 +24126,7 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "pjz" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25097,18 +24789,11 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/anomaly, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/xenoarch_storage) "pFz" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /mob/living/simple_mob/animal/passive/mimepet, /obj/structure/cable/green{ icon_state = "0-4" @@ -25159,8 +24844,7 @@ /area/rnd/outpost/xenobiology/outpost_main) "pHw" = ( /obj/structure/closet/crate/bin, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ @@ -25221,11 +24905,7 @@ name = "Station Intercom (General)"; pixel_x = -24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -25421,10 +25101,7 @@ pixel_y = -28 }, /obj/item/melee/baton/slime/loaded, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) @@ -25916,8 +25593,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -25931,8 +25607,7 @@ /area/rift/surfacebase/outside/outside1) "qiM" = ( /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -26213,8 +25888,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "qpF" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -26315,10 +25989,7 @@ }, /obj/structure/table/standard, /obj/item/paper_bin, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor/corner2{ dir = 10 }, @@ -26685,10 +26356,10 @@ name = "Cargo Garage"; req_one_access = list(31) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor/orange/corner{ dir = 8 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/garage) "qFN" = ( @@ -26744,10 +26415,7 @@ /obj/machinery/camera/network/security{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/security/security_cell_hallway) @@ -26851,9 +26519,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, @@ -26946,10 +26612,7 @@ /turf/simulated/floor/plating, /area/maintenance/evahallway) "qPI" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) @@ -27090,11 +26753,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) "qTT" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 }, @@ -27586,11 +27245,7 @@ /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "rld" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light{ dir = 4 }, @@ -27887,10 +27542,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -27920,11 +27572,7 @@ dir = 10 }, /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -28013,10 +27661,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -28365,7 +28010,7 @@ dir = 8 }, /obj/machinery/disposal, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -28390,11 +28035,7 @@ /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) "rIt" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/light, /obj/structure/cable/green, /obj/structure/dogbed{ @@ -28614,10 +28255,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/item/paper{ info = "Use of this facility is strictly limited to scientific endeavors only. Chemicals produced here are not covered for adverse affects and reactions like Chemistry."; name = "note from CentCom about the chemlab"; @@ -28850,7 +28488,7 @@ }, /obj/machinery/light, /obj/effect/floor_decal/steeldecal/steel_decals_central6, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/monotile, /area/security/forensics) @@ -29004,8 +28642,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/camera/network/research{ @@ -29152,10 +28789,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/space_heater, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, @@ -29182,10 +28816,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/security/forensics) "sjh" = ( @@ -29413,9 +29044,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/ladder{ pixel_y = 10 }, @@ -30153,7 +29782,7 @@ dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -30952,10 +30581,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/exam_room) "thE" = ( @@ -31004,8 +30630,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/paper_bin{ @@ -31179,8 +30804,7 @@ "tnt" = ( /obj/structure/table/standard, /obj/item/tape_recorder, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -31264,10 +30888,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/library) "toZ" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -31395,8 +31016,7 @@ /obj/machinery/portable_atmospherics/canister/nitrogen{ anchored = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -31812,8 +31432,7 @@ /area/maintenance/starboard) "tGL" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -32036,9 +31655,7 @@ /area/maintenance/cargo) "tMq" = ( /obj/structure/bed/chair, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -32182,7 +31799,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/main/secondary) @@ -32227,7 +31844,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -32491,10 +32108,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) "uaE" = ( @@ -32585,11 +32199,7 @@ dir = 8 }, /obj/random/soap, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) "ueA" = ( @@ -32840,9 +32450,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/security/security_cell_hallway) "ulQ" = ( @@ -33055,6 +32663,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rift/surfaceeva) "uqR" = ( @@ -33148,11 +32757,7 @@ /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/outside/outside1) "urH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -33429,15 +33034,8 @@ "uzb" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/east_mount, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -33560,8 +33158,7 @@ dir = 8 }, /obj/structure/disposalpipe/trunk, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/steel, @@ -33919,7 +33516,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -33960,7 +33557,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -34256,7 +33853,7 @@ tag_interior_door = "virology_airlock_interior" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -35594,8 +35191,7 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -35692,10 +35288,7 @@ /turf/simulated/floor/snow/gravsnow, /area/rift/surfacebase/outside/outside1) "wci" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/rift/trade_shop) @@ -35710,11 +35303,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/medical/virologyaccess) "wdf" = ( @@ -35780,11 +35369,7 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfaceone) "wdU" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_south) "wdY" = ( @@ -35848,11 +35433,7 @@ dir = 1; pixel_y = 24 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/wardrobe/science_white, /obj/structure/cable/green{ icon_state = "0-8" @@ -35884,8 +35465,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -36248,11 +35828,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -36635,11 +36211,7 @@ /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside1) "wDd" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -36711,8 +36283,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -36789,10 +36360,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) "wGO" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -26 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -36880,11 +36448,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -38113,6 +37677,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/garage) "xvW" = ( @@ -38158,7 +37723,7 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) "xwG" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/machinery/air_alarm{ dir = 4; pixel_x = -22 @@ -38285,10 +37850,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) @@ -38438,11 +38000,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -38725,14 +38283,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/evahallway) "xQG" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-8" @@ -39012,11 +38568,11 @@ /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, -/obj/machinery/door/firedoor/multi_tile, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/evahallway) "xZu" = ( @@ -39034,8 +38590,7 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "yaV" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorblack{ @@ -39079,8 +38634,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -39179,8 +38733,7 @@ /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "yhe" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -39201,11 +38754,7 @@ /area/rnd/xenoarch_storage) "yhG" = ( /obj/structure/flora/pottedplant/unusual, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/camera/network/research{ dir = 1 }, @@ -56423,7 +55972,7 @@ pZn iTF abL luv -das +izR erN vsb kwn diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index c48753db0a..f69df86ecd 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -152,7 +152,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/locker) "ahw" = ( -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -185,9 +185,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -225,29 +223,6 @@ /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled/steel, /area/crew_quarters/pool) -"amc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/catwalk, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter1"; - name = "Fighter Bay 1"; - pixel_x = -6; - pixel_y = 26 - }, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter2"; - name = "Fighter Bay 2"; - pixel_x = 5; - pixel_y = 26 - }, -/obj/structure/handrail, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "amf" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/cable/green{ @@ -479,10 +454,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "asp" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) "asG" = ( @@ -590,10 +562,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel, /area/crew_quarters/locker) "aww" = ( @@ -784,11 +753,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -806,10 +771,7 @@ "aBh" = ( /obj/structure/table/woodentable, /obj/effect/floor_decal/borderfloorblack/cee, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/item/clothing/accessory/permit/gun{ pixel_x = 5 }, @@ -891,11 +853,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1452,11 +1410,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -1807,7 +1761,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -2066,17 +2020,13 @@ "biH" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/security/briefing_room) "biL" = ( /obj/machinery/papershredder, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorblack{ @@ -2153,11 +2103,7 @@ alpha = 255; dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/camera/network/security{ dir = 8 }, @@ -2344,10 +2290,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/machinery/light, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -2476,15 +2419,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) -"buA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/security/hammerhead_bay) "buD" = ( /obj/structure/grille, /obj/structure/sign/warning/falling, @@ -2493,11 +2427,7 @@ "buN" = ( /obj/structure/table/steel, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/recharger{ pixel_x = -5; pixel_y = 3 @@ -2571,6 +2501,29 @@ }, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside2) +"byu" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hammerfighterport"; + name = "Port Fighter Bay"; + pixel_x = -3; + pixel_y = -30 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay"; + pixel_x = 5; + pixel_y = -30 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/cockpit) "byv" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -2754,11 +2707,7 @@ /area/rnd/research) "bEr" = ( /obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/sign/department/armory{ pixel_y = 32 }, @@ -2828,10 +2777,7 @@ /turf/simulated/floor/carpet, /area/security/warden) "bGI" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -2853,10 +2799,7 @@ name = "Powernet Sensor - Exterior Docking Pads Subgrid"; name_tag = "Exterior Docking Pads Subgrid" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-8" @@ -2930,13 +2873,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"bLw" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "bLy" = ( /obj/effect/floor_decal/borderfloorblack{ alpha = 255; @@ -3576,8 +3512,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacetwo) "cjg" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -3646,9 +3581,7 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "clA" = ( @@ -3720,8 +3653,7 @@ /turf/simulated/open, /area/rift/stairwell/primary/surfacetwo) "cnw" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/carpet/blue, @@ -4006,10 +3938,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/holoposter{ pixel_x = -32 }, @@ -4060,11 +3989,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/item/mirrortool, /obj/structure/table/standard, /obj/item/paper{ @@ -4128,15 +4053,6 @@ }, /turf/simulated/floor/tiled/red, /area/security/security_processing) -"cDO" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/hammerhead/general) "cDU" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4294,10 +4210,6 @@ }, /turf/simulated/floor/water/deep/pool, /area/crew_quarters/pool) -"cJj" = ( -/obj/effect/floor_decal/corner_techfloor_gray, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "cJR" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv7"; @@ -4665,8 +4577,7 @@ /turf/simulated/floor/reinforced, /area/security/hammerhead_bay) "cWA" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -4781,10 +4692,7 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "dbd" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/rnd/breakroom) @@ -4966,11 +4874,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -5380,10 +5284,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "dwm" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 1 }, @@ -5772,9 +5673,7 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "dFH" = ( @@ -6215,6 +6114,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/lobby) +"dRQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "dSq" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -6287,8 +6196,7 @@ "dTN" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -6404,10 +6312,7 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/machinery/disposal, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -6721,8 +6626,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6883,6 +6787,15 @@ /obj/structure/cable/green, /turf/simulated/floor/plating, /area/security/interrogation) +"etT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/security/hammerhead_bay) "eut" = ( /turf/simulated/wall/prepainted/medical, /area/medical/surgery) @@ -6902,11 +6815,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7061,16 +6970,6 @@ }, /turf/simulated/open, /area/hallway/primary/surfacetwo) -"eAU" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/structure/fuel_port{ - pixel_x = 30 - }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "eAV" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/circuits/basic, @@ -7137,10 +7036,7 @@ pixel_x = 4; pixel_y = 28 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel, /area/rnd/research/testingrange) "eCc" = ( @@ -7404,11 +7300,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -7483,10 +7375,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -7756,8 +7645,7 @@ pixel_x = 4; pixel_y = 6 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -7876,11 +7764,7 @@ /obj/machinery/camera/network/security{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -7949,13 +7833,6 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"fcW" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "fcX" = ( /obj/structure/table/steel, /obj/item/book/manual/security_space_law, @@ -7980,6 +7857,28 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/fuel, /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) +"fdo" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hammerfighterport"; + name = "Port Fighter Bay"; + pixel_x = 6; + pixel_y = -26 + }, +/obj/machinery/light/no_nightshift, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hammerheadpport"; + name = "Port Personnel Door"; + pixel_x = -5; + pixel_y = -26 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "fdT" = ( /obj/structure/inflatable/door, /obj/structure/cable/green{ @@ -8006,14 +7905,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/rnd) -"feI" = ( -/obj/structure/handrail{ - dir = 1 - }, -/obj/structure/lattice, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "feR" = ( /obj/structure/frame{ anchored = 1 @@ -8116,11 +8007,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8257,11 +8144,7 @@ }, /obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -8329,6 +8212,16 @@ }, /turf/simulated/floor/tiled, /area/security/briefing_room) +"fpW" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + name = "Control Room"; + req_one_access = list(1,38) + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/general) "fqf" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_3) @@ -8372,9 +8265,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/fiftyspawner/cardboard, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -8513,8 +8404,7 @@ "fuP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -8671,10 +8561,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "fDk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) @@ -8722,7 +8609,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -9405,15 +9292,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/breakroom) -"gbm" = ( -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hammerfighter5"; - name = "Fighter Bay Exit 5" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/hammerhead/general) "gbO" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -9432,11 +9310,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10225,11 +10099,7 @@ /turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c, /area/rift/surfacebase/outside/outside2) "gzu" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green, /turf/simulated/floor/wood, @@ -10896,11 +10766,7 @@ /area/rnd/workshop) "gYu" = ( /obj/structure/bed/chair/comfy/brown, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/landmark/spawnpoint/job/medical_doctor, /obj/structure/cable/green{ icon_state = "0-2" @@ -10929,10 +10795,7 @@ /area/crew_quarters/recreation_area) "gZt" = ( /obj/machinery/cryopod/robot, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel_ridged, /area/assembly/chargebay) "gZC" = ( @@ -11035,13 +10898,6 @@ "heZ" = ( /turf/simulated/wall/prepainted/medical, /area/medical/morgue) -"hfg" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "hfz" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -11289,30 +11145,19 @@ /turf/simulated/floor/tiled/steel, /area/assembly/robotics) "hnx" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/structure/railing{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning/corner, /obj/structure/catwalk, +/obj/machinery/light/no_nightshift, /obj/machinery/button/remote/blast_door{ dir = 1; - id = "hammerfighter5"; - name = "Fighter Bay 5"; + id = "hammerfighterport"; + name = "Port Fighter Bay"; pixel_x = -5; pixel_y = -26 }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter6"; - name = "Fighter Bay 6"; - pixel_x = 6; - pixel_y = -26 - }, -/obj/structure/handrail{ - dir = 1 - }, /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "hnY" = ( @@ -11590,11 +11435,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11839,6 +11680,23 @@ }, /turf/simulated/floor/plating, /area/maintenance/dormitory) +"hFZ" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/storage/toolbox/electrical{ + pixel_y = -4 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/general) "hGo" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) @@ -12000,16 +11858,6 @@ "hKi" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/chemistry) -"hKy" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "hKz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -12589,10 +12437,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, @@ -12603,8 +12448,7 @@ /area/rift/stairwell/primary/surfacetwo) "hZL" = ( /obj/structure/table/rack/shelf/steel, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/storage/box/survival_knife{ @@ -13235,9 +13079,7 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -13318,11 +13160,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/mist, /obj/structure/cable/green{ icon_state = "0-2" @@ -13502,10 +13340,7 @@ /area/crew_quarters/heads/hos) "iGG" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -13526,11 +13361,7 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -13557,7 +13388,7 @@ /turf/simulated/floor/tiled/dark, /area/security/armory/red) "iIa" = ( -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13578,11 +13409,7 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacetwo) "iIr" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13738,11 +13565,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "iMW" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -14081,7 +13904,7 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "iZe" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14605,7 +14428,6 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "jqf" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ name = "Public Garden" }, @@ -14615,6 +14437,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "jqg" = ( @@ -14652,7 +14475,7 @@ "jqL" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14768,10 +14591,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -15007,11 +14827,7 @@ /area/maintenance/asmaint2) "jEp" = ( /obj/machinery/processor, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "jFC" = ( @@ -15075,6 +14891,20 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"jJS" = ( +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/structure/fuel_port{ + pixel_x = 1; + pixel_y = 30 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "jJU" = ( /obj/map_helper/airlock/sensor/int_sensor, /obj/machinery/airlock_sensor{ @@ -15105,8 +14935,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/steel, @@ -15350,8 +15179,7 @@ /obj/structure/closet/hydrant{ pixel_x = -32 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -15464,9 +15292,7 @@ "jTV" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/corner/purple/border, /obj/structure/cable/green{ icon_state = "0-8" @@ -15491,9 +15317,7 @@ dir = 9 }, /obj/effect/mist, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) "jVo" = ( @@ -15576,7 +15400,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "jYp" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -15686,7 +15510,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -15702,8 +15526,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "kaZ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -15724,11 +15547,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -15781,19 +15600,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/medbay) -"kdK" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1 - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/general) "ker" = ( /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/red, @@ -15869,11 +15675,7 @@ dir = 4 }, /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -15900,6 +15702,7 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/resleeving) "kiq" = ( +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "kiJ" = ( @@ -16231,10 +16034,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/filingcabinet/chestdrawer{ name = "Scan Records" }, @@ -16639,11 +16439,7 @@ dir = 8 }, /obj/machinery/photocopier, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/corner/red/border{ dir = 4 }, @@ -16675,11 +16471,7 @@ /area/maintenance/security/upper) "kCx" = ( /obj/structure/cable/orange, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/meter{ pixel_x = 16 }, @@ -16711,13 +16503,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/hammerhead/general) -"kEU" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/hammerhead/general) "kFB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16915,6 +16700,28 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) +"kNL" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay"; + pixel_x = 5; + pixel_y = 26 + }, +/obj/machinery/button/remote/blast_door{ + id = "hammerheadpsb"; + name = "Starboard Personnel Door"; + pixel_x = -6; + pixel_y = 26 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "kNQ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -17035,8 +16842,7 @@ /turf/simulated/open, /area/rift/station/public_garden/gantry) "kSp" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/reinforced, @@ -17221,15 +17027,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/lockers) -"kWx" = ( -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hammerfighter3"; - name = "Fighter Bay Exit 3" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/hammerhead/general) "kWP" = ( /obj/machinery/atmospherics/component/unary/cryo_cell, /obj/effect/floor_decal/corner/paleblue{ @@ -17598,9 +17395,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "ldl" = ( @@ -17727,15 +17522,13 @@ "lib" = ( /obj/structure/table/wooden_reinforced, /obj/item/reagent_containers/food/condiment/small/sugar, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "lig" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17981,10 +17774,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) @@ -18078,11 +17868,7 @@ /obj/effect/floor_decal/borderfloorblack/cee{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -18357,22 +18143,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"lCs" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/cockpit) "lCv" = ( /obj/structure/toilet{ pixel_y = 9 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) -"lCY" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - name = "Control Room"; - req_one_access = list(1,38) - }, -/obj/effect/floor_decal/corner_techfloor_gray{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "lDe" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -18395,11 +18183,7 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/corner/lightorange/border{ dir = 8 }, @@ -18772,15 +18556,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/wall/r_wall/prepainted, /area/medical/chemistry) -"lPt" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "lQj" = ( /obj/structure/closet/crate{ name = "Grenade Crate" @@ -18839,7 +18614,7 @@ /turf/simulated/floor, /area/maintenance/substation/cafeteria_dock) "lQX" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -19012,11 +18787,7 @@ /obj/structure/sign/department/morgue{ pixel_y = -32 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -19243,10 +19014,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -19452,7 +19220,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "mka" = ( -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -19522,9 +19290,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) "mmM" = ( @@ -19605,10 +19371,7 @@ /obj/item/clothing/glasses/goggles, /obj/item/clothing/glasses/goggles, /obj/item/clothing/ears/earmuffs, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, @@ -19691,7 +19454,7 @@ /turf/simulated/floor/tiled/steel, /area/rnd/research) "mqr" = ( -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/research/rnd) @@ -20135,8 +19898,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/closet/secure_closet/scientist, @@ -20568,11 +20330,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20891,11 +20649,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, @@ -21161,8 +20915,8 @@ /obj/machinery/atmospheric_field_generator/perma, /obj/machinery/door/blast/regular{ dir = 4; - id = "hammerfighter4"; - name = "Fighter Bay Exit 4" + id = "hammerfighterport"; + name = "Port Fighter Bay" }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -21555,22 +21309,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"nxS" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/catwalk, -/obj/machinery/light/no_nightshift, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter6"; - name = "Fighter Bay 6"; - pixel_x = -5; - pixel_y = -26 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "nxY" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/coffee_shop) @@ -21657,11 +21395,7 @@ "nzw" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -21696,8 +21430,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -22090,11 +21823,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -22127,8 +21856,7 @@ alpha = 255; dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -22225,11 +21953,8 @@ /turf/simulated/floor/tiled/monowhite, /area/medical/sleeper) "nUi" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -22644,19 +22369,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"ogw" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/obj/item/radio/intercom/department/security{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "ogH" = ( /obj/machinery/meter{ pixel_x = 6; @@ -23087,8 +22799,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 24 }, /obj/machinery/button/remote/airlock{ @@ -23500,8 +23211,8 @@ /obj/machinery/atmospheric_field_generator/perma, /obj/machinery/door/blast/regular{ dir = 4; - id = "hammerfighter1"; - name = "Fighter Bay Exit 1" + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay Exit" }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -23782,8 +23493,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/corner/lightgrey/border{ @@ -24054,9 +23764,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -24071,8 +23779,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/corner/red{ @@ -24548,8 +24255,7 @@ /area/crew_quarters/pool) "prL" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/lightgrey/border, @@ -24888,11 +24594,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25070,11 +24772,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -25164,8 +24862,7 @@ "pRj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25264,28 +24961,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/sleep) -"pUb" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter1"; - name = "Fighter Bay 1"; - pixel_x = 5; - pixel_y = 26 - }, -/obj/machinery/button/remote/blast_door{ - id = "hammerheadpsb"; - name = "Starboard Personnel Door"; - pixel_x = -6; - pixel_y = 26 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "pUL" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -25588,10 +25263,7 @@ /obj/item/storage/box/masks{ pixel_x = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "qfG" = ( @@ -25602,8 +25274,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) "qgp" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/trunk{ @@ -25649,6 +25320,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor/plating, /area/maintenance/medbay) +"qij" = ( +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/cockpit) "qiJ" = ( /obj/structure/grille, /obj/structure/foamedmetal, @@ -25902,12 +25579,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"qpx" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "qpE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -26330,11 +26001,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "qCM" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -26505,11 +26173,7 @@ /area/shuttle/hammerhead/cockpit) "qJo" = ( /obj/structure/table/steel, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloorblack{ alpha = 255; dir = 4 @@ -26729,11 +26393,7 @@ /turf/simulated/floor/tiled/dark, /area/security/evidence_storage) "qQk" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/air_alarm{ dir = 4; pixel_x = -24 @@ -26856,9 +26516,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 10 }, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -26911,19 +26569,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) -"qUM" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/voidcraft/vertical{ - name = "Control Room"; - req_one_access = list(1,38) - }, -/obj/effect/floor_decal/corner_techfloor_gray{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "qVn" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 @@ -27119,26 +26764,22 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "rcg" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/structure/railing{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /obj/structure/catwalk, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter2"; - name = "Fighter Bay 2"; - pixel_x = -6; - pixel_y = 26 +/obj/machinery/light/no_nightshift{ + dir = 1 }, /obj/machinery/button/remote/blast_door{ - id = "hammerfighter3"; - name = "Fighter Bay 3"; - pixel_x = 5; + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay"; + pixel_x = -6; pixel_y = 26 }, -/obj/structure/handrail, /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "rcB" = ( @@ -27365,11 +27006,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -27627,8 +27264,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -27733,10 +27369,7 @@ /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "rtk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/reinforced, /area/security/hammerhead_bay) @@ -27876,11 +27509,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; @@ -28195,8 +27824,7 @@ /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -28405,9 +28033,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "rRc" = ( @@ -29102,12 +28728,6 @@ "sse" = ( /turf/simulated/wall/prepainted/security, /area/security/security_processing) -"sss" = ( -/obj/structure/handrail, -/obj/structure/lattice, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "ssT" = ( /obj/effect/floor_decal/rust, /obj/machinery/light/small{ @@ -29420,16 +29040,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/heads/hor) -"sCV" = ( -/obj/machinery/power/smes/buildable{ - charge = 1.5e+007; - cur_coils = 3 - }, -/obj/structure/cable/orange{ - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "sDd" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/bed/chair{ @@ -29486,8 +29096,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -29751,9 +29360,6 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"sNY" = ( -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "sPc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -29769,33 +29375,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"sPt" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/catwalk, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter4"; - name = "Fighter Bay 4"; - pixel_x = -5; - pixel_y = -26 - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter5"; - name = "Fighter Bay 5"; - pixel_x = 6; - pixel_y = -26 - }, -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "sPP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -29848,11 +29427,7 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "sSX" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/medbay) @@ -30284,7 +29859,7 @@ /turf/simulated/floor/wood, /area/security/breakroom) "tlq" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "0-4" @@ -30457,10 +30032,7 @@ /area/medical/reception) "trg" = ( /obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/sign/department/armory{ pixel_y = -32 }, @@ -30572,11 +30144,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -30745,8 +30313,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -30824,20 +30391,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/medical/reception) -"tBx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/item/radio/intercom/department/security{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "tBE" = ( /obj/structure/railing{ dir = 4 @@ -31084,28 +30637,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"tGD" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter4"; - name = "Fighter Bay 4"; - pixel_x = 6; - pixel_y = -26 - }, -/obj/machinery/light/no_nightshift, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerheadpport"; - name = "Port Personnel Door"; - pixel_x = -5; - pixel_y = -26 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "tGY" = ( /obj/landmark/spawnpoint/job/warden, /obj/machinery/light_switch{ @@ -31277,7 +30808,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -31297,15 +30828,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/pool/emergency_closet) -"tSM" = ( -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hammerfighter6"; - name = "Fighter Bay Exit 6" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/hammerhead/general) "tSV" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -31359,6 +30881,27 @@ }, /turf/simulated/floor/tiled/steel, /area/holodeck_control) +"tUK" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/button/remote/blast_door{ + id = "hammerfighterport"; + name = "Port Fighter Bay"; + pixel_x = -4; + pixel_y = 33 + }, +/obj/machinery/button/remote/blast_door{ + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay"; + pixel_x = 4; + pixel_y = 33 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/cockpit) "tUW" = ( /obj/machinery/light{ dir = 8 @@ -31603,11 +31146,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -31660,9 +31199,7 @@ /obj/structure/table/rack/shelf, /obj/random/maintenance/security, /obj/random/contraband, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/random/maintenance/research, /obj/item/clothing/accessory/holster/armpit, /turf/simulated/floor/plating, @@ -32080,11 +31617,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -32095,13 +31628,8 @@ /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/power/apc/north_mount, +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -32233,7 +31761,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -32255,6 +31783,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "uFl" = ( @@ -32490,8 +32019,7 @@ /obj/item/target, /obj/item/target, /obj/item/target, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/air_alarm{ @@ -32635,8 +32163,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -32785,10 +32312,7 @@ /area/tether/surfacebase/reading_room) "uSr" = ( /obj/machinery/light/small, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -33643,8 +33167,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -33766,10 +33289,7 @@ "vtX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) @@ -33997,7 +33517,7 @@ /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "vEJ" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -34043,11 +33563,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/dormitory) "vGZ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 }, @@ -34152,6 +33668,19 @@ /obj/machinery/vending/fitness, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/pool) +"vKi" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/voidcraft/vertical{ + name = "Control Room"; + req_one_access = list(1,38) + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/general) "vKj" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ @@ -34212,19 +33741,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"vMM" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/storage/toolbox/electrical{ - pixel_y = -4 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "vNQ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -34273,6 +33789,15 @@ /obj/random/tool, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"vQJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 5 + }, +/obj/machinery/computer/ship/engines{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "vQP" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -34389,15 +33914,6 @@ /obj/effect/overlay/snow/floor, /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) -"vVo" = ( -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hammerfighter2"; - name = "Fighter Bay Exit 2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/hammerhead/general) "vVr" = ( /obj/effect/floor_decal/rust, /obj/item/tool/screwdriver, @@ -34456,9 +33972,7 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "vWW" = ( @@ -34552,11 +34066,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -34705,11 +34215,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -34810,9 +34316,8 @@ "wjQ" = ( /obj/structure/bed/chair/comfy/beige, /obj/landmark/spawnpoint/job/senior_researcher, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/floor/wood, /area/rnd/breakroom) @@ -34829,15 +34334,10 @@ /area/security/armory/red) "wjX" = ( /obj/structure/table/rack/shelf/steel, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/red, /area/security/evidence_storage) @@ -34881,11 +34381,7 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -35008,8 +34504,7 @@ "wpX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/vending/fitness, @@ -35175,8 +34670,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/corner/lightorange{ @@ -35251,8 +34745,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) "wAb" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -35357,8 +34850,7 @@ /turf/simulated/floor/tiled/steel, /area/assembly/robotics) "wCr" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -35385,6 +34877,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"wDF" = ( +/obj/item/radio/intercom/department/security{ + pixel_y = -24 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "wDR" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medbay Auxillary Storage" @@ -35550,10 +35048,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "wLS" = ( @@ -36059,13 +35554,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"xfg" = ( -/obj/structure/handrail, -/obj/structure/lattice, -/obj/structure/lattice, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "xfy" = ( /obj/structure/closet/wardrobe/red, /obj/effect/floor_decal/industrial/outline/yellow, @@ -36091,10 +35579,7 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/resleeving) "xgG" = ( @@ -36248,8 +35733,7 @@ dir = 10 }, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -36349,7 +35833,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 6 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -36652,25 +36136,6 @@ }, /turf/simulated/floor/tiled/steel, /area/assembly/robotics) -"xCl" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter3"; - name = "Fighter Bay 3"; - pixel_x = -6; - pixel_y = 26 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "xCG" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -36747,7 +36212,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "xFv" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -36898,10 +36363,7 @@ department = "Reading Room" }, /obj/structure/table/glass, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) "xIz" = ( @@ -37082,7 +36544,7 @@ /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "xNm" = ( @@ -37109,19 +36571,13 @@ }, /turf/simulated/floor, /area/maintenance/substation/research) -"xNR" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) "xOj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/purple/bordercorner2, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -37413,11 +36869,7 @@ /obj/effect/floor_decal/corner/red{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -37481,6 +36933,19 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) +"xVE" = ( +/obj/machinery/power/smes/buildable{ + charge = 1.5e+007; + cur_coils = 3 + }, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "xVY" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -37632,10 +37097,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/security_processing) "yaL" = ( @@ -37671,9 +37133,7 @@ /turf/simulated/open, /area/rift/trade_shop/loading) "ycW" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/railing{ dir = 4 }, @@ -37734,7 +37194,7 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "yfc" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/rust, /obj/structure/cable/green{ icon_state = "4-8" @@ -37834,11 +37294,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay) "yhs" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "yhO" = ( @@ -37886,57 +37342,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/medical/surgeryprep) -"yjG" = ( -/obj/structure/handrail{ - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter1"; - name = "Fighter Bay 1"; - pixel_x = 23; - pixel_y = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter2"; - name = "Fighter Bay 2"; - pixel_x = 32; - pixel_y = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter3"; - name = "Fighter Bay 3"; - pixel_x = 42; - pixel_y = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter4"; - name = "Fighter Bay 4"; - pixel_x = 23; - pixel_y = -7 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter5"; - name = "Fighter Bay 5"; - pixel_x = 32; - pixel_y = -7 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter6"; - name = "Fighter Bay 6"; - pixel_x = 42; - pixel_y = -7 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "yjX" = ( /obj/machinery/light/small{ dir = 4 @@ -38033,8 +37438,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/dark, @@ -45552,11 +44956,11 @@ sUg cuM gbO cuM -xNR +qYi cuM gbO cuM -xNR +qYi cuM gbO cuM @@ -52629,12 +52033,12 @@ qly qly qly qly -oOw -oOw -oOw -oOw -oOw -oOw +qly +qly +qly +qly +qly +qly qly qly qly @@ -52821,14 +52225,12 @@ qly qly qly qly +qly +qly oOw oOw oOw oOw -gzZ -nNP -oOw -oOw oOw oOw qly @@ -52836,6 +52238,8 @@ qly qly qly qly +qly +qly hMX uAn nFd @@ -53012,22 +52416,22 @@ uAn qly qly qly -iCM -iCM +qly +qly +qly oOw oOw -sUa -seE oOw -uuN -wqC oOw -bpb -eqt +gzZ +nNP oOw oOw -iCM -iCM +oOw +oOw +qly +qly +qly qly qly qly @@ -53205,26 +52609,26 @@ pBj uAn qly qly +qly +qly iCM iCM -xjH -aKa -qpx -sQt -sYU oOw -ufs -sUJ +sUa +seE +oOw +uuN +wqC +oOw +bpb +eqt oOw -xaM -sQt -qpx -aKa -iqw iCM iCM qly qly +qly +qly uAn mYc mYc @@ -53399,24 +52803,24 @@ pBj uAn fqV qly +qly iCM -uuY -ehg -sQt -sQt -ffG -dhC -mhJ -fyj -jyv -wdn -dhC -pBz +iCM +xjH +aKa sQt +sYU +oOw +ufs +sUJ +oOw +xaM sQt -ehg -hhM +aKa +iqw iCM +iCM +qly qly sZb uAn @@ -53593,24 +52997,24 @@ dVV uAn qly qly -oOw -eXr -yjG -ujL -sQt +qly +iCM +uuY +ehg sQt -lPt -xEQ -xEQ -vEO -liE -qJl +ffG +dhC +mhJ +fyj +jyv +wdn +dhC +pBz sQt -cJj -ujL -yjG -hOS -oOw +ehg +hhM +iCM +qly qly qly uAn @@ -53787,26 +53191,26 @@ enB uAn qly qly +qly oOw -oOw -oOw -oOw -oUW -dbt -djJ +eXr +tUK ujL -jyv -vAW +sQt +qij +lCs +xEQ +vEO +liE +qJl +sQt ujL -djU -dbt -gyO -oOw -oOw -oOw +byu +hOS oOw qly qly +qly uAn dAE eTD @@ -53982,17 +53386,18 @@ kvr swv qly qly -qly -oOw -oOw -oOw -oOw +ilr oOw oOw -iag -mvg -oOw oOw +oUW +dbt +djJ +jyv +vAW +djU +dbt +gyO oOw oOw oOw @@ -54000,7 +53405,6 @@ oOw qly qly qly -qly uAn tZW tZW @@ -54178,18 +53582,18 @@ qly qly qly qly -qly -qly -eBF oOw oOw -lCY -qUM oOw oOw -qly -qly -qly +oOw +iag +mvg +oOw +oOw +oOw +oOw +oOw qly qly qly @@ -54374,12 +53778,11 @@ qly qly qly qly +eBF ilr ilr -ilr -aSz -bFP -ilr +fpW +vKi ilr ilr qly @@ -54388,6 +53791,7 @@ qly qly qly qly +qly sZb uAn oPZ @@ -54567,14 +53971,13 @@ eqc qly qly qly +qly ilr ilr -qnJ -nVS -nVS -qkS -xbD -kdK +ilr +aSz +bFP +ilr ilr ilr qly @@ -54582,6 +53985,7 @@ qly qly qly qly +qly hMX uAn uUy @@ -54761,16 +54165,16 @@ eqc qly qly qly -pQK -pxC -pxC -xbD -xbD -rLY +ilr +ilr +qnJ +nVS +nVS +qkS xbD -pxC -pxC -kJk +hFZ +ilr +ilr qly qly qly @@ -54954,18 +54358,18 @@ cnl aTs qly qly -iZI -ilr -pUb -nLz -mxh +qly +pQK +pxC +pxC +xbD xbD rLY -mFf -nLz -tGD -ilr -lrj +xbD +pxC +pxC +kJk +qly qly qly qly @@ -55148,18 +54552,18 @@ rrr cWw qly qly -vDu -oPv -fSv -gHJ -hsv -lKw -wJB -lXc -grT -fSv -njk -vDu +iZI +ilr +kNL +nLz +mxh +xbD +rLY +mFf +nLz +fdo +ilr +lrj qly qly qly @@ -55345,12 +54749,12 @@ qly vDu oPv fSv -fSv -jug -pxC -dzD -wcF -fSv +gHJ +hsv +lKw +wJB +lXc +grT fSv njk vDu @@ -55536,18 +54940,18 @@ rrr cWw qly qly -feI -ilr -amc -hKy -cDO +vDu +oPv +fSv +fSv +jug pxC dzD -kEU -hKy -sPt -ilr -xfg +wcF +fSv +fSv +njk +vDu qly qly qly @@ -55731,16 +55135,16 @@ cWw qly qly vDu -vVo +oPv fSv -gHJ +kwh hsv lKw uSS lXc grT -fSv -gbm +uRN +njk vDu qly qly @@ -55925,7 +55329,7 @@ cWw qly qly vDu -vVo +oPv fSv fSv jug @@ -55934,7 +55338,7 @@ dzD wcF fSv fSv -gbm +njk vDu qly qly @@ -56118,18 +55522,18 @@ cnl nSi qly qly -feI +cYC ilr rcg -hKy -cDO -pxC -dzD -kEU -hKy +mkP +tnu +pPV +kDT +ybB +mkP hnx ilr -sss +aJI qly qly qly @@ -56312,18 +55716,18 @@ cnl eqc qly qly -vDu -kWx -fSv -kwh -hsv -lKw -uSS -lXc -grT -uRN -tSM -vDu +bru +lhE +rda +pxC +trq +pPV +cVx +ojI +ieh +vIN +azT +vnt qly qly qly @@ -56502,26 +55906,26 @@ pBj pBj uAn qly +iFy +dFm qly -eqc qly qly -vDu -kWx -fSv -fSv -jug -pxC -dzD -wcF -fSv -fSv -tSM -vDu +lhE +qxx +xIV +jTU +jJU +fZv +jhd +vfd +jwp +azT qly qly qly -nxh +uht +rrx hMX uAn uAn @@ -56696,26 +56100,26 @@ pBj pBj uAn fqV -qly -eqc +qdY +fJu qly qly -cYC ilr -xCl -mkP -tnu -pPV -kDT -ybB -mkP -nxS ilr -aJI -qly +ijJ +bap +ilr +ayE +ceM +ilr +kMU +jNS +ilr +ilr qly qly -nxh +spg +mAS sZb uAn jux @@ -56890,26 +56294,26 @@ pBj pBj uAn swv -iFy -dFm -qly +pqq +kAt qly -bru -lhE -rda -pxC -trq -pPV -cVx -ojI -ieh -vIN -azT -vnt +ilr +ilr +jJS +slB +wDF +ilr +uhb +iXD +ilr +cya +lag +kCx +ilr +ilr qly qly -uht -rrx +nxh qly uAn pCP @@ -57084,26 +56488,26 @@ pBj pBj uAn qly -qdY -fJu -qly -qly +ecx qly -lhE -qxx -xIV -jTU -jJU -fZv -jhd -vfd -jwp -azT qly +ilr +mPW +fdm +ogH +vQJ +ilr +pUZ +oxe +ilr +xVE +frQ +dRQ +rsA +ilr qly qly -spg -mAS +nxh cbV uAn pCP @@ -57278,25 +56682,25 @@ pBj pBj uAn qly -buA -eqc +ecx qly ilr ilr +iRD +qNg +iRD +qNg ilr -ijJ -bap -ilr -ayE -ceM -ilr -kMU -jNS +tKD +qDr ilr +iRD +qNg +iRD +qNg ilr ilr qly -qly nxh qly uAn @@ -57472,22 +56876,22 @@ pBj pBj uAn qly -pqq -kAt +ecx +qly ilr ilr -hfg -ogw -slB -sNY +xlX +dym +xlX +dym ilr -uhb -iXD +dKZ +cEL ilr -cya -lag -kCx -bLw +xlX +dym +xlX +dym ilr ilr qly @@ -57669,20 +57073,20 @@ qly ecx qly ilr -mPW -fdm -eAU -ogH -vMM ilr -pUZ -oxe +qly +qly +qly +qly +qly +qly +eyy +qly +qly +qly +qly +qly ilr -sCV -frQ -tBx -fcW -rsA ilr qly nxh @@ -57861,24 +57265,24 @@ pBj uAn fqV ecx -ilr -ilr -iRD -qNg -ilr -iRD -qNg -ilr -tKD -qDr -ilr -iRD -qNg -ilr -iRD -qNg -ilr -ilr +qly +qly +qly +qly +qly +qly +qly +qly +qly +etT +qly +qly +qly +qly +qly +qly +qly +qly nxh sZb uAn @@ -58055,24 +57459,24 @@ pBj uAn swv ecx -ilr -ilr -xlX -dym -ilr -xlX -dym -ilr -dKZ -cEL -ilr -xlX -dym -ilr -xlX -dym -ilr -ilr +qly +qly +qly +qly +qly +qly +qly +qly +qly +etT +qly +qly +qly +qly +qly +qly +qly +qly nxh hMX uAn @@ -58249,8 +57653,6 @@ pBj uAn qly ecx -ilr -ilr qly qly qly @@ -58258,15 +57660,17 @@ qly qly qly qly -eyy +qly +qly +etT +qly +qly qly qly qly qly qly qly -ilr -ilr nxh qly uAn diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 0742ee01ce..fa8c16b12b 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -246,11 +246,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -698,10 +694,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -819,11 +812,7 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside3) "acI" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1097,10 +1086,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "adB" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/barrestroom) "adC" = ( @@ -1435,10 +1421,7 @@ /obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -1684,18 +1667,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "afv" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "afw" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "afx" = ( @@ -2007,10 +1986,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "agu" = ( @@ -2137,14 +2113,12 @@ /obj/machinery/computer/card, /obj/machinery/button/windowtint{ id = "hop_office"; - layer = 3.3; pixel_x = 8; pixel_y = 26 }, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "hop_office_shutters"; - layer = 3.3; name = "Office Shutters"; pixel_x = -8; pixel_y = 26 @@ -2218,8 +2192,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "ahc" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorblack{ @@ -2321,11 +2294,7 @@ /turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "ahr" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -2363,10 +2332,7 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "ahw" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/air_alarm{ dir = 8; pixel_x = 24 @@ -2438,11 +2404,8 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cockpit) "ahF" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "2-8" @@ -2678,11 +2641,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/exploration/meeting) @@ -2769,8 +2728,7 @@ /obj/item/folder/blue, /obj/item/clothing/glasses/omnihud, /obj/item/pen, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet/blue, @@ -2859,11 +2817,7 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 24 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -3345,11 +3299,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/exploration) "ajX" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3420,11 +3370,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -3628,8 +3574,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -3751,11 +3696,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "akU" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -4141,10 +4082,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) "ama" = ( @@ -4240,10 +4178,7 @@ /turf/simulated/floor/tiled/techfloor/grid/lythios43c, /area/shuttle/emt/cockpit) "ami" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -4688,11 +4623,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -5094,7 +5025,7 @@ /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "civvie_docker"; pixel_x = -24; @@ -5917,11 +5848,7 @@ pixel_y = 30 }, /obj/structure/bed/chair/shuttle, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -5979,7 +5906,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "aqW" = ( -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -6088,11 +6015,7 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/civvie/general) "arm" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -6296,8 +6219,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "arK" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/steel_grid, @@ -6772,8 +6694,7 @@ "ath" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor/corner2, @@ -6803,8 +6724,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -7061,11 +6981,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -7366,10 +7282,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/white, @@ -7445,9 +7358,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "auU" = ( @@ -8167,10 +8078,7 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "awB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/landmark/free_ai_shell, /obj/effect/floor_decal/techfloor{ dir = 6 @@ -8456,8 +8364,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/steel, @@ -8474,11 +8381,8 @@ pixel_x = 32 }, /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -8522,10 +8426,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/power/apc/high{ - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/high, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "axq" = ( @@ -9240,10 +9141,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "azq" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -9535,8 +9433,7 @@ dir = 4; pixel_x = -30 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -9772,8 +9669,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -10056,11 +9952,7 @@ /obj/structure/cable/cyan{ icon_state = "2-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -10642,8 +10534,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/steel, @@ -10759,11 +10650,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -11356,11 +11243,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel, /area/exploration) "aFL" = ( @@ -11996,11 +11879,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12119,8 +11998,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -12207,11 +12085,7 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "aIf" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -12607,8 +12481,7 @@ /area/rift/trade_shop/landing_pad) "aJj" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12712,11 +12585,7 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/captain) "aJr" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -12804,8 +12673,7 @@ /obj/effect/floor_decal/corner/lime/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/trunk{ @@ -13265,7 +13133,6 @@ /area/shuttle/excursion/cargo) "aKM" = ( /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_y = -28 }, @@ -13557,11 +13424,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "aLJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "aLL" = ( @@ -13575,7 +13438,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13629,8 +13492,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -13697,10 +13559,7 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "aMh" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -14968,10 +14827,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -15874,9 +15730,7 @@ /area/bridge/bridge_hallway) "aSj" = ( /obj/effect/floor_decal/spline/plain, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/exploration/meeting) "aSk" = ( @@ -16444,11 +16298,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "aTL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) "aTN" = ( @@ -16960,8 +16810,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -17400,10 +17249,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "aWB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -17481,11 +17327,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -17914,8 +17756,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/steel, @@ -18130,11 +17971,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aYG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18482,9 +18319,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -18509,11 +18344,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18619,7 +18450,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -18919,7 +18750,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -19069,11 +18900,7 @@ on = 1; scrub_id = "civ_airlock_two_scrubber" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/railing{ dir = 8 }, @@ -19814,7 +19641,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -19838,8 +19665,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -28 }, /obj/structure/cable/green{ @@ -19849,11 +19675,7 @@ /area/crew_quarters/heads/blueshield) "eEi" = ( /obj/structure/catwalk, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20185,7 +20007,7 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "flF" = ( -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20222,7 +20044,7 @@ }, /obj/item/packageWrap, /obj/item/packageWrap, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/hydroponics) @@ -20656,7 +20478,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20757,7 +20579,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20835,9 +20657,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/door/firedoor/glass{ dir = 8 }, @@ -20986,6 +20806,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "hDa" = ( @@ -21252,11 +21075,13 @@ /turf/simulated/floor/plating, /area/exploration/pathfinder_office) "iio" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal/mait{ dir = 4; name = "Maintenance Access" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "ikZ" = ( @@ -21539,9 +21364,7 @@ /area/crew_quarters/bar) "jew" = ( /obj/structure/table/bench/standard, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "jil" = ( @@ -22098,7 +21921,7 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -22161,9 +21984,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/ladder{ pixel_y = 10 }, @@ -22379,10 +22200,7 @@ /turf/simulated/wall/rshull, /area/shuttle/excursion/cargo) "lzf" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -22612,7 +22430,7 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/heads/hop) "lYx" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/machinery/light{ dir = 1 }, @@ -23392,9 +23210,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "orx" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) "oti" = ( @@ -23843,11 +23659,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -24193,7 +24005,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -24451,6 +24263,10 @@ /obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab) +"riD" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "riL" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -24652,11 +24468,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ frequency = 1379; scrub_id = "civ_airlock_scrubber" @@ -24753,7 +24565,7 @@ /obj/structure/railing, /obj/structure/foodcart, /obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25328,11 +25140,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/table/standard, /obj/item/storage/laundry_basket, /obj/structure/cable/green, @@ -25430,8 +25238,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/outline, /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -25731,11 +25538,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "0-8" @@ -25816,7 +25619,7 @@ /obj/structure/sink/kitchen{ pixel_y = 26 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26412,11 +26215,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -26450,11 +26249,7 @@ dir = 9 }, /obj/machinery/light/small, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -26464,7 +26259,7 @@ /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "xbb" = ( @@ -26487,8 +26282,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -26540,7 +26334,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26676,10 +26470,7 @@ /area/crew_quarters/bar) "xHc" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -26803,7 +26594,7 @@ /area/rift/stairwell/primary/surfacethree) "xYy" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -26815,7 +26606,7 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "yaE" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26934,9 +26725,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "yku" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -52842,7 +52631,7 @@ aaA aaA aaA aaA -aaA +riD aaA aaA aAN diff --git a/maps/rift/levels/rift-07-west_base.dmm b/maps/rift/levels/rift-07-west_base.dmm index 2a72adcd64..141ed1240c 100644 --- a/maps/rift/levels/rift-07-west_base.dmm +++ b/maps/rift/levels/rift-07-west_base.dmm @@ -683,10 +683,9 @@ "Jt" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 1 diff --git a/maps/rift/levels/rift-08-west_deep.dmm b/maps/rift/levels/rift-08-west_deep.dmm index 83a4421b7d..751b87cf5d 100644 --- a/maps/rift/levels/rift-08-west_deep.dmm +++ b/maps/rift/levels/rift-08-west_deep.dmm @@ -144,8 +144,9 @@ /turf/simulated/floor/plating, /area/rnd/outpost/maintenance) "bh" = ( -/turf/simulated/floor/sky/depths/west/lythios43c, -/area/rift/surfacebase/outside/west_deep) +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "bi" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) @@ -208,11 +209,7 @@ /area/outpost/mining_main/refinery) "bR" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -316,6 +313,15 @@ /obj/spawner/window/reinforced/full, /turf/simulated/floor, /area/turbolift/rwest_mining/deep) +"cL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/outpost/mining_main/outpost/maintenance) "cP" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -458,6 +464,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/north) +"eM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/outpost/mining_main/outpost/maintenance/north) "eN" = ( /obj/effect/floor_decal/industrial/halfstair, /obj/structure/railing{ @@ -659,7 +673,7 @@ /obj/structure/cable/green{ icon_state = "0-5" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/south) "hc" = ( @@ -705,8 +719,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -1220,7 +1233,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /turf/simulated/floor/tiled, @@ -1268,7 +1280,7 @@ /turf/simulated/floor/tiled/monotile, /area/outpost/mining_main/outpost/near_gateway) "lt" = ( -/obj/structure/closet/emcloset, +/obj/structure/table/steel_reinforced, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "lx" = ( @@ -1387,7 +1399,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/janitorial) "mF" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -1711,6 +1723,18 @@ /obj/machinery/camera/network/mining{ dir = 4 }, +/obj/structure/closet/walllocker{ + dir = 8; + pixel_x = -28 + }, +/obj/item/clothing/head/helmet/space/void/mining, +/obj/item/clothing/suit/space/void/mining, +/obj/item/clothing/shoes/magboots, +/obj/item/pickaxe/silver, +/obj/item/pickaxe/silver, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "pf" = ( @@ -1721,10 +1745,9 @@ /obj/effect/floor_decal/corner/white/full{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /turf/simulated/floor/tiled/dark, /area/rift/facility/interior/temple) @@ -1817,6 +1840,11 @@ /obj/machinery/computer/shuttle_control/belter{ dir = 1 }, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the belter shuttle systems, to help miners find where they left their shuttle."; + gps_tag = "BELTER"; + name = "belter beacon" + }, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "pQ" = ( @@ -2108,6 +2136,12 @@ name = "glacier wall" }, /area/rift/surfacebase/outside/west_deep) +"sT" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/outpost/mining_main/refinery) "sW" = ( /obj/structure/table/standard, /obj/machinery/recharger, @@ -2709,10 +2743,9 @@ /area/outpost/mining_main/outpost/airlock/three) "yG" = ( /obj/structure/bed/chair, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -3462,7 +3495,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/monotile, /area/gateway) "EQ" = ( @@ -3572,9 +3605,12 @@ /area/gateway) "FP" = ( /obj/effect/mist, -/turf/simulated/floor/water, +/turf/unsimulated/floor/lava/geothermal, /area/space) "FW" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/gateway/prep_room) "FX" = ( @@ -3899,7 +3935,7 @@ dir = 8 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/near_gateway) "Jl" = ( @@ -3921,10 +3957,10 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/north) "Jt" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/north) "Jv" = ( @@ -4026,7 +4062,7 @@ /obj/machinery/button/remote/blast_door{ id = "belter_blast"; name = "Shuttle Blast Doors"; - pixel_x = -25; + pixel_x = -23; pixel_y = -25 }, /turf/simulated/shuttle/floor/voidcraft, @@ -4102,7 +4138,7 @@ /obj/structure/cable/green{ icon_state = "0-6" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/north) "La" = ( @@ -4196,10 +4232,9 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/south) "Mc" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -4216,7 +4251,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4272,12 +4307,12 @@ name = "Material Processing"; req_one_access = list(48) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/outpost/mining_main/refinery) "MD" = ( @@ -4315,7 +4350,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -4333,7 +4368,7 @@ /turf/simulated/floor/tiled, /area/gateway) "Ne" = ( -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/monotile, /area/rnd/outpost/underground) "Nf" = ( @@ -4356,8 +4391,8 @@ dir = 4; name = "Gateway Prep" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/gateway/prep_room) @@ -4570,7 +4605,7 @@ /obj/structure/cable/green{ icon_state = "0-6" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/belterdock) "Pz" = ( @@ -4625,6 +4660,13 @@ /obj/machinery/light/small, /turf/simulated/floor/outdoors/snow/lythios43c/indoors, /area/rift/surfacebase/outside/west_deep) +"Qw" = ( +/obj/structure/sign/warning/lava{ + name = "\improper SUPERHEATED GAS"; + pixel_x = -32 + }, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, +/area/rift/surfacebase/outside/west_deep/submap_seedzone) "Qz" = ( /obj/structure/inflatable, /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, @@ -4697,7 +4739,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4720,7 +4761,6 @@ pixel_y = 30 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -5046,10 +5086,9 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/prison) "UD" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/janitorial) @@ -5236,7 +5275,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/machinery/door/firedoor/glass, @@ -5301,14 +5339,11 @@ /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance) "WM" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/substation) @@ -5320,10 +5355,7 @@ /turf/simulated/mineral/icerock/lythios43c, /area/rift/surfacebase/outside/west_deep/submap_seedzone) "WX" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -5464,7 +5496,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -5479,8 +5510,9 @@ /turf/simulated/floor/reinforced, /area/gateway) "Yw" = ( -/turf/simulated/floor/sky/depths/west/lythios43c, -/area/rift/surfacebase/outside/west_deep) +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/belterdock) "YA" = ( /obj/machinery/light/small{ dir = 1 @@ -5615,6 +5647,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/outpost/mining_main/outpost/recreation) "ZQ" = ( @@ -5639,8 +5674,8 @@ /obj/machinery/door/airlock/multi_tile/glass{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/outpost/mining_main/outpost/recreation) @@ -30593,7 +30628,7 @@ WW WW WW WW -Wv +Qw Wv WW Vs @@ -34683,7 +34718,7 @@ vA JM KF KF -KF +Ne KF KF Lm @@ -35229,7 +35264,7 @@ uJ uJ uJ uJ -aV +sT Mp uJ Nw @@ -36205,7 +36240,7 @@ fa bM Hy ox -bM +eM NV Du Nw @@ -36972,7 +37007,7 @@ dV rn Pq ww -Cl +Yw BB XN nK @@ -37339,10 +37374,10 @@ pU pU pU oZ -bh -bh -bh -bh +il +il +il +il iI fM QJ @@ -37528,15 +37563,15 @@ XQ dV dV dV -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il iI fM QJ @@ -37719,18 +37754,18 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il iI fM QJ @@ -37906,25 +37941,25 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il iI fM QJ @@ -38090,35 +38125,35 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il iI fM QJ @@ -38275,44 +38310,44 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn rn RO @@ -38344,7 +38379,7 @@ ti mI kQ nG -nG +cL sI Dd XP @@ -38467,46 +38502,46 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn Qf Ij @@ -38521,10 +38556,10 @@ Ij uu kk rn -bh -bh -bh -bh +il +il +il +il SP VH Im @@ -38640,67 +38675,67 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn Ij LK @@ -38715,10 +38750,10 @@ tr gc Fu rn -bh -bh -bh -bh +il +il +il +il SP uo DO @@ -38830,71 +38865,71 @@ sN "} (172,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij fp @@ -38909,10 +38944,10 @@ Lr fp uu jB -bh -bh -bh -bh +il +il +il +il St SP SP @@ -39024,71 +39059,71 @@ sN "} (173,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39103,31 +39138,31 @@ SI Ij uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -XQ -XQ -XQ -XQ -XQ -XQ -ky -ky -ky +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +XQ +XQ +XQ +XQ +XQ +XQ +ky +ky +ky qT ky ky @@ -39218,71 +39253,71 @@ sN "} (174,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39292,32 +39327,32 @@ Fm oG pe MO -lt +bh SI SI uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il ky ky ky @@ -39365,14 +39400,14 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il XQ XQ XQ @@ -39412,71 +39447,71 @@ sN "} (175,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39491,40 +39526,40 @@ pO zc uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il ky ky ky @@ -39556,20 +39591,20 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il XQ XQ XQ @@ -39594,83 +39629,83 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il pT "} (176,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39685,41 +39720,41 @@ SI SI uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il ky ky ky @@ -39747,26 +39782,26 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il XQ XQ XQ @@ -39783,88 +39818,88 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (177,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39879,46 +39914,46 @@ SI Ij uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il ky qT ky @@ -39938,127 +39973,127 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il XQ XQ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -pT -"} -(178,1,1) = {" -pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +pT +"} +(178,1,1) = {" +pT +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn Ij Ij @@ -40073,186 +40108,186 @@ cD Te uu rn -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il XQ XQ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (179,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn pE kF @@ -40267,2638 +40302,2638 @@ up cA es rn -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (180,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (181,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -pT -"} -(182,1,1) = {" -pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +pT +"} +(182,1,1) = {" +pT +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (183,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (184,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (185,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -pT -"} -(186,1,1) = {" -pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +pT +"} +(186,1,1) = {" +pT +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (187,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (188,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (189,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -pT -"} -(190,1,1) = {" -pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +pT +"} +(190,1,1) = {" +pT +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (191,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (192,1,1) = {" pT -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il il pT "} diff --git a/maps/rift/levels/rift-09-west_caves.dmm b/maps/rift/levels/rift-09-west_caves.dmm index 40298ba1ab..d633529dc0 100644 --- a/maps/rift/levels/rift-09-west_caves.dmm +++ b/maps/rift/levels/rift-09-west_caves.dmm @@ -172,11 +172,7 @@ /obj/structure/cable/white{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/lythios43c/indoors, /area/rift/geothermal) "co" = ( @@ -267,7 +263,7 @@ /turf/simulated/open/lythios43c, /area/rift/facility/interior/medical) "dg" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -358,8 +354,8 @@ req_access = list(); req_one_access = list(19,43,67) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/outpost/underground) @@ -648,7 +644,7 @@ /turf/simulated/floor/tiled/steel/lythios43c, /area/rift/facility/interior/medical) "ho" = ( -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -891,6 +887,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/outpost/underground) "kt" = ( @@ -1133,6 +1132,9 @@ /obj/structure/cable/green{ icon_state = "6-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/outpost/underground) "nG" = ( @@ -1287,7 +1289,7 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/medical) "pl" = ( -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost/underground) "pt" = ( @@ -1408,8 +1410,7 @@ /area/rift/facility/interior/workroom) "qF" = ( /obj/random/obstruction, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1 +/obj/machinery/power/apc/alarms_hidden/north_mount{ }, /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -2143,10 +2144,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -2222,10 +2220,9 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/outpost) "As" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -2717,8 +2714,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/storage) "EU" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/underground) @@ -3397,7 +3394,7 @@ "NE" = ( /obj/machinery/space_heater, /obj/structure/railing, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-6" }, @@ -3773,10 +3770,9 @@ /turf/simulated/floor/outdoors/snow/lythios43c/indoors, /area/rift/surfacebase/outside/west_caves) "RG" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -3920,7 +3916,7 @@ /turf/simulated/wall, /area/rift/facility/interior/medical) "Tg" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance) @@ -4028,7 +4024,7 @@ /area/rift/surfacebase/outside/west_caves) "UH" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/outpost/mining_main/outpost/washrooms) "UN" = ( @@ -4463,6 +4459,12 @@ /obj/random/trash_pile, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/exterior/bunker/lower) +"Yy" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/mineral/icerock/lythios43c, +/area/rift/surfacebase/outside/west_caves/submap_seedzone) "YB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4476,7 +4478,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4510,7 +4512,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/west_caves) "YZ" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/storage) @@ -8620,7 +8622,7 @@ Sn Sn Sn Sn -Sn +Yy Sn Sn Sn @@ -33612,7 +33614,7 @@ be Iq qM qM -oI +pl oI Gr uL @@ -33621,7 +33623,7 @@ Sc oR hJ oI -oI +pl oI mW Iq diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm index d3c1182a4b..11eacbe0d0 100644 --- a/maps/rift/levels/rift-10-west_plains.dmm +++ b/maps/rift/levels/rift-10-west_plains.dmm @@ -391,11 +391,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/extinguisher_cabinet{ dir = 1; @@ -511,8 +508,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1105,10 +1101,9 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) "fj" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -1167,11 +1162,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/outpost) "fx" = ( @@ -1421,10 +1412,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab/airlock) "gG" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -1654,8 +1642,7 @@ /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/outside/west) "hz" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/borderfloor, @@ -2210,11 +2197,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "jU" = ( @@ -2229,10 +2212,7 @@ /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/outside/west) "jZ" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "ka" = ( @@ -2443,11 +2423,7 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/outpost/airlock/one) "kX" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -2503,8 +2479,7 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/surface) "lq" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3023,11 +2998,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "nK" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3113,8 +3084,7 @@ /area/outpost/mining_main/outpost/airlock/one) "ok" = ( /obj/structure/closet/firecloset, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled, @@ -3258,11 +3228,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "pi" = ( @@ -3525,11 +3491,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -3642,11 +3604,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/purple/full{ dir = 4 @@ -3800,10 +3758,7 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/facility/exterior) "rx" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -3825,10 +3780,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "rF" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/bed/chair/wood{ dir = 4 @@ -3987,11 +3939,7 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/facility/exterior) "st" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4611,10 +4559,9 @@ /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/mineshaft) "uU" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/facility/interior/surface) @@ -4782,11 +4729,8 @@ /turf/simulated/floor/lythios43c, /area/rift/facility/interior/surface) "vL" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -4837,9 +4781,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost/eva) "vW" = ( @@ -5065,11 +5007,7 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) "wV" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5363,8 +5301,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "yg" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/steel_dirty, @@ -5540,9 +5477,7 @@ dir = 4; pixel_x = -22 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "yZ" = ( @@ -5814,10 +5749,7 @@ /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/checkpoint/south) "Ao" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/light_switch{ dir = 8; @@ -5870,7 +5802,7 @@ dir = 1 }, /obj/machinery/door/firedoor{ - dir = 1; + dir = 4; req_one_access = list(18,47) }, /turf/simulated/floor/tiled, @@ -5891,9 +5823,7 @@ /turf/simulated/floor, /area/rnd/outpost/atmos) "AG" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "AL" = ( @@ -6081,8 +6011,7 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) "BS" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -6497,11 +6426,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1452; @@ -6511,10 +6436,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab/airlock) "DU" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) @@ -6645,11 +6569,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "EV" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6750,11 +6670,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor, /area/rnd/outpost/atmos) @@ -6968,11 +6885,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/corner/purple{ dir = 6 }, @@ -7268,11 +7181,7 @@ /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "HG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -7647,8 +7556,7 @@ /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/item/melee/umbrella/random, @@ -8386,8 +8294,8 @@ /area/rnd/outpost/anomaly_lab) "Na" = ( /obj/machinery/door/firedoor{ - dir = 8; - req_one_access = list(18,47) + req_one_access = list(18,47); + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -8399,10 +8307,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/portables_connector{ dir = 1 }, @@ -9508,8 +9413,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/corner/purple{ @@ -9529,11 +9433,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -9664,7 +9564,6 @@ dir = 8 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -9878,11 +9777,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rift/exterior/checkpoint/south) "TU" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9989,6 +9884,12 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) +"Ui" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/mineral/icerock/lythios43c, +/area/rift/surfacebase/outside/west) "Uj" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/tiled, @@ -10060,7 +9961,7 @@ dir = 4 }, /obj/machinery/door/firedoor{ - dir = 2; + dir = 4; req_one_access = list(18,47) }, /turf/simulated/floor/tiled, @@ -10430,10 +10331,7 @@ /turf/simulated/floor, /area/rnd/outpost/atmos) "WS" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -10851,9 +10749,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "YM" = ( @@ -10928,7 +10824,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -11049,11 +10945,7 @@ /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/exterior/mineshaft) "ZN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -16903,7 +16795,7 @@ PP PP PP PP -PP +Ui PP PP PP diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm index 885319f623..faec5a90a2 100644 --- a/maps/rift/levels/rift-11-orbital.dmm +++ b/maps/rift/levels/rift-11-orbital.dmm @@ -306,8 +306,8 @@ /area/holodeck/source_courtroom) "bf" = ( /obj/machinery/door/window/holowindoor{ - dir = 4; - name = "Red Team" + name = "Red Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) @@ -767,8 +767,8 @@ "cB" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; - dir = 4; - icon_state = "right" + icon_state = "right"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) @@ -789,7 +789,8 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Green Team" + name = "Green Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) @@ -1256,8 +1257,8 @@ /area/holodeck/source_meetinghall) "eg" = ( /obj/machinery/door/window/holowindoor{ - dir = 4; - name = "Red Team" + name = "Red Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_basketball) @@ -1272,8 +1273,8 @@ /area/holodeck/source_beach) "ej" = ( /obj/machinery/door/window/holowindoor{ - dir = 4; - name = "Red Team" + name = "Red Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_thunderdomecourt) @@ -1882,7 +1883,8 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Green Team" + name = "Green Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_basketball) @@ -1902,7 +1904,8 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Green Team" + name = "Green Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_thunderdomecourt) @@ -5397,7 +5400,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) "qn" = ( @@ -6195,7 +6198,7 @@ /area/centcom/simulated/medical) "sV" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, @@ -8413,7 +8416,7 @@ pixel_y = -28 }, /obj/structure/cable/green, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/cockpit) "KE" = ( @@ -8850,6 +8853,10 @@ /obj/structure/table/reinforced, /turf/unsimulated/floor/dark, /area/centcom/specops) +"OM" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/medical) "OY" = ( /obj/structure/bed/chair/backed_grey, /turf/simulated/floor/reinforced, @@ -8974,7 +8981,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) "QJ" = ( @@ -9538,7 +9545,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/plating, /area/centcom/specops) "Wt" = ( @@ -9853,7 +9860,7 @@ icon_state = "1-8" }, /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/centcom/specops/dock) "Zo" = ( @@ -9928,7 +9935,6 @@ /area/centcom/specops) "ZN" = ( /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_y = 30 }, @@ -21656,7 +21662,7 @@ nU pg nU nU -nU +OM qR nU nU diff --git a/maps/sectors/debrisfield_140/levels/debrisfield.dmm b/maps/sectors/debrisfield_140/levels/debrisfield.dmm index ed702d1a0a..b3cbde122e 100644 --- a/maps/sectors/debrisfield_140/levels/debrisfield.dmm +++ b/maps/sectors/debrisfield_140/levels/debrisfield.dmm @@ -139,9 +139,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/space/debrisfield/explored) "G" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 30 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-4" }, diff --git a/maps/sectors/debrisfield_192/levels/debrisfield.dmm b/maps/sectors/debrisfield_192/levels/debrisfield.dmm index 4098ebe5a8..507b0c14b1 100644 --- a/maps/sectors/debrisfield_192/levels/debrisfield.dmm +++ b/maps/sectors/debrisfield_192/levels/debrisfield.dmm @@ -110,9 +110,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/space/debrisfield/explored) "Bk" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 30 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-4" }, diff --git a/maps/sectors/frozen_140/levels/frozen_140.dmm b/maps/sectors/frozen_140/levels/frozen_140.dmm index d3ff1f11f4..c598c1ec59 100644 --- a/maps/sectors/frozen_140/levels/frozen_140.dmm +++ b/maps/sectors/frozen_140/levels/frozen_140.dmm @@ -564,7 +564,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "frozen"; - layer = 3.3; name = "Frozen Dock Controller"; pixel_y = 30 }, @@ -807,8 +806,7 @@ /area/class_p/facility) "Lq" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/power/apc/east_mount{ pixel_x = 32; req_access = null; start_charge = 0 diff --git a/maps/sectors/frozen_192/levels/frozen_192.dmm b/maps/sectors/frozen_192/levels/frozen_192.dmm index 713766fd50..19aac97b65 100644 --- a/maps/sectors/frozen_192/levels/frozen_192.dmm +++ b/maps/sectors/frozen_192/levels/frozen_192.dmm @@ -563,7 +563,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "frozen"; - layer = 3.3; name = "Frozen Dock Controller"; pixel_y = 30 }, @@ -869,8 +868,7 @@ /area/class_p/unexplored) "Sj" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/power/apc/east_mount{ pixel_x = 32; req_access = null; start_charge = 0 diff --git a/maps/sectors/gaia_140/levels/gaia_140.dmm b/maps/sectors/gaia_140/levels/gaia_140.dmm index c097bf844a..d6a195307c 100644 --- a/maps/sectors/gaia_140/levels/gaia_140.dmm +++ b/maps/sectors/gaia_140/levels/gaia_140.dmm @@ -374,7 +374,7 @@ /turf/simulated/floor/tiled/dark, /area/class_m/inside) "iO" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /obj/machinery/light{ dir = 8 }, @@ -628,7 +628,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "gaia_1"; - layer = 3.3; name = "Gaia Dock Controller"; pixel_y = 30 }, @@ -730,7 +729,7 @@ /turf/simulated/floor/outdoors/dirt/classm, /area/class_m/outside) "qX" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/class_m/inside) "qY" = ( @@ -741,7 +740,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "gaia_2"; - layer = 3.3; name = "Gaia Dock Controller"; pixel_y = 30 }, diff --git a/maps/sectors/gaia_192/levels/gaia_192.dmm b/maps/sectors/gaia_192/levels/gaia_192.dmm index 14f20e7084..03319d0657 100644 --- a/maps/sectors/gaia_192/levels/gaia_192.dmm +++ b/maps/sectors/gaia_192/levels/gaia_192.dmm @@ -146,7 +146,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "aV" = ( /obj/structure/fence, @@ -161,6 +161,10 @@ }, /turf/simulated/floor/tiled/white, /area/class_m/outside) +"aX" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside/beach) "aZ" = ( /obj/structure/table/hardwoodtable, /turf/simulated/floor/concrete/rng/classm/outdoors, @@ -490,13 +494,14 @@ /turf/simulated/floor/concrete/tile/indoors, /area/class_m/inside/hotspringcaves) "cI" = ( -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 10 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "cJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -544,6 +549,13 @@ }, /turf/simulated/floor/tiled/white, /area/class_m/outside) +"cP" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "cR" = ( /obj/effect/floor_decal/corner/blue/border, /obj/machinery/sleeper{ @@ -605,10 +617,20 @@ }, /turf/simulated/floor/tiled/monowhite, /area/class_m/inside/garage) +"dq" = ( +/obj/effect/floor_decal/river_beach_edge, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "dw" = ( /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/concrete/rng/classm/outdoors, /area/class_m/outside) +"dy" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "dA" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, @@ -735,7 +757,7 @@ /area/class_m/outside) "es" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) "ew" = ( /mob/living/simple_mob/animal/passive/fish/javelin, @@ -769,9 +791,10 @@ dir = 4 }, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 8 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "eK" = ( /obj/effect/mist, @@ -984,6 +1007,10 @@ /mob/living/simple_mob/animal/passive/fish/salmon, /turf/simulated/floor/water/deep/classm, /area/class_m/outside) +"fM" = ( +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "fO" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 @@ -996,7 +1023,7 @@ /area/class_m/inside/bathroom) "fP" = ( /mob/living/simple_mob/animal/passive/fish/perch, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/deep/classm, /area/class_m/outside) "fU" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -1020,10 +1047,6 @@ "gd" = ( /turf/simulated/floor/water/beach, /area/class_m/outside/island2) -"ge" = ( -/obj/structure/catwalk, -/turf/simulated/floor/water/classm, -/area/class_m/outside) "gi" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_alc{ @@ -1212,6 +1235,9 @@ /obj/structure/fence, /turf/simulated/floor/outdoors/dirt/classm/outdoors, /area/class_m/outside) +"hr" = ( +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beachmiddle) "hs" = ( /turf/simulated/floor/water/beach{ dir = 1 @@ -1270,6 +1296,12 @@ }, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"hM" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 5 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "hQ" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -1298,9 +1330,9 @@ /area/class_m/outside/island2) "ia" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "ic" = ( /obj/machinery/vending/wallmed1{ @@ -1337,9 +1369,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "ii" = ( /obj/structure/railing/grey, @@ -1360,13 +1393,14 @@ /turf/simulated/floor/wood/classm, /area/class_m/inside/sauna) "il" = ( -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "im" = ( /obj/machinery/holoposter{ @@ -1385,9 +1419,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 10 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "iq" = ( /obj/structure/table/bench/wooden, @@ -1456,6 +1491,15 @@ }, /turf/simulated/floor/tiled/monotile/classm, /area/class_m/inside/main) +"iH" = ( +/obj/structure/flora/ausbushes/reedbush, +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/water/deep/classm, +/area/class_m/outside) "iM" = ( /obj/structure/railing/grey{ dir = 8 @@ -1466,9 +1510,10 @@ /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside/beachmiddle) "iO" = ( -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) "iP" = ( /obj/structure/flora/tree/palm, @@ -1488,8 +1533,12 @@ /area/class_m/outside/beachmiddle) "iS" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) +"iT" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "iW" = ( /turf/simulated/floor/water/beach/corner{ dir = 4 @@ -1675,11 +1724,12 @@ /turf/simulated/floor/tiled/white, /area/class_m/outside) "jI" = ( -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 5 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "jJ" = ( /obj/structure/table/woodentable, @@ -1731,6 +1781,13 @@ /mob/living/simple_mob/animal/passive/bird/ringneck_dove, /turf/simulated/floor/outdoors/grass, /area/class_m/outside) +"jS" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "jV" = ( /obj/effect/floor_decal/corner/blue/border{ dir = 5 @@ -1747,9 +1804,9 @@ /turf/simulated/floor/wood/classm/outdoors, /area/class_m/outside/docks) "jY" = ( -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "jZ" = ( /turf/simulated/floor/tiled/white, @@ -1782,7 +1839,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "kj" = ( /obj/structure/flora/ausbushes/ywflowers, @@ -1795,6 +1852,10 @@ }, /turf/simulated/wall/classm, /area/class_m/outside) +"kl" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "ko" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 4 @@ -1809,7 +1870,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "kr" = ( /obj/machinery/button/remote/airlock{ @@ -2010,10 +2071,11 @@ /turf/simulated/floor/water/deep/classm, /area/class_m/outside) "le" = ( -/obj/structure/catwalk, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 8 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "lf" = ( /obj/machinery/door/window/northright{ @@ -2092,7 +2154,7 @@ /area/class_m/outside) "lq" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) "lt" = ( /obj/effect/floor_decal/corner/blue/border, @@ -2230,7 +2292,7 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "mm" = ( /obj/structure/flora/ausbushes/fernybush, @@ -2655,9 +2717,10 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 5 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "oI" = ( /obj/item/stack/material/log{ @@ -2682,6 +2745,10 @@ /obj/structure/salvageable/server, /turf/simulated/floor/tiled/steel_dirty, /area/class_m/inside) +"oM" = ( +/obj/effect/floor_decal/river_beach_edge, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "oO" = ( /obj/structure/bed/double/padded, /obj/item/bedsheet/rddouble, @@ -2726,6 +2793,15 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside/beachmiddle) +"pa" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 4 + }, +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beachmiddle) "pd" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood/classm, @@ -2736,7 +2812,7 @@ /area/class_m/outside) "pg" = ( /mob/living/simple_mob/animal/passive/fish/trout, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "pk" = ( /obj/structure/flora/tree/palm, @@ -2793,6 +2869,19 @@ /obj/structure/railing/grey, /turf/simulated/floor/concrete/rng/classm/outdoors, /area/class_m/outside) +"pz" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/river_beach_edge{ + dir = 8 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) +"pB" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 6 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "pE" = ( /obj/structure/railing/grey{ dir = 8 @@ -2899,9 +2988,10 @@ /area/class_m/outside/docks) "qi" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 6 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "qj" = ( /obj/structure/flora/ausbushes/genericbush, @@ -2965,9 +3055,10 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 1 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "qy" = ( /obj/vehicle/ridden/gokart/random{ @@ -3461,9 +3552,10 @@ /area/class_m/outside/beach) "sY" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "sZ" = ( /obj/machinery/light/flamp/noshade{ @@ -3495,9 +3587,13 @@ }, /turf/simulated/floor/outdoors/grass, /area/class_m/outside) +"tl" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/deep/classm, +/area/class_m/outside) "tm" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "tn" = ( /obj/structure/table/rack, @@ -3562,9 +3658,10 @@ dir = 1; nightshift_allowed = 0 }, -/turf/simulated/floor/water/beach/corner{ - dir = 1 +/obj/effect/floor_decal/river_beach_edge{ + dir = 8 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "ty" = ( /obj/machinery/light/flamp/noshade{ @@ -3587,9 +3684,10 @@ /area/class_m/inside) "tE" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "tF" = ( /turf/simulated/floor/outdoors/grass/classm, @@ -3604,7 +3702,7 @@ /area/class_m/inside/dorms) "tJ" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) "tL" = ( /obj/effect/map_effect/interval/effect_emitter/steam, @@ -3714,7 +3812,7 @@ /area/class_m/outside) "ui" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "uq" = ( /obj/structure/closet/crate/trashcart, @@ -3775,6 +3873,9 @@ "uP" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/class_m/outside) +"uQ" = ( +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "uR" = ( /obj/structure/railing{ dir = 1 @@ -3802,6 +3903,10 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/outdoors/grass, /area/class_m/outside) +"uZ" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "vb" = ( /obj/item/clothing/head/cone, /turf/simulated/floor/tiled/monowhite, @@ -3809,6 +3914,10 @@ "vd" = ( /turf/simulated/floor/carpet/purcarpet, /area/class_m/inside/dorms) +"ve" = ( +/mob/living/simple_mob/animal/passive/fish/salmon, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "vg" = ( /obj/structure/catwalk, /obj/structure/railing, @@ -3935,9 +4044,9 @@ /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) "vU" = ( +/obj/structure/flora/ausbushes/reedbush, /obj/structure/catwalk, -/obj/structure/railing, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "vX" = ( /obj/machinery/light/flamp/noshade{ @@ -4000,13 +4109,13 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "wo" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/deep/classm, /area/class_m/outside) "wq" = ( /obj/effect/floor_decal/corner/blue/border{ @@ -4124,6 +4233,10 @@ dir = 4 }, /area/class_m/inside) +"wR" = ( +/obj/effect/floor_decal/river_beach_corner_edge, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beach) "wT" = ( /obj/structure/table/bench/marble, /obj/effect/mist, @@ -4195,7 +4308,7 @@ /area/class_m/inside/garage) "xp" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside/beach) "xr" = ( /obj/machinery/light{ @@ -4320,6 +4433,10 @@ /obj/machinery/bodyscanner, /turf/simulated/floor/tiled/white, /area/class_m/outside) +"yd" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "ye" = ( /obj/structure/fence{ name = "vollyball net"; @@ -4336,8 +4453,12 @@ /area/class_m/outside/beachmiddle) "ym" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) +"yn" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "yr" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -4369,9 +4490,10 @@ /area/class_m/inside/cabin) "yv" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 1 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "yw" = ( /obj/structure/railing/grey{ @@ -4610,13 +4732,14 @@ /turf/simulated/floor/wood/classm, /area/class_m/inside) "zE" = ( -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 1 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "zG" = ( /obj/structure/bed/chair/sofa/black/corner{ @@ -4684,11 +4807,11 @@ /turf/simulated/wall/classm, /area/class_m/inside/bathroom) "zU" = ( -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/deep/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "zV" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -4791,6 +4914,13 @@ /obj/structure/flora/ausbushes/genericbush, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside/beachmiddle) +"Ay" = ( +/obj/machinery/light/spot{ + dir = 1; + nightshift_allowed = 0 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "Az" = ( /obj/machinery/vending/fishing, /obj/effect/floor_decal/spline/plain{ @@ -4816,7 +4946,7 @@ "AE" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/catwalk, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "AG" = ( /obj/machinery/light/flamp/noshade{ @@ -4884,7 +5014,7 @@ /obj/machinery/light/spot{ nightshift_allowed = 0 }, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Bb" = ( /obj/structure/table/marble, @@ -4920,6 +5050,16 @@ "Bi" = ( /turf/simulated/floor/water/beach, /area/class_m/outside/beachmiddle) +"Bk" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "Bm" = ( /obj/structure/railing/grey{ dir = 4 @@ -4952,6 +5092,10 @@ }, /turf/simulated/floor/water/deep/classm, /area/class_m/outside) +"Br" = ( +/obj/effect/floor_decal/river_beach_corner_edge, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "Bu" = ( /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/outdoors/grass/classm, @@ -5002,6 +5146,9 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"BF" = ( +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside/beachmiddle) "BG" = ( /obj/structure/table/woodentable, /turf/simulated/floor/outdoors/beach/sand/desert/classm{ @@ -5108,9 +5255,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 1 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Cm" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -5150,9 +5298,10 @@ /obj/machinery/light/flamp/noshade{ nightshift_allowed = 0 }, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 4 }, +/turf/simulated/floor/water/river/west/outdoors, /area/class_m/outside) "Cx" = ( /obj/machinery/light/spot{ @@ -5222,7 +5371,8 @@ /obj/machinery/light/flamp/noshade{ nightshift_allowed = 0 }, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "CV" = ( /obj/machinery/light/flamp/noshade{ @@ -5244,9 +5394,10 @@ /area/class_m/outside) "CZ" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 9 }, +/turf/simulated/floor/water/river/west/outdoors, /area/class_m/outside) "Da" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -5311,6 +5462,12 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/main) +"Dy" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 8 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beachmiddle) "Dz" = ( /obj/structure/flora/ausbushes/genericbush, /obj/structure/railing/grey{ @@ -5323,9 +5480,10 @@ dir = 4 }, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "DC" = ( /obj/machinery/door/airlock{ @@ -5342,6 +5500,11 @@ /obj/machinery/gear_painter, /turf/simulated/floor/wood/classm, /area/class_m/inside) +"DG" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "DI" = ( /obj/machinery/tele_projector{ dir = 4 @@ -5486,11 +5649,12 @@ /turf/simulated/floor/concrete/rng/classm/outdoors, /area/class_m/outside) "Ew" = ( -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 8 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Ey" = ( /turf/simulated/floor/tiled/classm, @@ -5504,7 +5668,13 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) +"EA" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 9 + }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "EE" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -5562,7 +5732,7 @@ /area/class_m/inside) "EU" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) "EW" = ( /obj/effect/floor_decal/spline/plain{ @@ -5573,7 +5743,7 @@ dir = 1; nightshift_allowed = 0 }, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "EX" = ( /obj/machinery/vending/wallmed1{ @@ -5600,6 +5770,12 @@ }, /turf/simulated/floor/tiled/classm/outdoors, /area/class_m/outside/beachmiddle) +"Fj" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 6 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beach) "Fk" = ( /obj/machinery/appliance/cooker/oven, /obj/machinery/light/spot{ @@ -5610,7 +5786,7 @@ /area/class_m/inside/main) "Fs" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) "Fx" = ( /obj/item/stool/padded, @@ -5648,6 +5824,9 @@ }, /turf/simulated/floor/tiled/monotile/classm, /area/class_m/inside/main) +"FI" = ( +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside/beach) "FJ" = ( /obj/machinery/light_switch{ dir = 4; @@ -5731,9 +5910,10 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Gl" = ( /obj/machinery/vending/fishing, @@ -5983,7 +6163,7 @@ /turf/simulated/floor/wood/classm, /area/class_m/inside/dorms) "HI" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /obj/machinery/light/spot{ dir = 8; nightshift_allowed = 0 @@ -5999,7 +6179,7 @@ "HN" = ( /obj/structure/flora/ausbushes/reedbush, /obj/structure/catwalk, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "HQ" = ( /obj/structure/railing{ @@ -6140,7 +6320,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/stalkybush, /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "IG" = ( /obj/structure/bed/chair/comfy/black{ @@ -6229,8 +6409,14 @@ /area/class_m/inside/dorms) "Je" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) +"Jg" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 10 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "Ji" = ( /obj/structure/table/bench/marble, /obj/effect/mist, @@ -6299,6 +6485,10 @@ dir = 8 }, /area/class_m/outside/island) +"Js" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/water/deep/classm, +/area/class_m/outside) "Jt" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet, @@ -6352,6 +6542,12 @@ name = "beach" }, /area/class_m/outside/beachmiddle) +"JU" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 1 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "JV" = ( /obj/structure/catwalk, /obj/structure/railing, @@ -6372,6 +6568,13 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/dorms) +"JZ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "Ka" = ( /obj/structure/railing/grey{ dir = 1 @@ -6435,6 +6638,9 @@ /obj/structure/flora/tree/jungle_small, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"Ku" = ( +/turf/simulated/floor/water/river/deep/west/outdoors, +/area/class_m/outside) "Kw" = ( /obj/item/stool/padded, /turf/simulated/floor/concrete/tile/classm/outdoors{ @@ -6478,11 +6684,12 @@ /turf/simulated/floor/tiled/white, /area/class_m/outside) "Kz" = ( -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 8 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "KC" = ( /obj/machinery/door/airlock{ @@ -6493,9 +6700,10 @@ /area/class_m/inside/dorms) "KE" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 8 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "KF" = ( /obj/machinery/door/airlock{ @@ -6635,6 +6843,12 @@ outdoors = 1 }, /area/class_m/outside) +"Ll" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "Lo" = ( /obj/item/stool/padded, /obj/item/stool/padded, @@ -6682,7 +6896,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "gaia_1"; - layer = 3.3; name = "Gaia Dock Controller"; pixel_y = 30 }, @@ -6758,6 +6971,9 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/main) +"LT" = ( +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "LU" = ( /obj/machinery/light/flamp/noshade{ nightshift_allowed = 0 @@ -6796,24 +7012,20 @@ /turf/simulated/floor/tiled/classm/outdoors, /area/class_m/outside) "Ma" = ( -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) +"Mb" = ( +/obj/structure/railing, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "Mc" = ( /obj/structure/flora/rock, /turf/simulated/floor/outdoors/dirt/classm/outdoors, /area/class_m/outside) -"Me" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/water/classm, -/area/class_m/outside) "Mg" = ( /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/water/deep/classm, @@ -6894,6 +7106,16 @@ }, /turf/simulated/floor/tiled/white, /area/class_m/inside/bathroom) +"MI" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) +"MJ" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "MQ" = ( /mob/living/simple_mob/animal/passive/fish/solarfish, /turf/simulated/floor/water/classm, @@ -6928,13 +7150,6 @@ /obj/structure/kitchenspike, /turf/simulated/floor/tiled/freezer, /area/class_m/inside/main) -"MX" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/water/classm, -/area/class_m/outside) "Na" = ( /obj/structure/flora/tree/jungle, /mob/living/simple_mob/animal/passive/bird/black_bird, @@ -6987,6 +7202,10 @@ dir = 1 }, /area/class_m/outside/island) +"Np" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "Nt" = ( /obj/structure/railing/grey{ dir = 4 @@ -7041,6 +7260,10 @@ "NJ" = ( /turf/simulated/floor/concrete/classm/outdoors, /area/class_m/outside/beachmiddle) +"NL" = ( +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "NM" = ( /obj/machinery/computer/security/telescreen{ pixel_y = 45 @@ -7492,6 +7715,9 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass, /area/class_m/outside) +"OR" = ( +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beach) "OU" = ( /obj/structure/flora/ausbushes/sparsegrass, /mob/living/simple_mob/animal/passive/bird/european_robin, @@ -7628,9 +7854,18 @@ }, /turf/simulated/floor/concrete/tile/classm/outdoors, /area/class_m/outside) +"PM" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 8 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "PN" = ( /turf/simulated/floor/water/deep/classm, /area/class_m/outside/docks) +"PP" = ( +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "PQ" = ( /obj/structure/bed/chair{ dir = 4; @@ -7653,6 +7888,12 @@ /obj/structure/railing, /turf/simulated/floor/tiled/classm/outdoors, /area/class_m/outside) +"PV" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 6 + }, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "PZ" = ( /obj/effect/overlay/coconut, /turf/simulated/floor/outdoors/beach/sand/desert/classm{ @@ -7691,9 +7932,16 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 10 }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) +"Qo" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/west/outdoors, /area/class_m/outside) "Qp" = ( /turf/simulated/floor/concrete/tile/classm/outdoors{ @@ -7787,9 +8035,10 @@ /area/class_m/inside/main) "QX" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 9 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Rb" = ( /obj/machinery/appliance/mixer/candy, @@ -7827,7 +8076,7 @@ "Rh" = ( /obj/structure/flora/ausbushes/stalkybush, /obj/structure/catwalk, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Rm" = ( /obj/structure/table/marble, @@ -7958,6 +8207,10 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/sauna) +"RX" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "RY" = ( /obj/structure/flora/tree/jungle, /turf/simulated/floor/outdoors/grass, @@ -7983,9 +8236,10 @@ /turf/simulated/floor/wood/classm, /area/class_m/inside/main) "Se" = ( -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 9 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) "Sg" = ( /turf/simulated/floor/concrete/tile/classm/outdoors{ @@ -8010,7 +8264,7 @@ /turf/simulated/floor/outdoors/grass, /area/class_m/outside) "Sl" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/class_m/inside/main) "Sn" = ( @@ -8052,6 +8306,13 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"Sy" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "Sz" = ( /obj/machinery/shower{ dir = 1 @@ -8065,6 +8326,12 @@ }, /turf/simulated/floor/tiled/white, /area/class_m/inside/bathroom) +"SD" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 8 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "SE" = ( /obj/structure/flora/rock, /turf/simulated/floor/outdoors/beach/sand/desert/classm{ @@ -8297,14 +8564,6 @@ }, /turf/simulated/floor/concrete/tile/classm/outdoors, /area/class_m/outside) -"TS" = ( -/obj/structure/fence{ - dir = 4 - }, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/outdoors/grass/classm, -/area/class_m/outside) "TT" = ( /obj/structure/railing{ dir = 4 @@ -8690,16 +8949,22 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/main) +"WD" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 9 + }, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "WE" = ( /turf/simulated/floor/concrete/indoors, /area/class_m/inside/hotspringcaves) "WJ" = ( /obj/structure/flora/ausbushes/stalkybush, -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "WN" = ( /turf/simulated/floor/concrete/rng/classm/outdoors, @@ -8736,9 +9001,14 @@ /area/class_m/outside) "WU" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 5 }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) +"WZ" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Xa" = ( /obj/structure/fence/corner{ @@ -8751,6 +9021,10 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"Xc" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "Xd" = ( /obj/structure/fence/door, /turf/simulated/floor/concrete/tile/classm/outdoors, @@ -8760,9 +9034,11 @@ icon_state = "concrete17" }, /area/class_m/outside/beachmiddle) -"Xh" = ( -/obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/deep/classm, +"Xi" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Xm" = ( /obj/machinery/light/flamp/noshade{ @@ -8793,7 +9069,7 @@ "Xs" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "Xt" = ( /turf/simulated/floor/water/beach{ @@ -8879,7 +9155,8 @@ /obj/machinery/light/flamp/noshade{ nightshift_allowed = 0 }, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "Yb" = ( /obj/structure/fence, @@ -8949,9 +9226,10 @@ /area/class_m/outside) "Yy" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 10 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "YE" = ( /obj/machinery/door/airlock/glass{ @@ -9016,6 +9294,10 @@ }, /turf/simulated/floor/concrete/rng/classm/outdoors, /area/class_m/outside) +"YS" = ( +/obj/effect/floor_decal/river_beach_corner_edge, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "YT" = ( /obj/structure/table/marble, /turf/simulated/floor/wood/classm, @@ -9051,7 +9333,7 @@ /area/class_m/outside/island) "Zb" = ( /obj/structure/flora/ausbushes, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "Zc" = ( /obj/structure/window/reinforced/full, @@ -9176,6 +9458,12 @@ /mob/living/simple_mob/animal/passive/fish/koi, /turf/simulated/floor/water/deep/classm, /area/class_m/outside) +"ZX" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 1 + }, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) (1,1,1) = {" If @@ -16875,7 +17163,7 @@ nB nB nB nB -Od +wR Ma ka Sa @@ -17066,11 +17354,11 @@ nB nB nB nB -Od +wR Ma Ma -ka -Sa +Fj +OR Sa Sa Sa @@ -17258,13 +17546,13 @@ Lp nB qY nB -Od +wR Ma -ka -Sa -Sa +Fj +OR +OR EU -Sa +OR Sa Bg Bg @@ -17451,14 +17739,14 @@ Lp Lp nB nB -Od -ka -Sa +wR +Fj +OR iS -Sa +OR Fs -Bg -Bg +OR +OR Bg Bg Bg @@ -17644,15 +17932,15 @@ Lp Lp Lp nB -Od -ka -Sa -Sa -Sa -Bg -Bg -Bg -LE +wR +Fj +OR +OR +OR +OR +OR +OR +Fs Bg Bg Bg @@ -17837,16 +18125,16 @@ Lp Lp QL Lp -Od -ka +wR +Fj iS -Sa -Bg -Bg -Bg -Bg -Bg -Bg +OR +OR +OR +OR +OR +FI +FI Bg Bg Bg @@ -18030,17 +18318,17 @@ Lp Lp Lp Lp -SQ -ka -Sa +YS +Fj +OR Fs -Bg -Bg -Bg +OR +OR +OR xp -Bg -Bg -Bg +FI +FI +FI Bg LE Bg @@ -18223,18 +18511,18 @@ Lp Lp oJ Lp -SQ -xT +YS +pB es -Sa -Bg -Bg -Bg -Bg -dO -dO -dO -dO +OR +OR +OR +FI +FI +BF +hr +hr +hr dO dO dO @@ -18417,18 +18705,18 @@ Lp Lp Lp Lp -Tl -hi -Sa -Bg -LE -Bg -dO -dO +dq +RX +OR +OR +aX +FI +BF +hr lq -dO +hr tJ -dO +hr dO dO dO @@ -18610,19 +18898,19 @@ Lp Lp Lp Lp -SQ -xT -VF -Bg -Bg -dO -dO +YS +pB +LT +OR +FI +BF +hr ym Je -dO -gG -gG -gG +hr +hr +hr +hr gG gG gG @@ -18803,20 +19091,20 @@ Lp Lp oJ Lp -SQ -xT -dD -Xw -Bg -dO -dO -dO -dO -dO -gG -gG +YS +pB +tm +LT +FI +BF +hr +hr +hr +hr +hr +hr Se -Hs +Dy Hs Hs Pi @@ -18996,19 +19284,19 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -dO -dO -dO -dO -gG -gG +YS +pB +LT +LT +PP +BF +hr +hr +hr +hr +hr Se -Hs +Dy iO jC jC @@ -19076,14 +19364,14 @@ gp Lp sk Lp -SQ -Sp -Sp -Sp -Sp -Sp -Sp -vZ +YS +Xi +Xi +Xi +Xi +Xi +Xi +PM Lp QL Lp @@ -19151,17 +19439,17 @@ Lp Lp Lp Lp -SQ -Sp -Sp -Sp -Sp -Sp -Sp +YS +Xi +Xi +Xi +Xi +Xi +Xi il -sY -sY -sY +Sy +Sy +Sy Ew fZ hQ @@ -19188,20 +19476,20 @@ Lp Gq QL Lp -SQ -Sp -xT -VF -Xw -Xw -Xw -dO -dO +YS +Xi +pB +LT +LT +PP +PP +hr +hr lq -gG +hr Se -Hs -iO +Dy +pa jC jC jC @@ -19267,19 +19555,19 @@ Bg "} (53,1,1) = {" gp -SQ -Sp -Sp -xT -LO -VF -VF -VF -VF -VF -Xt -Sp -vZ +YS +Xi +Xi +pB +NL +PP +PP +PP +PP +PP +hM +Xi +PM Lp cx rj @@ -19343,19 +19631,19 @@ Lp oJ QL Lp -SQ -Sp -xT -VF -VF -VF -dD -VF -VF +YS +Xi +pB +LT +LT +LT +tm +LT +LT WJ -ge +fM AE -ge +fM jI tE hQ @@ -19381,17 +19669,17 @@ Lp Lp Lp Lp -SQ -xT -VF -Ve -Xw -Xw -Xw +YS +pB +LT +WZ +LT +PP +PP tm -dO -dO -gG +hr +hr +hr Se iO jC @@ -19462,18 +19750,18 @@ Bg (54,1,1) = {" DA qi -LO -VF -Ve -VF -VF -VF +NL +PP +MI +PP +PP +PP pg -VF -VF -VF -Ve -Xt +PP +PP +PP +MI +hM ig Gk KE @@ -19536,28 +19824,28 @@ Lp Lp Lp Lp -SQ -xT -VF -dD -VF -VF -hi -VF -Xw -Xw +YS +pB +LT +tm +LT +LT +RX +LT +LT +LT zU -ui -ui +fM +fM Rh -jY -VF +Mb +LT hQ XG gj -Sp -Sp -vZ +Xi +Xi +PM Lp Lp Lp @@ -19572,19 +19860,19 @@ Lp Lp Lp Lp -SQ -Sp -Sp -xT -fU -VF -Xw -Xw -Xw -Xw -Xw -gG -gG +YS +Xi +Xi +pB +uZ +LT +LT +PP +PP +LT +LT +hr +hr Se iO jC @@ -19656,20 +19944,20 @@ Bg (55,1,1) = {" aU Xs -VF -VF -VF -VF -VF -VF -Ve -VF -VF -VF -VF +PP +PP +PP +PP +PP +PP +MI +PP +PP +PP +PP XZ -Me -ge +Bk +ui WU sY KE @@ -19729,55 +20017,55 @@ Lp Lp Lp Lp -SQ -xT -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -zU -ui +YS +pB +LT +LT +LT +LT +LT +PP +PP +PP +PP +JZ ui -ui -vU -VF +fM +fM +Mb +LT hQ XG gj -VF -VF -Xt -Sp -Sp -Sp -vZ +LT +LT +hM +Xi +Xi +Xi +PM Lp Lp Lp Lp Gq Lp -SQ -Sp -Sp -Sp -xT -VF -VF -dD -Xh -Xw +YS +Xi +Xi +Xi +pB +LT +LT tm -Xw -Xw -Xw -VF -gG +WZ +PP +Np +PP +LT +LT +LT +hr Se iO jC @@ -19850,22 +20138,22 @@ Bg (56,1,1) = {" kp Zb -VF -fU -VF -hi -VF -VF -VF -VF -VF -VF +PP +yn +PP +iT +PP +PP +PP +PP +PP +PP kh -Me -ge -ge -HN -ge +Bk +ui +ui +vU +ui WU sY KE @@ -19921,56 +20209,56 @@ Lp Lp Lp Lp -SQ -Sp -xT -dD -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -zU +YS +Xi +pB +tm +LT +LT +PP +PP +PP +PP +PP +PP +PP +JZ ui ui ui -vU -Xw +Mb +LT hQ XG gj -VF -VF -VF -dD -VF -VF -Xt -Sp -Sp -Sp -Sp -Sp -Sp -xT -dD -VF -VF -VF -hi -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -hi +LT +LT +LT +tm +LT +LT +hM +Xi +Xi +Xi +Xi +Xi +Xi +pB +tm +LT +LT +LT +RX +LT +LT +PP +PP +PP +LT +LT +LT +RX Se iO jC @@ -20043,25 +20331,25 @@ Bg "} (57,1,1) = {" aU -hi -Ve -VF +iT +MI +PP Zb -Jp -Xp -Xp -Xp -Xp -Xp +EA +SD +SD +SD +SD +SD ip Ez -ge -ge -ge -ge -ge -ge -ge +ui +ui +ui +ui +ui +ui +fM oG nv Sp @@ -20114,57 +20402,57 @@ Lp Lp oJ Lp -SQ -xT -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw +YS +pB +LT +LT +LT +PP +PP +PP +PP +LT +LT +LT +LT AY zU +fM +fM ui -ui -ui -vU +jY EW hQ XG gj -jE -Xw -VF -VF -VF -dD -VF -hi -VF -VF -VF -Ve -VF -VF -VF -Xw -Xh -Xw -Xw -Xw -Xw -Xw -Xw -Xw -dD -VF -Ve -Jp +Ay +LT +LT +LT +LT +tm +LT +RX +LT +LT +LT +WZ +LT +LT +LT +LT +WZ +LT +LT +LT +PP +PP +LT +LT +tm +LT +WZ +EA iO jC jC @@ -20238,10 +20526,10 @@ Bg (58,1,1) = {" IF QX -Xp -Xp -Xp -vk +SD +SD +SD +dy Lp SE Lp @@ -20249,15 +20537,15 @@ Gq cx qw Yy -Rh -ge -ge -ge -ge -ge -ml +DG +ui +ui +ui +ui +ui +iH wo -VF +Xw hi Xt Sp @@ -20306,59 +20594,59 @@ Lp Lp Lp Lp -SQ -Sp -xT -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -VF -dD -MX -ge -ui -ui -vU -Xw +YS +Xi +pB +LT +LT +LT +PP +PP +PP +LT +LT +LT +LT +LT +LT +tm +zU +fM +fM +fM +jY +PP hQ XG gj -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Ve -VF -VF +PP +PP +PP +PP +LT +LT +LT +LT +WZ +LT +LT tm -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw +LT +LT +LT +PP +PP +PP +PP +PP +PP tm -VF -VF -Jp -Xp -Xp -vk +LT +LT +EA +SD +SD +dy jC jC jC @@ -20431,7 +20719,7 @@ Bg "} (59,1,1) = {" eJ -vk +dy Lp SE Lp @@ -20443,16 +20731,16 @@ cx Cv Vz yv -le +pz Yy -ge -ge -ge +ui +ui +ui wl wo -VF -VF -VF +Xw +Xw +Xw Ve VF Xt @@ -20499,57 +20787,57 @@ tF Lp Lp Lp -SQ -xT -VF -dD -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Ve -VF -VF -Jp -Xp +YS +pB +LT +tm +LT +LT +PP +PP +LT +LT +LT +LT +WZ +LT +LT +EA +SD cI HN -ge -ge +fM +fM ia -Xw +LT hQ XG gj -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw +LT +LT +LT +PP +PP +PP +PP +LT +LT +LT +LT +LT +PP +PP +PP +PP +PP tm -Xw -Ve -hi -VF -Jp -Xp -vk +LT +WZ +RX +LT +EA +SD +dy Lp Lp Lp @@ -20640,14 +20928,14 @@ Vz Vz yv Yy -ge +ui ml CU -VF -VF -VF -VF -VF +Xw +Xw +Xw +Xw +Xw VF VF Xt @@ -20693,55 +20981,55 @@ Lp Lp Lp Lp -Tl -hi -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -dD -VF -Jp -Xp -Xp -vk +dq +RX +LT +LT +LT +PP +PP +LT +LT +LT +tm +LT +EA +SD +SD +dy Lp zE le le -Yy -jY -VF +jS +Mb +LT hQ XG gj -Xw -Xw -Xw -Xw -Xw -Xw +LT +LT +LT +LT +LT +LT +Np +PP +PP +PP +PP +PP +PP +LT +LT +LT +LT +LT tm -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -VF -dD -Jp -Xp -Xp -vk +EA +SD +SD +dy Lp Lp Lp @@ -20835,13 +21123,13 @@ Vz Vz yv Ql -wo -VF -VF -VF -VF -VF -VF +Ll +PP +Xw +Xw +Xw +Xw +Xw VF hi VF @@ -20886,20 +21174,20 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -Ve -Jp -Xp -vk +Br +PV +LT +LT +LT +PP +PP +PP +LT +LT +WZ +EA +SD +dy Lp Lp Lp @@ -20907,32 +21195,32 @@ Lp nn Vz Vz -yv +cP Kz -Xp +SD hQ XG gj -VF -dD -hi -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -VF -Ve -Jp -Xp -vk +LT +tm +RX +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +WZ +EA +SD +dy Lp Lp Lp @@ -21029,14 +21317,14 @@ DE Vz FQ Cj -RE -VF -VF -VF -Ve +LT +PP +Xw +Xw +tl +Xw +Xw Xw -VF -VF VF VF Xt @@ -21079,19 +21367,19 @@ tF Gq Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -Jp -Xp -vk +Br +PV +uQ +uQ +LT +PP +PP +PP +LT +LT +EA +SD +dy Lp Lp Lp @@ -21107,24 +21395,24 @@ Lp hQ XG gj -RE -Ve -VF -VF -VF -VF -Xw -Xh -Xw -VF -Ve -hi -VF -Jp -Xp -Xp -Xp -vk +LT +WZ +LT +LT +LT +LT +LT +WZ +LT +LT +WZ +RX +LT +EA +SD +SD +SD +dy Lp Gq Lp @@ -21224,10 +21512,10 @@ aF Yo SE Tl -hi -fU -VF -VF +iT +Js +Xw +Xw Xw fG Xw @@ -21273,17 +21561,17 @@ Lp Lp Lp Lp -Tl -Ve -VF -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +oM +yd +uQ +uQ +Ku +PP +PP +LT +LT +EA +dy Lp Lp Lp @@ -21302,19 +21590,19 @@ hQ XG gj tx -Xp -Xp -RE -dD -VF -VF -VF -VF -dD -Jp -Xp -Xp -vk +SD +SD +Jg +tm +LT +LT +LT +LT +tm +EA +SD +SD +dy Lp Lp Lp @@ -21419,8 +21707,8 @@ Gq Lp pJ RE -VF -VF +Xw +Xw Xw Xw Xw @@ -21466,17 +21754,17 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -dD -Jp -vk +Br +PV +uQ +uQ +Ku +Ku +Ku +LT +tm +EA +dy Lp Lp Lp @@ -21498,14 +21786,14 @@ OD Lp Lp Lp -pJ -Xp -Xp -Xp -Xp -Xp -Xp -vk +JU +SD +SD +SD +SD +SD +SD +dy Lp Lp QL @@ -21613,8 +21901,8 @@ Lp Lp Lp Tl -VF -VF +Xw +Xw Xw Xw Xw @@ -21660,16 +21948,16 @@ Lp Lp oJ Lp -Tl -dD -VF -Xw -Xw -Xw -VF -VF -Jp -vk +oM +Xc +uQ +Ku +Ku +Ku +uQ +uQ +EA +dy Gq Lp Lp @@ -21807,7 +22095,7 @@ Lp Gq Lp Tl -VF +Xw fP Xw Xw @@ -21853,16 +22141,16 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -hi -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +uQ +kl +ZX Lp Lp Lp @@ -22002,7 +22290,7 @@ Lp Lp Tl fU -VF +Xw Xw Xw Xw @@ -22046,17 +22334,17 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +Br +PV +uQ +uQ +Ku +Ku +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -22196,7 +22484,7 @@ Lp QL Tl VF -VF +Xw Xw Xw Xw @@ -22239,17 +22527,17 @@ tF Lp Lp Lp -SQ -xT -VF -hi -Xw -Xw -Xw -VF -VF +Br +PV +uQ +kl +Ku +Ku +Ku +uQ +uQ CZ -vk +MJ Lp Lp Lp @@ -22390,7 +22678,7 @@ Lp Lp Tl VF -VF +Xw Xw Xw Xw @@ -22433,16 +22721,16 @@ Lp Lp Lp Lp -Tl -VF -VF -Xw -Xw -Xw -VF -VF -Jp -vk +oM +uQ +uQ +Ku +Ku +Ku +uQ +uQ +WD +MJ Lp Lp Lp @@ -22627,15 +22915,15 @@ Lp Lp Lp Lp -Tl -VF -Xw -Xw -Xw -Xw -VF -Jp -vk +oM +uQ +uQ +Ku +Ku +uQ +uQ +WD +MJ Lp Lp QL @@ -22820,15 +23108,15 @@ Lp Lp Lp Lp -SQ -xT -Ve -Xw -Xw -Xw -VF +Br +PV +yd +Ku +Ku +uQ +uQ CZ -vk +MJ Lp Lp Lp @@ -23013,15 +23301,15 @@ lS Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -dD -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +Xc +ZX Lp Lp Lp @@ -23207,15 +23495,15 @@ Lp Lp Gq Lp -Tl -VF -VF -Xw -Xw -Xw -Xw -Jp -vk +oM +uQ +uQ +Ku +Ku +uQ +uQ +WD +MJ Gq Lp Lp @@ -23401,14 +23689,14 @@ Lp Lp Lp Lp -Tl -VF -Xw -Xw -Xw -Xw -VF -hs +oM +uQ +uQ +Ku +Ku +uQ +uQ +ZX Lp Lp Lp @@ -23594,15 +23882,15 @@ Lp Lp Lp Lp -SQ -xT -hi -Xw -Xw -Xw -Xw -Jp -vk +Br +PV +kl +Ku +Ku +Ku +uQ +WD +MJ Lp Lp Lp @@ -23787,15 +24075,15 @@ Lp Lp Lp QL -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +uQ +ZX Lp Lp Lp @@ -23981,15 +24269,15 @@ Lp Lp Lp Lp -Tl -dD -VF -Xw -Xw -Xw -VF -Jp -vk +oM +Xc +uQ +Ku +Ku +uQ +uQ +WD +MJ Lp Lp Lp @@ -24174,15 +24462,15 @@ Lp Gq Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -dD -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +Xc +ZX Lp Lp Lp @@ -24368,15 +24656,15 @@ Lp Lp Lp Lp -Tl -VF -Ve -Xw -Xw -Xw -Xw -Ve -hs +oM +uQ +yd +Ku +Ku +Ku +uQ +yd +ZX Lp Lp Lp @@ -24561,16 +24849,16 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -VF -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +uQ +uQ +ZX Lp Lp Gq @@ -24754,17 +25042,17 @@ Lp Lp Lp Lp -SQ -xT -VF -VF -Xw -Xw -Xw -Xh -VF -Jp -vk +Br +PV +uQ +uQ +Ku +Ku +Ku +yd +uQ +WD +MJ Lp Lp Lp @@ -24948,16 +25236,16 @@ Lp Lp Lp Lp -Tl -VF -VF -Xw -Xw -Xw -Xw -VF -VF -hs +oM +uQ +uQ +uQ +Ku +Ku +uQ +uQ +uQ +ZX Lp Lp Lp @@ -25141,17 +25429,17 @@ Lp Lp Gq Lp -SQ -xT -hi -VF -Xw -Xw -Xw -Xw -VF -Jp -vk +Br +PV +kl +uQ +Ku +Ku +Ku +uQ +uQ +WD +MJ Lp Lp Lp @@ -25334,17 +25622,17 @@ Wb Wb Lp Lp -SQ -xT -dD -VF -Xw -Xw -Xw -Xw -VF -hi -hs +Br +PV +Xc +uQ +uQ +Ku +Ku +uQ +uQ +kl +ZX Lp Lp QL @@ -25528,17 +25816,17 @@ WN WN eq qp -Tl -VF -VF -Xw -Xw -Xw -Xw -Xw -VF -dD -hs +oM +uQ +uQ +uQ +Ku +Ku +Ku +uQ +uQ +Xc +ZX Lp Lp Lp @@ -25722,17 +26010,17 @@ WN WN WN eq -xT -VF -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +PV +uQ +uQ +uQ +Ku +Ku +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -25917,15 +26205,15 @@ WN WN WN eq -VF -Xw -Xw -Xw -Xw -Xw -Ve -VF -hs +uQ +uQ +Ku +Ku +Ku +uQ +yd +uQ +ZX Lp Gq Lp @@ -26112,14 +26400,14 @@ WN WN WN eq -Xw -Xw -Xw -Xw -Xw -VF -VF -hs +Ku +Ku +Ku +uQ +uQ +uQ +uQ +ZX Lp Lp Lp @@ -26307,13 +26595,13 @@ WN WN WN eq -Xw -Xw -Xw -VF -VF -Jp -vk +Ku +Ku +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -26502,11 +26790,11 @@ WN WN WN eq -Xw -Xw -VF -VF -hs +uQ +uQ +uQ +uQ +ZX Lp Lp Lp @@ -26688,8 +26976,8 @@ Lp Lp Lp Lp -SQ -xT +Br +PV Re WN WN @@ -26697,10 +26985,10 @@ WN WN WN eq -VF -hi -Jp -vk +uQ +kl +WD +MJ Lp Lp Lp @@ -26881,10 +27169,10 @@ Lp Lp Gq Lp -SQ -xT -Ve -VF +Br +PV +yd +uQ Re WN WN @@ -26892,8 +27180,8 @@ WN WN WN eq -VF -hs +uQ +ZX Lp Lp Lp @@ -27074,12 +27362,12 @@ Lp Lp Lp Lp -SQ -xT -dD -VF -VF -Xw +Br +PV +Xc +uQ +uQ +uQ Re WN WN @@ -27268,13 +27556,13 @@ Lp Lp Lp Lp -Tl -VF -VF -VF -Xw -Xw -Xw +oM +uQ +uQ +uQ +uQ +uQ +Ku Re WN WN @@ -27461,15 +27749,15 @@ Lp Lp Lp Lp -SQ -xT -dD -VF -Xw -Xw -Xw -Xw -Xw +Br +PV +Xc +uQ +uQ +uQ +Ku +Ku +Ku Re WN WN @@ -27653,18 +27941,18 @@ Lp Gq Lp Lp -SQ -Sp -xT -VF -hi -Xw -Xw -Xw -Xw -Xw -VF -dD +Br +Qo +PV +uQ +kl +uQ +uQ +Ku +Ku +Ku +Ku +Xc Re WN WN @@ -27846,20 +28134,20 @@ Lp Lp Lp Lp -SQ -xT -dD -hi -VF -VF -Xw -Xw -Xw -Xw -Xw -VF -VF -VF +Br +PV +Xc +kl +uQ +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +uQ Re WN WN @@ -28040,20 +28328,20 @@ Lp Lp Lp Lp -Tl -VF -VF -Ve -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp +oM +uQ +uQ +yd +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +uQ +WD Cw Re WN @@ -28234,20 +28522,20 @@ Lp Lp Lp Lp -Tl -Ve -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -hi -Jp -vk +oM +yd +uQ +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +kl +WD +MJ sk Lp Wb @@ -28427,20 +28715,20 @@ Lp Lp Lp Lp -SQ -xT -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +Br +PV +uQ +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -28620,20 +28908,20 @@ Lp Lp Lp Gq -SQ -xT -hi -VF -VF -Xw -Xw -Xw -Xw -Xw -VF -Ve -Jp -vk +YS +PV +kl +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +yd +WD +MJ Lp Lp Lp @@ -28812,21 +29100,21 @@ Lp Lp Lp Lp -SQ -Sp -xT -dD -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -dD -VF -hs +YS +Xi +pB +tm +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +Xc +uQ +ZX Lp Lp Lp @@ -28999,28 +29287,28 @@ Xw Xw Xw VF -VF -Xt -Sp -Sp -Sp -Sp -Sp -xT -dD -VF -hi -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +LT +hM +Xi +Xi +Xi +Xi +Xi +pB +tm +LT +RX +LT +Ku +Ku +Ku +Ku +uQ +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -29193,27 +29481,27 @@ Xw Xw Xw Xw -VF -Ve -VF -VF -VF -hi -dD -Ve -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +LT +WZ +LT +LT +LT +RX +tm +WZ +LT +PP +PP +PP +PP +Ku +Ku +uQ +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -29387,26 +29675,26 @@ VF Xw Xw Xw -Xw -Xw -VF -fU -VF -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -Ve -Jp -vk +PP +LT +LT +uZ +LT +LT +LT +LT +PP +PP +PP +PP +PP +PP +Ku +uQ +uQ +yd +WD +MJ Lp Lp Lp @@ -29580,26 +29868,26 @@ dD VF VF Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -dD -VF -Jp -vk +PP +PP +PP +LT +LT +LT +LT +PP +PP +PP +PP +PP +PP +PP +PP +LT +Xc +uQ +WD +MJ Lp Gq Lp @@ -29772,27 +30060,27 @@ Lp pJ RE LO -VF -BK -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +LT +ve +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +LT +LT +LT +LT +LT +WD +MJ Lp Lp Lp @@ -29964,28 +30252,28 @@ Lp Gq Lp Lp -Tl -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -Ve -VF -Jp -vk +dq +LT +LT +LT +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +LT +LT +LT +WZ +LT +EA +dy Lp Lp Lp @@ -30158,27 +30446,27 @@ Lp Lp Lp Lp -pJ -RE -VF -fU -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -VF -VF -Jp -vk +JU +Jg +LT +uZ +LT +PP +PP +PP +PP +PP +PP +LT +LT +LT +LT +LT +LT +LT +LT +EA +dy Lp Lp Lp @@ -30353,25 +30641,25 @@ Lp Lp Lp Lp -pJ -RE -VF -VF -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -dD -hi -Jp -Xp -vk +JU +Jg +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +tm +RX +EA +SD +dy Lp Lp Lp @@ -30548,22 +30836,22 @@ Lp Lp Lp Gq -pJ -Xp -RE -hi -VF -dD -VF -VF -VF -VF -VF -Ve -VF -Jp -Xp -vk +JU +SD +Jg +RX +LT +tm +LT +LT +LT +LT +LT +WZ +LT +EA +SD +dy Lp Lp Lp @@ -30744,18 +31032,18 @@ Lp Lp Lp Lp -pJ -Xp -RE -VF -VF -fU -VF -Ve -hi -Jp -Xp -vk +JU +SD +Jg +LT +LT +uZ +LT +WZ +RX +EA +SD +dy Lp Gq Lp @@ -30940,14 +31228,14 @@ Lp Lp QL Lp -pJ -Xp -Xp -Xp -Xp -Xp -Xp -vk +JU +SD +SD +SD +SD +SD +SD +dy Lp Lp QL @@ -44414,16 +44702,16 @@ WN WN Wb tF -rO -ra +ab tF -lS tF +lS +ra ra tF -GA -BE +Sx tF +Lp os Lp Wb @@ -44609,15 +44897,15 @@ WN Wb tF ab +Da tF -ra -BE tF tF tF -ON tF -ra +HA +tF +Lp gp Lp Wb @@ -44802,16 +45090,16 @@ WN WN Wb ra -wa -lj +ab tF tF -ra -UT tF +zI +lS tF tF tF +Lp gp Lp Wb @@ -44996,15 +45284,15 @@ WN WN Wb tF -TS -tF +ab +ON ra tF tF -GA -ra lS ra +tF +zI Lp gp Lp @@ -45191,13 +45479,13 @@ WN Wb lS ab -ra tF -ON tF ra tF -BE +tF +tF +tF tF Lp gp @@ -45384,15 +45672,15 @@ Wb Wb Wb tF -rO +ab +tF +tF +tF tF -UT tF tF -BE tF tF -GA Lp gp Lp diff --git a/maps/sectors/lavaland_140/levels/lavaland_140.dmm b/maps/sectors/lavaland_140/levels/lavaland_140.dmm index ef52bb9e46..c1e0099d15 100644 --- a/maps/sectors/lavaland_140/levels/lavaland_140.dmm +++ b/maps/sectors/lavaland_140/levels/lavaland_140.dmm @@ -56,6 +56,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/lavaland/central/base/common) +"bT" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "ch" = ( /obj/machinery/light/small{ dir = 1 @@ -69,6 +75,10 @@ /obj/structure/catwalk, /turf/simulated/floor/outdoors/lava/lavaland, /area/lavaland/central/explored) +"cl" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/wood, +/area/lavaland/central/base/common) "cF" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -297,8 +307,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -402,8 +411,7 @@ pixel_y = -23; req_one_access = list(48) }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/structure/ore_box, @@ -415,11 +423,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "km" = ( @@ -517,8 +521,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -565,9 +568,7 @@ /area/lavaland/central/base/common) "nr" = ( /obj/effect/debris/cleanable/dirt, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "nx" = ( @@ -666,8 +667,7 @@ "oM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -800,9 +800,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "qw" = ( @@ -843,8 +841,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -905,11 +902,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_tile, /area/lavaland/central/base/common) "rR" = ( @@ -932,6 +925,12 @@ }, /turf/simulated/floor/outdoors/lava/lavaland, /area/lavaland/central/explored) +"sc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "so" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -951,8 +950,7 @@ /area/lavaland/central/explored) "sN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1066,10 +1064,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -1083,6 +1078,18 @@ }, /turf/simulated/floor/carpet/blucarpet, /area/lavaland/central/base/common) +"vS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/lavaland/central/base/common) "vW" = ( /obj/structure/table/standard, /obj/machinery/light/small, @@ -1555,10 +1562,6 @@ /turf/simulated/floor/outdoors/lavaland, /area/lavaland/central/unexplored) "FF" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Dorms"; @@ -1570,6 +1573,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "FI" = ( @@ -1654,15 +1660,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/lavaland/central/base/common) "GT" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Lounge"; req_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/wood, /area/lavaland/central/base/common) "Hi" = ( @@ -1968,13 +1973,11 @@ /turf/simulated/floor/wood, /area/lavaland/central/base/common) "NN" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ name = "Lounge"; req_one_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/wood, /area/lavaland/central/base/common) "NV" = ( @@ -2056,13 +2059,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/lavaland/central/base/common) "Pk" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ name = "Logistics"; req_one_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Pr" = ( @@ -2239,10 +2240,8 @@ /turf/simulated/floor/plating, /area/lavaland/central/base/common) "SN" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/infinite; - name = "south bump"; - pixel_y = -28 +/obj/machinery/power/apc/south_mount{ + cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/tiled/dark/lavaland, /area/lavaland/central/transit) @@ -8090,7 +8089,7 @@ XQ HB HB HB -HB +cl AJ Bs ew @@ -8370,7 +8369,7 @@ vA AO AO AO -wN +vS GT db db @@ -8946,7 +8945,7 @@ Zw AA Wh AO -ew +bT FF AO AO @@ -9366,7 +9365,7 @@ EX db Jl nE -nE +sc nE pn nE diff --git a/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm b/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm index 78a06e4759..054b70e97a 100644 --- a/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm +++ b/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm @@ -36,11 +36,8 @@ /turf/simulated/floor/tiled/lavaland, /area/lavaland/east/ashlander_village) "az" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/infinite; - dir = 1; - name = "north bump"; - pixel_y = 28 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/tiled/dark/lavaland, /area/lavaland/east/transit) @@ -345,7 +342,6 @@ "gK" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - layer = 3.3; pixel_y = -32 }, /turf/simulated/floor/tiled/lavaland, @@ -2529,13 +2525,10 @@ /turf/simulated/floor/tiled/steel_dirty/lavaland/exterior, /area/lavaland/east/ashlander_village) "YY" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/high/empty; chargelevel = 0; chargemode = 0; - dir = 8; - name = "west bump"; - pixel_x = -28; start_charge = 0 }, /obj/structure/table/standard, diff --git a/maps/sectors/lavaland_192/levels/lavaland_192.dmm b/maps/sectors/lavaland_192/levels/lavaland_192.dmm index e7f66587be..60b6fa2672 100644 --- a/maps/sectors/lavaland_192/levels/lavaland_192.dmm +++ b/maps/sectors/lavaland_192/levels/lavaland_192.dmm @@ -65,10 +65,6 @@ /turf/simulated/floor/plating, /area/lavaland/central/base/common) "do" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Dorms"; @@ -81,6 +77,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "dX" = ( @@ -233,6 +232,12 @@ }, /turf/simulated/floor/plating, /area/lavaland/central/base/common) +"hh" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "hi" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/phoron/engine_setup, @@ -508,8 +513,11 @@ /turf/simulated/floor/plating, /area/lavaland/central/base/common) "lT" = ( -/turf/simulated/mineral/triumph/lavaland, -/area/lavaland/central/explored) +/obj/structure/table/steel, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "lX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/airlock_sensor{ @@ -554,6 +562,7 @@ /area/lavaland/central/base/common) "mq" = ( /obj/structure/table/steel, +/obj/machinery/recharger, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "mr" = ( @@ -568,8 +577,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -765,11 +773,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -923,11 +927,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_tile, /area/lavaland/central/base/common) "so" = ( @@ -937,7 +937,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/high/south_bump, +/obj/machinery/power/apc/high/south_mount, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "sx" = ( @@ -1039,6 +1039,18 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"sW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/lavaland/central/base/common) "sX" = ( /obj/machinery/sleep_console, /turf/simulated/floor/tiled, @@ -1173,8 +1185,7 @@ "vz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1191,8 +1202,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -1239,8 +1249,7 @@ /area/lavaland/central/base/common) "wE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1321,8 +1330,7 @@ pixel_y = -23; req_one_access = list(48) }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/structure/ore_box, @@ -1376,9 +1384,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "zl" = ( @@ -1455,16 +1461,15 @@ /turf/simulated/floor/wood, /area/lavaland/central/base/common) "As" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Lounge"; req_access = null; req_one_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/wood, /area/lavaland/central/base/common) "Ay" = ( @@ -1541,9 +1546,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/lavaland/central/base/common) -"DG" = ( -/turf/simulated/floor/outdoors/lava/lavaland, -/area/lavaland/central/explored) "DW" = ( /obj/structure/sign/warning/lava, /turf/simulated/wall/r_wall, @@ -1642,9 +1644,7 @@ /area/lavaland/central/base/common) "GT" = ( /obj/effect/debris/cleanable/dirt, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Hr" = ( @@ -1723,13 +1723,11 @@ /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "IR" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ name = "Lounge"; req_one_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/wood, /area/lavaland/central/base/common) "IV" = ( @@ -1852,9 +1850,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/lavaland/central/base/common) -"MX" = ( -/turf/simulated/mineral/triumph/lavaland, -/area/lavaland/central/explored) "ND" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2083,6 +2078,10 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"Su" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/wood, +/area/lavaland/central/base/common) "SH" = ( /obj/machinery/light/small{ dir = 8 @@ -2262,6 +2261,7 @@ dir = 4 }, /obj/structure/table/steel, +/obj/machinery/cell_charger, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "VX" = ( @@ -2454,8 +2454,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2770,285 +2769,280 @@ Md "} (2,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV gy Md "} (3,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -3148,18 +3142,23 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG +RX +RX +RX +RX +RX +ZK +ZK +tV +tV +tV +tV Md "} (4,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3206,27 +3205,27 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -3342,18 +3341,18 @@ xd xd xd RX -MX -MX -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV Md "} (5,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3400,17 +3399,17 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -3538,16 +3537,16 @@ xd xd RL RL -DG -MX -DG -DG +tV +ZK +tV +tV Md "} (6,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3732,16 +3731,16 @@ xd xd RL RL -DG -MX -DG -DG +tV +ZK +tV +tV Md "} (7,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3785,13 +3784,13 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -3926,16 +3925,16 @@ xd xd RL RL -DG -MX -DG -DG +tV +ZK +tV +tV Md "} (8,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3974,18 +3973,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -4120,16 +4119,16 @@ xd xd RL RL -DG -MX -DG -DG +tV +ZK +tV +tV Md "} (9,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -4168,14 +4167,14 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK RL RL RL @@ -4314,16 +4313,16 @@ xd xd RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (10,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -4359,29 +4358,29 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +ZK RX -MX +ZK RL RL RL -MX -MX +ZK +ZK xd xd xd @@ -4402,12 +4401,12 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK RL RL xd @@ -4508,16 +4507,16 @@ xd xd RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (11,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -4551,31 +4550,31 @@ RX RX RX RX -MX -MX -MX -MX -DG -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK xd xd xd @@ -4596,12 +4595,12 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK RL RL xd @@ -4702,17 +4701,17 @@ xd xd RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (12,1,1) = {" Md -MX -MX -RX +ZK +ZK +RX RX RX RX @@ -4745,31 +4744,31 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK xd xd xd @@ -4790,12 +4789,12 @@ RL RL RL RL -MX -MX -DG -MX -MX -MX +ZK +ZK +tV +ZK +ZK +ZK RL RL xd @@ -4855,31 +4854,31 @@ RX RX RX RL -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL RL @@ -4896,16 +4895,16 @@ RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (13,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -4937,33 +4936,33 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK RL RL RL @@ -4984,12 +4983,12 @@ RL RL RL RL -MX -MX -DG -MX -MX -MX +ZK +ZK +tV +ZK +ZK +ZK RL RL xd @@ -5048,35 +5047,35 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL RL @@ -5090,16 +5089,16 @@ RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (14,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -5128,44 +5127,44 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX xd xd @@ -5178,12 +5177,12 @@ RL RL RL RL -MX -MX -DG -MX -MX -MX +ZK +ZK +tV +ZK +ZK +ZK RL RL xd @@ -5242,35 +5241,35 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL RL @@ -5284,16 +5283,16 @@ RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (15,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -5322,42 +5321,42 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV RL RL RL @@ -5372,14 +5371,14 @@ RL RL RL RL -DG -MX -DG -MX -MX -DG -MX -MX +tV +ZK +tV +ZK +ZK +tV +ZK +ZK RX RX RX @@ -5436,58 +5435,58 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RL -RL -MX -MX -MX -MX -RL -RL -RL -RL -DG -DG -DG -DG -Md -"} -(16,1,1) = {" -Md -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RL +RL +ZK +ZK +ZK +ZK +RL +RL +RL +RL +tV +tV +tV +tV +Md +"} +(16,1,1) = {" +Md +ZK +ZK RX RX RX @@ -5516,18 +5515,18 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -5536,25 +5535,25 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -5562,18 +5561,18 @@ RX RX RX RX -MX -DG -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX +ZK +tV +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK RX RX RX @@ -5630,58 +5629,58 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RL RL -MX -MX -MX +ZK +ZK +ZK RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (17,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -5708,16 +5707,16 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -5730,26 +5729,26 @@ xd xd xd RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RL -MX +ZK RL -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK RX xd xd @@ -5757,16 +5756,16 @@ xd xd xd RL -DG -MX -MX -DG -DG -DG -MX -DG -DG -MX +tV +ZK +ZK +tV +tV +tV +ZK +tV +tV +ZK RL xd xd @@ -5824,58 +5823,58 @@ RX RX xd RX -MX -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RL -MX -MX +ZK +ZK RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (18,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -5902,14 +5901,14 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX xd xd @@ -5924,26 +5923,26 @@ xd xd xd RX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RL -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX xd xd @@ -5951,16 +5950,16 @@ xd xd xd RL -DG -DG -MX -DG -DG -DG -DG -DG -DG -MX +tV +tV +ZK +tV +tV +tV +tV +tV +tV +ZK RL xd xd @@ -6018,58 +6017,58 @@ RX RX xd RX -MX -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -MX -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RL +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RL RL RL -DG -DG -DG -DG +RL +tV +tV +tV +tV Md "} (19,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6096,14 +6095,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX xd xd @@ -6117,27 +6116,27 @@ xd xd xd RL -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RL RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX xd xd @@ -6145,16 +6144,16 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK RL xd xd @@ -6212,58 +6211,58 @@ RX RX xd RX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (20,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6288,15 +6287,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX xd @@ -6311,13 +6310,13 @@ xd xd xd RL -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK xd RX RX @@ -6325,30 +6324,30 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK xd xd xd xd xd RL -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RL xd xd @@ -6406,58 +6405,58 @@ RX RX xd RX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (21,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6482,15 +6481,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX xd @@ -6505,12 +6504,12 @@ xd xd xd RL -MX -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK xd RX RX @@ -6520,29 +6519,29 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK xd xd xd xd xd RL -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RL xd xd @@ -6600,22 +6599,22 @@ RX RX xd RX -MX -DG -DG -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -6625,33 +6624,33 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (22,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6675,15 +6674,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -6699,11 +6698,11 @@ xd xd xd RL -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV RL RX RX @@ -6716,27 +6715,27 @@ RX RX RX RX -MX -DG -DG +ZK +tV +tV RL -MX +ZK xd xd xd xd xd RL -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RL xd xd @@ -6794,58 +6793,58 @@ RX RX xd RX -MX -MX -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy gy gy -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV Md "} (23,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6869,15 +6868,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -6893,44 +6892,44 @@ xd xd xd RL -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX -MX -DG -DG -DG -MX +ZK +tV +tV +tV +ZK xd xd xd xd xd RL -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RL xd xd @@ -6988,58 +6987,58 @@ RX RX xd RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV Md "} (24,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7063,13 +7062,13 @@ RX RX xd RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -7087,44 +7086,44 @@ xd xd xd RL -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX -MX +ZK RL -DG -DG -MX +tV +tV +ZK xd xd xd xd xd RL -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RL RX RX @@ -7182,58 +7181,58 @@ RX RX xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV Md "} (25,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7256,14 +7255,14 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -7281,35 +7280,35 @@ RL RL RL RL -MX -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK RX RX RX RL -MX -DG -DG -MX -xd -xd -xd +ZK +tV +tV +ZK +xd +xd +xd xd xd RL -MX +ZK gy gy wX @@ -7317,8 +7316,8 @@ wX wX wX wX -MX -MX +ZK +ZK RL RX RX @@ -7376,58 +7375,58 @@ RX RX xd RX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV Md "} (26,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7450,14 +7449,14 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -7475,9 +7474,9 @@ RL RL RL RL -MX -DG -DG +ZK +tV +tV gy gy gy @@ -7487,23 +7486,23 @@ gy gy gy gy -MX -MX +ZK +ZK RX xd RX -MX -MX -DG -DG -MX +ZK +ZK +tV +tV +ZK RL xd xd xd xd RL -MX +ZK gy gy wX @@ -7512,7 +7511,7 @@ wX wX wX wX -MX +ZK RL RX RX @@ -7570,58 +7569,58 @@ RX RX xd RX -MX -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +ZK +tV +tV +tV Md "} (27,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7643,14 +7642,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -7664,8 +7663,8 @@ xd xd xd RX -MX -MX +ZK +ZK gy gy gy @@ -7682,15 +7681,15 @@ gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX -MX -MX -DG -DG -DG +ZK +ZK +tV +tV +tV RL RL xd @@ -7699,14 +7698,14 @@ xd RL gy gy -MX -MX -DG -DG +ZK +ZK +tV +tV gy wX wX -MX +ZK RL RX RX @@ -7764,58 +7763,58 @@ RX RX xd RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV Md "} (28,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7837,14 +7836,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -7858,8 +7857,8 @@ xd xd xd RX -MX -MX +ZK +ZK gy gy gy @@ -7869,22 +7868,22 @@ fj eY gy gy -MX -MX -MX +ZK +ZK +ZK gy gy gy gy gy RL -MX +ZK RX -MX -MX -DG -DG -DG +ZK +ZK +tV +tV +tV RL RL xd @@ -7895,12 +7894,12 @@ Wq qE Wq Wq -DG -DG +tV +tV gy wX wX -DG +tV gy RX RX @@ -7958,39 +7957,39 @@ RX RX xd RX -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV gy gy gy @@ -7998,18 +7997,18 @@ gy gy gy gy -MX -DG -DG -DG -DG -DG +ZK +tV +tV +tV +tV +tV Md "} (29,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8031,14 +8030,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -8052,45 +8051,45 @@ xd xd xd RX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -gy -MX -MX -MX -gy -gy -gy -gy -gy +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +gy +ZK +ZK +ZK +gy +gy +gy +gy +gy RL -MX +ZK RX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK Wq Ze is XT Wq -DG -DG +tV +tV gy gy wX @@ -8152,38 +8151,38 @@ RX RX xd RX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV gy gy gy @@ -8191,19 +8190,19 @@ gy gy gy gy -MX -MX -MX -DG -MX -DG -DG +ZK +ZK +ZK +tV +ZK +tV +tV Md "} (30,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8225,14 +8224,14 @@ xd RX RX RX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -8250,41 +8249,41 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK vu -MX -MX -MX -MX -MX -gy -gy -gy -MX -MX -RX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +RX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Wq Ze is XT Wq -MX -DG +ZK +tV gy gy gy @@ -8346,37 +8345,37 @@ RX RX RX RL -MX -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV gy gy gy @@ -8384,20 +8383,20 @@ gy gy gy gy -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (31,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8419,13 +8418,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -8442,43 +8441,43 @@ xd xd RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK Wq Wq qE Wq Wq -MX -DG +ZK +tV WM WM jO @@ -8539,38 +8538,38 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV gy gy gy @@ -8578,20 +8577,20 @@ gy gy gy gy -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (32,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8613,13 +8612,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -8636,43 +8635,43 @@ xd RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK Wq is Ze Wq -MX -DG +ZK +tV WM sA sA @@ -8731,39 +8730,39 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -gy -gy -gy -gy +ZK +ZK +ZK +tV +tV +tV +ZK +ZK gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX gy gy -DG -DG -DG +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +tV +tV +tV gy gy AO @@ -8773,19 +8772,19 @@ AO AO NW AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (33,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8807,13 +8806,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -8830,52 +8829,52 @@ xd RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX +ZK gy gy -MX -MX +ZK +ZK RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK Wq is is Wq -MX -DG +ZK +tV WM Go Go Go WM -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -8925,14 +8924,14 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK gy gy gy @@ -8944,8 +8943,8 @@ RL RL RL RL -MX -MX +ZK +ZK gy gy gy @@ -8967,19 +8966,19 @@ db KN QY AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (34,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9001,13 +9000,13 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX RX @@ -9024,24 +9023,24 @@ xd RX RX RX -MX -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy -MX -MX +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9050,26 +9049,26 @@ xd xd xd xd -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV Wq wX is Wq -MX -DG +ZK +tV WM sA sA sA WM -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -9118,24 +9117,24 @@ RX RX RX RX -MX -MX -DG -DG -DG +ZK +ZK +tV +tV +tV RL -MX -MX +ZK +ZK gy gy gy gy RL -MX -MX -MX +ZK +ZK +ZK RL -MX +ZK RL RL RL @@ -9143,11 +9142,11 @@ nz gy RL RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -9161,19 +9160,19 @@ Ru Ow pq AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (35,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9194,13 +9193,13 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -9217,25 +9216,25 @@ xd xd RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9244,26 +9243,26 @@ xd xd xd xd -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV +tV mb Wq -MX -DG +ZK +tV WM vr sA sA WM -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -9312,24 +9311,24 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK gy gy gy Lc -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK RL RL AO @@ -9355,19 +9354,19 @@ db cR jP AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (36,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9388,13 +9387,13 @@ xd RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -9411,25 +9410,25 @@ RX xd RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9438,26 +9437,26 @@ xd xd xd xd -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +tV WM WM jO WM WM -DG -DG -MX -MX +tV +tV +ZK +ZK RX RX RX @@ -9506,17 +9505,17 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK gy gy gy -MX +ZK RL Pk Pk @@ -9549,19 +9548,19 @@ db AO AO AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (37,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9582,17 +9581,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -RX -RX -RX -RX +ZK +ZK +tV +tV +tV +tV +ZK +RX +RX +RX +RX RX xd xd @@ -9605,25 +9604,25 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX xd xd RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9636,22 +9635,22 @@ RX RX RX RX -DG -DG -DG -DG -DG -DG -DG +tV +tV +tV +tV +tV +tV +tV gy gy gy gy gy -DG -DG -MX -MX +tV +tV +ZK +ZK RX RX RX @@ -9698,19 +9697,19 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK gy gy gy -MX +ZK RL Pk fm @@ -9741,21 +9740,21 @@ ew YJ eM NW -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV Md "} (38,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9776,13 +9775,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -9799,25 +9798,25 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX xd xd RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9831,22 +9830,22 @@ RX RX xd RL -DG -DG -DG -DG -DG -DG +tV +tV +tV +tV +tV +tV gy gy gy vt -DG -DG -DG -MX -MX -MX +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -9891,15 +9890,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RL gy gy @@ -9935,21 +9934,21 @@ ew Zh VC NW -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (39,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9970,13 +9969,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -9993,27 +9992,27 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -10024,23 +10023,23 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG +ZK +tV +tV +tV +tV +tV gy -DG +tV gy gy -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -10078,28 +10077,28 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK gy gy -MX +ZK RL -MX +ZK Pk Cq CX @@ -10121,7 +10120,7 @@ yX yw yw yw -yw +Su PZ SN ew @@ -10129,21 +10128,21 @@ ew Zw Cg NW -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (40,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -10164,13 +10163,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -10187,27 +10186,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -10218,23 +10217,23 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG +ZK +tV +tV +tV +tV +tV hx -DG +tV wX wX -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -10269,31 +10268,31 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX +ZK RL -MX +ZK Pk Cq WX @@ -10323,22 +10322,21 @@ ew YJ ut NW -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (41,1,1) = {" Md -MX -MX -RX +ZK +ZK RX RX RX @@ -10358,14 +10356,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -10381,28 +10379,28 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX RX +ZK +tV +tV +tV +tV +ZK RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX RX +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK RX RX RX @@ -10412,23 +10410,24 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG +RX +ZK +ZK +tV +tV +tV +tV +tV +tV wX wX -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -10460,32 +10459,32 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX -MX -MX +ZK +ZK gy gy gy -MX +ZK RL RL Pk @@ -10505,7 +10504,7 @@ so AO AO AO -ws +sW As db db @@ -10519,19 +10518,19 @@ db AO AO AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (42,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -10552,13 +10551,13 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -10575,27 +10574,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -10606,23 +10605,23 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV +tV wX gy -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -10653,35 +10652,35 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX +ZK RL -MX +ZK Pk Cq WX @@ -10713,19 +10712,19 @@ db vl Ir AO -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV Md "} (43,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -10746,13 +10745,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -10769,27 +10768,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -10800,23 +10799,23 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV wX wX gy -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -10845,21 +10844,21 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -10868,14 +10867,14 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK Pk Cq CX @@ -10907,19 +10906,19 @@ RS iu yP AO -MX -MX -MX +ZK +ZK +ZK gy -DG -DG -DG +tV +tV +tV Md "} (44,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -10940,13 +10939,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -10963,27 +10962,27 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -10994,23 +10993,23 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +tV hx wX wX vt -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11037,18 +11036,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11062,14 +11061,14 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK Pk Cq WX @@ -11101,25 +11100,19 @@ db XR ql AO -MX -MX -MX +ZK +ZK +ZK gy -DG -DG -DG +tV +tV +tV Md "} (45,1,1) = {" Md -MX -MX -RX -RX -RX -RX -RX -RX +ZK +ZK RX RX RX @@ -11134,19 +11127,19 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -11157,27 +11150,33 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -11188,23 +11187,23 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +tV gy wX wX wX -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11230,18 +11229,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -11256,14 +11255,14 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX +ZK RL -MX +ZK Pk Cq CX @@ -11289,25 +11288,25 @@ IV QN UV AO -ew +hh do AO AO AO AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (46,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -11328,13 +11327,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -11351,27 +11350,27 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -11382,24 +11381,24 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +tV +tV hx gy wX -DG -DG -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11420,19 +11419,19 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -11450,14 +11449,14 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK Pk Cq WX @@ -11489,19 +11488,19 @@ wE VM We AO -MX -MX -MX +ZK +ZK +ZK gy -DG -DG -DG +tV +tV +tV Md "} (47,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -11522,13 +11521,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -11545,27 +11544,27 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy -MX +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -11576,24 +11575,24 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +tV +tV wX gy -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11614,18 +11613,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -11640,18 +11639,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RL -MX +ZK Pk Cq CX @@ -11683,19 +11682,19 @@ oX YS ew NW -MX -MX +ZK +ZK gy -DG -DG -DG -DG +tV +tV +tV +tV Md "} (48,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -11716,13 +11715,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -11739,27 +11738,27 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX +ZK gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -11770,24 +11769,24 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +tV +tV wX gy -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -11806,19 +11805,19 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11831,21 +11830,21 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK Pk Cq WX @@ -11857,8 +11856,8 @@ lF AO AO hp -MX -MX +ZK +ZK AO tv EX @@ -11877,21 +11876,19 @@ bH uh ew NW -MX +ZK gy gy gy -DG -DG -DG +tV +tV +tV Md "} (49,1,1) = {" Md -MX -MX -RX -RX +ZK +ZK RX RX RX @@ -11910,15 +11907,15 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX RX RX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -11933,27 +11930,29 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +RX RX RX RX RX -MX +RX +ZK gy -MX +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -11964,24 +11963,24 @@ RX RX RX RX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +tV wX wX wX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -11997,20 +11996,20 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -12025,21 +12024,21 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK vu gy gy gy gy gy -MX -MX +ZK +ZK RL -MX +ZK Pk Cq CX @@ -12049,9 +12048,9 @@ TK If lX AO -MX -MX -MX +ZK +ZK +ZK AO AO db @@ -12073,17 +12072,17 @@ ew NW gy gy -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV Md "} (50,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12104,13 +12103,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12127,27 +12126,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX RX RX RX -MX +ZK gy -MX +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -12158,24 +12157,24 @@ RX RX RX RX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +tV wX wX wX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12191,18 +12190,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -12217,11 +12216,11 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -12230,10 +12229,10 @@ gy gy gy RL -MX +ZK RL -MX -MX +ZK +ZK Pk Cq WX @@ -12243,9 +12242,9 @@ zO pK mh AO -MX -MX -MX +ZK +ZK +ZK AO sQ tz @@ -12267,17 +12266,17 @@ SL AO gy gy -MX +ZK gy -DG -DG -DG +tV +tV +tV Md "} (51,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12296,15 +12295,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12321,27 +12320,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX RX RX RX -MX +ZK gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -12352,24 +12351,24 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy wX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12383,20 +12382,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -12411,9 +12410,9 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -12423,11 +12422,11 @@ gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RL -MX +ZK Pk Cq CX @@ -12437,9 +12436,9 @@ AO AO AO AO -MX -MX -MX +ZK +ZK +ZK AO sX tU @@ -12451,7 +12450,7 @@ db HA Mw ew -mq +lT AO AO AO @@ -12462,16 +12461,16 @@ AO gy gy gy -DG -DG -DG -DG +tV +tV +tV +tV Md "} (52,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12490,15 +12489,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12515,27 +12514,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -12546,27 +12545,27 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy gy gy -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -12575,19 +12574,19 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -12604,9 +12603,9 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -12615,27 +12614,27 @@ gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL -MX +ZK Pk Cq WX Ki Pk -MX -MX -MX -MX -MX -MX -MX -AO -XG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +AO +XG ub vA AO @@ -12652,20 +12651,20 @@ ew tU xV AO -MX -DG -DG -DG -DG -DG -MX -DG +ZK +tV +tV +tV +tV +tV +ZK +tV Md "} (53,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12684,15 +12683,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12709,27 +12708,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -12740,9 +12739,9 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -12750,17 +12749,17 @@ gy gy gy gy -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -12768,18 +12767,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -12798,36 +12797,36 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy gy gy -MX +ZK RL RL RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL Pk Cq CX Oq Pk -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK AO NW NW @@ -12846,20 +12845,20 @@ ew Pv Ob AO -MX -DG -DG -DG -DG -DG -DG -DG +ZK +tV +tV +tV +tV +tV +tV +tV Md "} (54,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12878,15 +12877,15 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12903,27 +12902,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -12943,31 +12942,31 @@ ax RX gy gy -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -12989,41 +12988,41 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL -MX +ZK Pk Cq WX Ki Pk -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy gy gy gy @@ -13042,18 +13041,18 @@ Iy NW gy gy -MX -MX -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV Md "} (55,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -13072,15 +13071,15 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -13097,27 +13096,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -13136,32 +13135,32 @@ RX RX RX gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -13180,48 +13179,48 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL -MX -MX -MX +ZK +ZK +ZK RL RL -MX -MX +ZK +ZK RL -MX +ZK Pk Cq CX Oq Pk -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK gy AO sH @@ -13234,28 +13233,20 @@ VA VA mq NW -MX +ZK gy -MX -MX -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV Md "} (56,1,1) = {" Md -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK RX RX RX @@ -13266,15 +13257,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -13283,6 +13265,22 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -13291,27 +13289,28 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX RX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX -MX -MX -MX +RX +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -13329,31 +13328,31 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -13374,30 +13373,30 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX RX -MX -MX -MX +ZK +ZK +ZK RL -MX +ZK RL RL -MX +ZK Pk Cq WX @@ -13408,15 +13407,15 @@ Pk Pk Pk Pk -MX +ZK RL RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK NW kp ub @@ -13428,20 +13427,20 @@ AO NW NW AO -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (57,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -13460,15 +13459,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -13485,27 +13484,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -13528,24 +13527,24 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -13568,30 +13567,30 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK Pk Cq CX @@ -13602,15 +13601,15 @@ ZJ ZJ Oj Pk -MX +ZK RL RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK AO AO RE @@ -13620,22 +13619,22 @@ AO gy gy gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +gy +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (58,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -13654,15 +13653,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -13679,27 +13678,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -13722,24 +13721,24 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -13760,32 +13759,32 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX +ZK +ZK RX RX RX RX xd RX -MX -MX -MX +ZK +ZK +ZK RL -MX +ZK RL -MX -MX +ZK +ZK Pk Cq WX @@ -13796,15 +13795,15 @@ WX Qu nu Pk -MX +ZK RL RL -MX -MX +ZK +ZK gy gy gy -MX +ZK gy Iq gy @@ -13813,23 +13812,23 @@ VY gy gy gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (59,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -13850,13 +13849,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -13873,30 +13872,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX -RX -RX -RX +ZK +ZK RX RX RX @@ -13916,27 +13912,29 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RX +RX RX RX RX @@ -13954,32 +13952,33 @@ RX RX RX RX -MX -MX -MX +RX +ZK +ZK +ZK gy gy gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK RL -MX -MX +ZK +ZK RL -MX +ZK Pk Cq cF @@ -13990,13 +13989,13 @@ cF cF nu Pk -MX +ZK RL RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy @@ -14006,24 +14005,24 @@ gy gy gy te -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (60,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -14044,13 +14043,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -14067,27 +14066,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -14110,20 +14109,20 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -14147,8 +14146,8 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy @@ -14156,10 +14155,10 @@ gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -14167,11 +14166,11 @@ RX RX RX RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL RL Pk @@ -14184,40 +14183,40 @@ ON HB nx Pk -MX +ZK RL RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (61,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -14238,13 +14237,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -14261,27 +14260,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -14304,15 +14303,15 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -14339,20 +14338,20 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -14360,13 +14359,13 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK RL RL RL -MX +ZK RL Pk Pk @@ -14378,40 +14377,40 @@ Pk Pk Pk Pk -MX -RL -RL -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +RL +RL +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (62,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -14432,13 +14431,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -14455,27 +14454,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -14498,15 +14497,15 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX RX @@ -14533,18 +14532,18 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -14564,53 +14563,48 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL -MX +ZK RL RL RL -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK gy gy gy gy gy gy -MX +ZK RL RL -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV Md "} (63,1,1) = {" Md -MX -MX -RX -RX -RX -RX -RX +ZK +ZK RX RX RX @@ -14626,17 +14620,19 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX RX RX RX RX RX +ZK +ZK +tV +tV +ZK +ZK +RX +RX RX RX RX @@ -14649,27 +14645,30 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +RX +RX +RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -14692,15 +14691,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -14727,18 +14726,18 @@ RX RX RX RX -MX +ZK gy gy gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -14758,48 +14757,48 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -DG -DG -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK RL -MX +ZK gy gy gy gy -MX -MX +ZK +ZK RL RL -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV Md "} (64,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -14820,12 +14819,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -14843,27 +14842,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -14883,17 +14882,17 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -14918,21 +14917,21 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -14953,47 +14952,47 @@ RL RL RL RL -MX -MX +ZK +ZK RL RL RL -MX +ZK RL RL RL RL RL -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RL gy gy gy gy -MX +ZK RL -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (65,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15014,12 +15013,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15037,27 +15036,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15077,16 +15076,16 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -15112,18 +15111,18 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -15155,39 +15154,39 @@ RL RL gy RL -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RL gy gy gy -MX -MX +ZK +ZK RL -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (66,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15208,12 +15207,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15231,27 +15230,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15269,18 +15268,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -15306,15 +15305,15 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -15341,47 +15340,47 @@ RL RL RL RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX +ZK RL -MX -MX -MX +ZK +ZK +ZK RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (67,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15402,12 +15401,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15425,27 +15424,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15463,18 +15462,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -15500,15 +15499,15 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -15535,47 +15534,47 @@ RL RL RL RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (68,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15596,12 +15595,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15619,27 +15618,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15655,20 +15654,20 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -15694,13 +15693,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -15729,47 +15728,47 @@ RL RL RL RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV Md "} (69,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15790,12 +15789,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15813,27 +15812,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15848,21 +15847,21 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -15888,13 +15887,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -15923,47 +15922,47 @@ RL RL RL RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV Md "} (70,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15984,12 +15983,12 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -16007,27 +16006,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16042,21 +16041,21 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -16082,13 +16081,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -16117,47 +16116,47 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK Md "} (71,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16178,12 +16177,12 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -16201,27 +16200,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16234,23 +16233,23 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16276,13 +16275,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -16311,47 +16310,47 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK Md "} (72,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16372,13 +16371,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -16395,27 +16394,27 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK Lc gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16428,23 +16427,23 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16470,13 +16469,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16505,47 +16504,47 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK Md "} (73,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16566,15 +16565,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16589,27 +16588,27 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16622,22 +16621,22 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16664,11 +16663,11 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy -MX +ZK RX RX RX @@ -16697,49 +16696,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} (74,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16760,15 +16759,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16782,26 +16781,26 @@ xd RX RX RX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX xd xd xd RX -MX +ZK RL RL gy gy -MX +ZK RL RL xd @@ -16816,23 +16815,22 @@ xd RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +RX RX RX RX @@ -16858,11 +16856,12 @@ RX RX RX RX -MX -MX +RX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -16891,49 +16890,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV eY eY -DG -DG -DG -DG -DG -MX -MX -MX -gy -gy -gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -DG -MX -MX +tV +tV +tV +tV +tV +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +tV +ZK +ZK Md "} (75,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16954,15 +16953,15 @@ RX xd RX RX -MX -MX -DG -DG -DG -DG -MX -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK +tV +ZK RX RX RX @@ -16976,13 +16975,13 @@ xd RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -16990,12 +16989,12 @@ xd xd xd RX -MX +ZK RL gy gy gy -MX +ZK RL RL xd @@ -17010,21 +17009,21 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX +ZK +ZK +ZK +tV +tV +ZK RL -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX RX @@ -17052,11 +17051,11 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -17085,49 +17084,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -DG -DG -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK Md "} (76,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -17148,17 +17147,17 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX xd xd @@ -17170,12 +17169,12 @@ xd RX RX RX -MX -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -17184,7 +17183,7 @@ xd xd xd RX -MX +ZK RL gy gy @@ -17205,20 +17204,20 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -17246,11 +17245,11 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -17279,49 +17278,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -DG -DG -MX -MX -MX -gy -gy -gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK Md "} (77,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -17343,16 +17342,16 @@ xd RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX xd xd @@ -17362,14 +17361,14 @@ xd xd xd RX -MX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -17378,14 +17377,14 @@ xd xd xd RX -MX +ZK RL gy gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -17440,11 +17439,11 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -17473,80 +17472,80 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -DG -MX -MX -MX -MX -gy -gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -MX -MX -Md -"} -(78,1,1) = {" -Md -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -xd +tV +tV +tV +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +ZK +Md +"} +(78,1,1) = {" +Md +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +xd xd RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX xd xd @@ -17556,14 +17555,14 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -17579,15 +17578,15 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -17619,26 +17618,26 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX +ZK RX RX RX @@ -17667,49 +17666,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -DG -MX -MX -MX -gy -gy -gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -MX -MX +tV +tV +tV +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (79,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -17732,15 +17731,15 @@ xd RX RX xd -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX xd xd @@ -17750,14 +17749,14 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -17772,16 +17771,16 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -17811,28 +17810,28 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX +ZK RX RX RX @@ -17861,49 +17860,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -MX -MX -MX -MX -gy -gy -gy -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (80,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -17926,15 +17925,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX xd xd @@ -17944,16 +17943,16 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -17962,20 +17961,20 @@ xd xd RL RL -MX +ZK gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -17996,37 +17995,37 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -gy -gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX gy gy gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX +gy +gy +gy +ZK RX RX RX @@ -18055,49 +18054,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV eY eY -MX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (81,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -18120,15 +18119,15 @@ RX xd xd RX -MX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX xd xd @@ -18138,16 +18137,16 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -18156,20 +18155,20 @@ xd xd RL RL -MX -MX +ZK +ZK gy gy gy gy -MX -MX -MX +ZK +ZK +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -18190,14 +18189,14 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18211,16 +18210,16 @@ gy gy gy gy -MX -MX +ZK +ZK gy gy gy gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -18240,90 +18239,90 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (82,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RL xd xd @@ -18332,17 +18331,17 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX xd @@ -18351,46 +18350,46 @@ xd RL RL RL -MX +ZK gy gy gy gy -MX +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18413,8 +18412,8 @@ gy gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -18434,109 +18433,109 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (83,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RL -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -RL -xd +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RL +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +RL +xd xd xd xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK RX RX xd @@ -18544,40 +18543,40 @@ xd xd RL RL -MX -MX +ZK +ZK gy gy gy gy gy gy -MX +ZK gy -MX -MX +ZK +ZK gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18590,10 +18589,10 @@ gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy @@ -18605,10 +18604,10 @@ gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -18628,90 +18627,90 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK gy gy -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK Md "} (84,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL -MX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RL xd xd @@ -18720,17 +18719,17 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX xd @@ -18748,28 +18747,28 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18783,26 +18782,26 @@ gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -18819,124 +18818,124 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK gy gy -MX +ZK gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RL -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} (85,1,1) = {" Md -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RL -MX -MX -MX -MX -DG -DG -DG -DG -MX -RL -xd -xd -xd -xd -xd -xd -RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -RX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RL +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +RL +xd +xd +xd +xd +xd +xd +RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +RX RX RX RX RX RX xd -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -18945,20 +18944,20 @@ gy gy gy gy -MX -MX +ZK +ZK gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK vu -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18969,25 +18968,25 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19003,37 +19002,37 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX +ZK gy gy gy @@ -19041,65 +19040,65 @@ gy gy gy gy -MX +ZK RL -MX -MX -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} (86,1,1) = {" Md -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -DG -DG -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK RL -MX -MX -MX -DG -DG -MX -DG -MX +ZK +ZK +ZK +tV +tV +ZK +tV +ZK RL xd xd @@ -19108,19 +19107,19 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV RX RX RX @@ -19128,8 +19127,8 @@ RX RX RX xd -MX -MX +ZK +ZK gy gy gy @@ -19162,17 +19161,17 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19195,126 +19194,126 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX -MX -MX +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK Md "} (87,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd -xd -xd +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd +xd +xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV RX RX RX @@ -19323,11 +19322,11 @@ RX RX RX RL -MX -MX +ZK +ZK gy -MX -MX +ZK +ZK gy gy gy @@ -19354,11 +19353,11 @@ gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19389,105 +19388,105 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (88,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -DG -DG -MX -DG -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -19496,19 +19495,19 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV RX RX RX @@ -19516,13 +19515,13 @@ xd RX RX RX -MX +ZK RL gy RL -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -19544,15 +19543,15 @@ gy gy gy RL -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19583,175 +19582,175 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK RX RX -MX -MX -DG -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (89,1,1) = {" Md -DG -DG -MX -MX -MX -DG -DG -DG -MX -DG -DG -DG -DG -DG -MX -DG -DG -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd -xd -xd -xd -xd -RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -DG -DG -MX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -MX -MX -MX -MX -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX +tV +tV +ZK +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd +xd +xd +xd +xd +RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +gy +gy +gy +gy +gy +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX RX RX RX @@ -19777,29 +19776,29 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -19809,73 +19808,73 @@ RX RX RX RX -MX +ZK gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX -MX -MX -DG -MX -DG -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +ZK +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (90,1,1) = {" Md -MX -DG -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -19884,19 +19883,19 @@ xd xd xd RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK RX RX RX @@ -19904,34 +19903,34 @@ RX xd RX xd -MX -MX -MX +ZK +ZK +ZK RL -MX -MX +ZK +ZK RL -MX +ZK gy gy -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy -MX +ZK gy gy -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19971,29 +19970,29 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -20002,95 +20001,95 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -Md -"} -(91,1,1) = {" -Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RL -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(91,1,1) = {" +Md +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RL +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd xd xd xd xd RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -20100,26 +20099,26 @@ xd RX RX RX -MX -MX +ZK +ZK RL RL -MX -MX +ZK +ZK gy -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -20166,28 +20165,28 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -20196,74 +20195,74 @@ RX RX RX RX -MX +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (92,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RL -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -20272,19 +20271,19 @@ xd xd xd RX -MX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX RX @@ -20294,26 +20293,26 @@ RX RX RX RX -MX +ZK RL -MX -MX -MX +ZK +ZK +ZK RL RL -MX +ZK RL -MX +ZK RL -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -20361,25 +20360,25 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -20389,105 +20388,105 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (93,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd -xd -xd -xd -xd -RX -MX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -xd -xd -xd -xd +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd +xd +xd +xd +xd +RX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +xd +xd +xd +xd xd xd xd @@ -20496,18 +20495,18 @@ RX RX RX xd -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -20558,20 +20557,20 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -20583,11 +20582,11 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -20595,63 +20594,63 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (94,1,1) = {" Md -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -20660,17 +20659,17 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -MX -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +tV +tV +ZK +ZK RX RX RX @@ -20752,20 +20751,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -20775,13 +20774,13 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX +ZK RX RX RX @@ -20789,82 +20788,82 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (95,1,1) = {" Md -MX -DG -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -20894,14 +20893,12 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -RX -RX +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -20945,37 +20942,39 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +RX RX RX RX RX RX RX -MX -MX -MX -MX +RX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -20983,82 +20982,82 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (96,1,1) = {" Md -MX -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -21087,13 +21086,13 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -21137,20 +21136,20 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -21162,13 +21161,13 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX +ZK RX RX RX @@ -21177,86 +21176,86 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (97,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -21281,13 +21280,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX xd RX @@ -21331,20 +21330,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -21355,14 +21354,14 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -21371,100 +21370,100 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (98,1,1) = {" Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -RX -RX -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +RX +RX +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd xd xd xd @@ -21475,13 +21474,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX xd RX @@ -21525,20 +21524,20 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -21549,13 +21548,13 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX +ZK RX RX RX @@ -21565,87 +21564,87 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (99,1,1) = {" Md -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -MX -DG -DG -DG -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +tV +tV +tV +ZK RX RX xd @@ -21669,13 +21668,13 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK RX xd RX @@ -21717,22 +21716,22 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -21743,13 +21742,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -21759,287 +21758,93 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (100,1,1) = {" Md -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -RX -RX -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -MX -MX -RX -RX -RX -xd -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -Md -"} -(101,1,1) = {" -Md -MX -MX -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -RX -RX +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX xd -RX +xd +xd +xd xd xd xd @@ -22056,12 +21861,12 @@ RX RX RX RX -MX -DG -DG -DG -MX -RX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -22105,18 +21910,18 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -22128,16 +21933,16 @@ RX RX RX RX -MX -MX -MX -gy +ZK +ZK +ZK +ZK gy gy gy -MX -MX -RX +ZK +ZK +ZK RX RX RX @@ -22147,92 +21952,92 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(102,1,1) = {" +(101,1,1) = {" Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -RX -RX +ZK +ZK +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK RX RX RX RX +xd RX xd xd @@ -22249,12 +22054,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +RX +ZK +tV +tV +tV +ZK RX RX RX @@ -22298,19 +22103,19 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -22322,15 +22127,15 @@ RX RX RX RX -MX -MX +ZK +ZK +ZK gy gy gy gy -MX -RX -RX +ZK +ZK RX RX RX @@ -22341,84 +22146,86 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -Md +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md "} -(103,1,1) = {" +(102,1,1) = {" Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RX -RX -RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -22427,28 +22234,26 @@ RX RX RX xd -RX xd -RX -RX -RX -RX -RX -RX -RX +xd +xd +xd +xd +xd +xd +xd xd RX RX RX RX RX -RX -MX -DG -DG -DG -MX -RX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -22492,19 +22297,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +RX RX RX RX @@ -22515,14 +22321,13 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +gy gy gy gy -MX -MX +ZK RX RX RX @@ -22535,81 +22340,81 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(104,1,1) = {" +(103,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -22620,7 +22425,9 @@ RX RX RX RX +xd RX +xd RX RX RX @@ -22628,20 +22435,18 @@ RX RX RX RX +xd RX RX RX -MX -RL -MX -MX -MX RX -MX -DG -DG -MX -MX +RX +RX +ZK +tV +tV +tV +ZK RX RX RX @@ -22684,21 +22489,21 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +RX +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -22709,14 +22514,14 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK +gy gy gy -MX -MX -MX +ZK +ZK RX RX RX @@ -22729,144 +22534,81 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(105,1,1) = {" +(104,1,1) = {" Md -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX -xd -xd -xd -xd -xd -xd -xd -RX -RX -MX -MX -DG -DG -RL -MX -MX -DG -DG -DG -MX -RX -RX -RX -RX -RX -RX -xd -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -22878,39 +22620,9 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX -MX RX RX RX @@ -22918,125 +22630,29 @@ RX RX RX RX +ZK +RL +ZK +ZK +ZK RX +ZK +tV +tV +ZK +ZK RX RX RX RX -MX -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(106,1,1) = {" -Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -RL -RL -RL -RL -RL -RL -RL -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX RX xd -xd -xd -xd -xd -xd -xd -RX -RX -MX -DG -DG -MX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX RX RX -xd -RX RX RX RX @@ -23067,44 +22683,39 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy +ZK +ZK +ZK gy gy -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -23117,91 +22728,91 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(107,1,1) = {" +(105,1,1) = {" Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -RL -xd -xd -xd -xd -xd -xd -xd -MX -DG -DG -DG -DG -DG -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX xd xd @@ -23212,17 +22823,17 @@ xd xd RX RX -MX -DG -DG -MX -MX -DG -DG -DG -DG -MX -xd +ZK +ZK +tV +tV +RL +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -23265,41 +22876,41 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -RX -RX -RX RX -MX -MX -MX -MX -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +RX RX RX RX @@ -23311,91 +22922,91 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -DG -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(108,1,1) = {" +(106,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV RL -xd -xd -xd -xd -xd -xd -xd -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +RL +RL +RL +RL +RL +RL +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX xd xd @@ -23405,22 +23016,22 @@ xd xd xd RX -MX -MX -DG -MX -MX -MX -DG -DG -DG -MX -MX +RX +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +RX RX RX -xd RX -xd RX RX xd @@ -23459,38 +23070,38 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX -MX -MX -MX -gy -gy -gy -gy -gy -gy -gy -gy +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -RX -RX +ZK +ZK RX RX RX @@ -23505,63 +23116,63 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK Md "} -(109,1,1) = {" +(107,1,1) = {" Md -MX -MX -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV RL xd xd @@ -23570,26 +23181,26 @@ xd xd xd xd -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX xd xd @@ -23599,28 +23210,26 @@ xd xd xd RX -MX -DG -DG -MX -MX -DG -DG -DG -MX -MX -RX -RX -RX -RX RX +ZK +tV +tV +ZK +ZK +tV +tV +tV +tV +ZK +xd RX RX RX -xd RX RX RX +xd +RX RX RX RX @@ -23653,24 +23262,26 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +RX RX RX RX -MX -MX -MX -gy -gy +ZK +ZK +ZK +ZK gy gy gy @@ -23682,9 +23293,9 @@ gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -23699,63 +23310,63 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(110,1,1) = {" +(108,1,1) = {" Md -MX -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV RL xd xd @@ -23764,51 +23375,51 @@ xd xd xd xd -MX -DG -DG -DG -DG -DG -MX -MX -RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -DG -MX -MX -DG -DG -DG -MX -MX -RX -RX +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX +xd +xd +xd +xd +xd +xd +xd RX +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX +xd RX +xd RX RX xd @@ -23847,24 +23458,23 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +RX RX RX RX -MX -MX -MX -gy -gy -gy -gy +ZK +ZK +ZK gy gy gy @@ -23876,9 +23486,9 @@ gy gy gy gy -MX -MX -MX +ZK +ZK +RX RX RX RX @@ -23893,63 +23503,64 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +RX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(111,1,1) = {" +(109,1,1) = {" Md -DG -DG -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -23958,26 +23569,46 @@ xd xd xd xd -DG -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX +xd +xd +xd +xd +xd +xd +xd RX +ZK +tV +tV +ZK +ZK +tV +tV +tV +ZK +ZK RX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX @@ -23985,19 +23616,11 @@ RX RX RX RX +xd +RX +RX +RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -24005,7 +23628,6 @@ RX RX RX RX -xd RX RX RX @@ -24030,29 +23652,22 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -24063,16 +23678,12 @@ gy gy gy gy -MX -MX -MX -MX gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -24087,119 +23698,127 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(112,1,1) = {" +(110,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +RL +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +tV +tV +ZK +ZK +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +RX +RX RX RX RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +RX +ZK +tV +ZK +ZK +tV +tV +tV +ZK +ZK +RX +RX RX RX RX RX RX -MX -MX -MX -DG -DG -MX -MX RX RX +xd RX RX RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX RX RX -xd RX RX RX @@ -24227,22 +23846,20 @@ RX RX RX RX -MX -MX -MX -gy -gy -gy -gy -gy -gy -DG -DG -DG -DG -gy -gy -gy +ZK +tV +tV +tV +tV +tV +ZK +ZK +RX +RX +RX +ZK +ZK +ZK gy gy gy @@ -24255,18 +23872,12 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX gy gy gy -MX -MX +ZK +ZK +ZK RX RX RX @@ -24281,116 +23892,116 @@ RX RX RX RX -MX -MX -MX -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(113,1,1) = {" +(111,1,1) = {" Md -MX -DG -MX -MX -DG -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -RX +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +RL +xd +xd +xd +xd +xd +xd +xd +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -RL RX RX RX RX RX RX -MX -MX -MX -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX RX RX xd @@ -24421,25 +24032,26 @@ RX RX RX RX -MX -gy -gy -gy -gy -gy -eY -eY -fj -fj -fj -fj -fj -eY -gy -gy -gy -gy -gy +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -24448,19 +24060,18 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX +gy +gy +ZK +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK +ZK RX RX RX @@ -24475,117 +24086,117 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(114,1,1) = {" +(112,1,1) = {" Md -MX -MX -MX -DG -DG -MX -DG -DG -MX -MX -DG -DG -MX -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd -xd -xd -xd -xd -xd -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -xd -xd -xd +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +RX +RX RX RX RX RX -MX -MX -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +ZK +ZK +RX RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +RX +RX +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +RX RX xd RX @@ -24615,22 +24226,19 @@ RX RX RX RX -MX -MX -Lc +ZK +ZK +ZK +gy gy gy gy -eY -fj -fj -fj -fj -fj -eY -eY gy gy +tV +tV +tV +tV gy gy gy @@ -24640,21 +24248,24 @@ gy gy gy gy -MX -MX -MX -RX -RX -MX -MX -MX -MX gy gy gy gy gy -MX +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK RX RX RX @@ -24669,123 +24280,119 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(115,1,1) = {" +(113,1,1) = {" Md -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -xd -xd -xd -xd -xd -xd -xd -xd -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -RX -xd -xd -xd -xd -RL -RL -RL -DG -MX -RX +ZK +tV +ZK +ZK +tV +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX RX -xd RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +RL +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +ZK +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +RX +RX +xd RX RX RX @@ -24809,19 +24416,24 @@ RX RX RX RX -MX -MX -MX -MX +RX +RX +RX +RX +ZK +gy gy gy gy -DG -DG -DG -DG -DG gy +eY +eY +fj +fj +fj +fj +fj +eY gy gy gy @@ -24831,24 +24443,23 @@ gy gy gy gy -MX -MX -MX -MX -RX -RX -RX -RX -MX -MX -MX -MX gy gy gy gy -Lc -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK RX RX RX @@ -24863,120 +24474,119 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(116,1,1) = {" +(114,1,1) = {" Md -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -DG -DG -MX -RX +ZK +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd xd xd xd xd xd +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK xd xd xd -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX +ZK +ZK +tV +tV +ZK RX RX -MX -MX -DG -RL -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX +xd RX RX RX @@ -25004,45 +24614,46 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +Lc +gy +gy +gy +eY +fj +fj +fj +fj +fj +eY +eY gy gy gy gy gy -MX -MX -MX -MX -RX -RX -RX +gy +gy +gy +gy +gy +gy +ZK +ZK +ZK RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy gy -MX +ZK RX RX RX @@ -25057,60 +24668,60 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(117,1,1) = {" +(115,1,1) = {" Md -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -RX +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK xd xd xd @@ -25119,66 +24730,57 @@ xd xd xd xd -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -RX -RX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX +xd +xd +xd +xd +RL +RL +RL +tV +ZK RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX +xd RX RX RX @@ -25202,41 +24804,50 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX RX +ZK +ZK +ZK +ZK +gy +gy +gy +tV +tV +tV +tV +tV +gy +gy +gy +gy +gy +gy +gy +gy +gy +gy +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX +Lc +ZK RX RX RX @@ -25251,59 +24862,59 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(118,1,1) = {" +(116,1,1) = {" Md -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK RX xd xd @@ -25313,70 +24924,55 @@ xd xd xd xd -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -RL -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -RX -RX -RX -RX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX RX +ZK +ZK +tV +RL +ZK +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -25396,14 +24992,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX RX RX RX @@ -25415,22 +25003,45 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX +ZK RX RX RX @@ -25445,129 +25056,121 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(119,1,1) = {" +(117,1,1) = {" Md -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -MX -MX -DG -DG -MX -MX -RX -RX -xd -xd -xd +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +RX xd xd xd xd xd -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -RL -RL -MX xd xd xd +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +RX RX -xd RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -25590,14 +25193,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX RX RX RX @@ -25606,6 +25201,23 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -25614,17 +25226,16 @@ RX RX RX RX -MX -MX -MX -MX -gy +ZK +ZK +ZK +ZK gy gy gy gy -MX -RX +ZK +ZK RX RX RX @@ -25639,59 +25250,59 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(120,1,1) = {" +(118,1,1) = {" Md -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -RX -RX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX xd xd @@ -25701,97 +25312,61 @@ xd xd xd xd -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RL -RL -DG -RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK +ZK RX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -MX -MX RX RX RX @@ -25806,18 +25381,6 @@ RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -gy -gy -gy -MX -MX RX RX RX @@ -25832,99 +25395,18 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -Md -"} -(121,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX RX RX RX -xd -xd -xd -xd -xd -xd -xd -xd -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX RX RX RX @@ -25937,22 +25419,19 @@ RX RX RX RX +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -25965,27 +25444,126 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(119,1,1) = {" +Md +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +tV +tV +ZK +ZK RX RX +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +RL +RL +ZK +xd +xd +xd RX +xd RX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -26000,17 +25578,6 @@ RX RX RX RX -MX -MX -MX -gy -gy -gy -gy -gy -MX -MX -MX RX RX RX @@ -26022,100 +25589,20 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(122,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -MX -DG -DG -DG -DG -DG -RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -26126,6 +25613,16 @@ RX RX RX RX +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK RX RX RX @@ -26134,21 +25631,6 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -26156,15 +25638,126 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(120,1,1) = {" +Md +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX +RL +RL +tV +RL +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -26172,14 +25765,6 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -26191,17 +25776,6 @@ RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -gy -gy -gy -gy RX RX RX @@ -26209,6 +25783,14 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26219,97 +25801,26 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(123,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX -MX -DG -DG -DG -DG -MX -MX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK +ZK RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -DG -DG -DG -DG -DG -MX -MX -RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX RX RX RX @@ -26321,30 +25832,103 @@ RX RX RX RX +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(121,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX RX RX RX @@ -26354,6 +25938,20 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -26364,16 +25962,6 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -26384,23 +25972,19 @@ RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -gy -gy -gy -MX -MX RX RX RX RX RX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26411,40 +25995,21 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(124,1,1) = {" -Md -MX -MX -MX RX RX RX RX +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK +ZK +ZK RX RX RX @@ -26458,14 +26023,60 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(122,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -26477,35 +26088,33 @@ xd xd RL RL -DG -DG -DG -DG -DG -MX -MX -MX -RL -MX -MX +ZK +tV +tV +tV +tV +tV RL -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -26524,28 +26133,21 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -26558,16 +26160,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -26578,19 +26170,15 @@ RX RX RX RX -MX -MX -MX -MX -gy -gy -gy -gy -gy -MX -MX -MX RX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26602,39 +26190,18 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +gy RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(125,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -26651,14 +26218,58 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(123,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26671,30 +26282,33 @@ xd xd RL RL -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +tV +tV +tV +tV +tV +ZK +ZK RL -xd -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -26714,27 +26328,27 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX RX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX RX RX RX @@ -26749,19 +26363,16 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26772,16 +26383,18 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +gy gy gy gy gy -MX -MX -MX +ZK +ZK RX RX RX @@ -26797,38 +26410,36 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(126,1,1) = {" +(124,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -26845,18 +26456,18 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX +RX +ZK +tV +tV +tV +ZK +ZK +ZK +RX RX RX RX -xd xd xd xd @@ -26865,23 +26476,31 @@ xd xd RL RL -DG -DG -DG -DG -DG -MX -MX -MX -MX -RX -RX -RX -RX +tV +tV +tV +tV +tV +ZK +ZK +ZK +RL +ZK +ZK +RL +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX -xd -xd -xd RX RX RX @@ -26904,6 +26523,21 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -26913,24 +26547,6 @@ RX RX RX RX -MX -MX -MX -RX -RX -RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -RX -RX RX RX RX @@ -26941,20 +26557,18 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -26963,20 +26577,18 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -RX +gy +ZK +ZK +ZK RX RX RX @@ -26990,45 +26602,38 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(127,1,1) = {" +(125,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -27039,14 +26644,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX @@ -27054,19 +26651,39 @@ RX RX RX RX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX +xd +xd +xd +xd +xd +xd +RL +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RL +xd RX RX RX @@ -27098,34 +26715,31 @@ RX RX RX RX -xd -xd -xd RX RX +ZK +ZK +ZK +ZK RX +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX -MX -MX -MX RX RX RX -MX -MX -MX -MX -DG -DG -MX -DG -DG -MX -MX -MX -MX RX RX RX @@ -27134,21 +26748,21 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -27157,66 +26771,21 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(128,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -27227,19 +26796,44 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(126,1,1) = {" +Md +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX @@ -27250,23 +26844,43 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX +xd +xd +xd +xd +xd +xd +xd +RL +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX +xd +xd +xd RX RX RX @@ -27292,35 +26906,31 @@ RX RX RX RX -xd RX -xd RX RX RX RX RX +ZK +ZK +ZK RX -MX -MX -MX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX -MX -MX -MX -DG -DG -MX -DG -DG -MX -MX -MX -MX RX RX RX @@ -27330,19 +26940,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -27351,68 +26962,19 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(129,1,1) = {" -Md -MX -MX -MX -RX -RX +gy +ZK +ZK +ZK +ZK RX RX RX @@ -27427,13 +26989,46 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(127,1,1) = {" +Md +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -27443,20 +27038,33 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +RX +RX +RX +RX +RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -27484,79 +27092,83 @@ RX RX RX RX -xd RX RX RX RX RX xd +xd +xd +RX +RX +RX RX RX RX +ZK +ZK +ZK +RX RX -MX -MX -MX RX +ZK +ZK +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX -DG -DG -MX -DG -DG -DG -MX -MX -MX RX RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -RX +gy +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -27569,44 +27181,41 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(130,1,1) = {" +(128,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -27621,15 +27230,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -27639,17 +27248,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -27682,51 +27291,57 @@ RX RX RX RX +xd RX +xd RX RX RX RX RX RX -MX +ZK +ZK +ZK RX RX RX RX RX +ZK +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -DG -DG -MX -MX -DG -DG -DG -MX -MX RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -27735,17 +27350,17 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +gy +ZK +ZK +ZK +ZK RX RX RX @@ -27760,50 +27375,41 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(131,1,1) = {" +(129,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -27815,38 +27421,38 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -27871,7 +27477,6 @@ RX RX RX RX -xd RX RX RX @@ -27884,63 +27489,72 @@ RX RX RX RX +xd RX RX RX RX +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -MX -MX -DG -MX -MX -RX +ZK +ZK +ZK +ZK +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -RX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -27954,47 +27568,42 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(132,1,1) = {" +(130,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -28009,15 +27618,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -28027,17 +27636,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -28079,6 +27688,7 @@ RX RX RX RX +ZK RX RX RX @@ -28088,33 +27698,34 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -28123,17 +27734,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +RX RX RX RX @@ -28146,49 +27758,46 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(133,1,1) = {" +(131,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -28203,15 +27812,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -28221,17 +27830,17 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -28261,12 +27870,14 @@ RX RX RX RX +xd RX RX RX RX RX RX +xd RX RX RX @@ -28281,34 +27892,34 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -28317,16 +27928,18 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK +RX RX RX RX @@ -28340,49 +27953,45 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(134,1,1) = {" +(132,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -28397,46 +28006,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -28448,6 +28026,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -28481,28 +28068,7 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX RX RX RX @@ -28511,70 +28077,11 @@ RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -Md -"} -(135,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -28582,26 +28089,50 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK RX RX RX @@ -28609,20 +28140,52 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(133,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -28639,6 +28202,13 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -28650,6 +28220,15 @@ RX RX RX RX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -28676,99 +28255,17 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -Md -"} -(136,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -28785,35 +28282,50 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK RX RX RX @@ -28827,6 +28339,47 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(134,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -28843,6 +28396,13 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -28854,6 +28414,15 @@ RX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -28872,97 +28441,16 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX RX -MX -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -Md -"} -(137,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -28979,13 +28467,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX @@ -28997,18 +28478,30 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -29017,149 +28510,70 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK RX RX RX RX RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -MX -MX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -MX -DG -DG -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(138,1,1) = {" +(135,1,1) = {" Md -MX -MX -MX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -29173,16 +28587,16 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -29191,18 +28605,18 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -29261,100 +28675,99 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX -MX -gy -gy -gy -gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -RL -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(139,1,1) = {" +(136,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -29367,17 +28780,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -29385,19 +28798,19 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -29456,99 +28869,99 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -RL RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX -MX -RL -MX -MX -MX -RL -gy -gy -gy -MX -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(140,1,1) = {" +(137,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -29561,17 +28974,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -29579,19 +28992,19 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -29652,93 +29065,97 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -MX -MX -RX -RX -RX -RX +gy +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(141,1,1) = {" +(138,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -29755,13 +29172,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -29773,15 +29190,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -29843,120 +29260,63 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX -xd -xd -xd -xd -xd -xd -MX -MX -MX -MX -MX +ZK +ZK +ZK gy gy gy -vu -MX -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -Md -"} -(142,1,1) = {" -Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -MX -RX -RX +gy +gy +gy +RL +ZK +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -29964,18 +29324,37 @@ RX RX RX RX +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +Md +"} +(139,1,1) = {" +Md +ZK +ZK +ZK +RX +RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX RX RX RX @@ -29987,6 +29366,13 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -29998,6 +29384,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -30042,10 +29437,6 @@ RX RX RX RX -MX -MX -MX -MX RX RX RX @@ -30055,43 +29446,6 @@ RX RX RX RX -xd -xd -xd -xd -xd -xd -MX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX RX RX RX @@ -30101,54 +29455,101 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -Md -"} -(143,1,1) = {" -Md -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +RL +RX RX RX RX RX RX +ZK +RL +ZK +ZK +ZK +RL +gy +gy +gy +ZK +ZK +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +RX +RX +RX RX RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +Md +"} +(140,1,1) = {" +Md +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -DG -DG -DG -MX RX RX RX @@ -30159,17 +29560,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -30179,6 +29578,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -30243,49 +29651,58 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX -xd -xd -xd -xd -xd -xd -MX -MX -MX -MX -MX -gy +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RL -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -30295,32 +29712,32 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(144,1,1) = {" +(141,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -30337,49 +29754,37 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX -xd -xd -xd -xd -RX RX RX RX @@ -30440,6 +29845,18 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -30449,37 +29866,37 @@ xd xd xd xd -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX +vu +ZK +ZK RL -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -30489,32 +29906,32 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(145,1,1) = {" +(142,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -30531,40 +29948,36 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK +RX RX RX RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +RX +RX +RX RX RX RX @@ -30628,6 +30041,10 @@ RX RX RX RX +ZK +ZK +ZK +ZK RX RX RX @@ -30643,37 +30060,37 @@ xd xd xd xd -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -RX +gy +ZK +ZK +ZK +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -30683,32 +30100,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(146,1,1) = {" +(143,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -30725,35 +30142,35 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -DG -DG -DG -DG -DG -MX -MX -MX -MX +RX +RX +RX +RX +RX +RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +RX +RX RX RX RX @@ -30837,36 +30254,36 @@ xd xd xd xd -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +gy +ZK +ZK +ZK +RL +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -30877,32 +30294,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(147,1,1) = {" +(144,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -30919,12 +30336,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -30937,32 +30354,17 @@ xd xd xd xd -xd RL -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -30972,6 +30374,10 @@ RX RX RX RX +xd +xd +xd +xd RX RX RX @@ -31025,42 +30431,53 @@ RX RX RX RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +xd xd xd xd xd -xd -xd -MX -MX -MX +xd +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -RX -RX +gy +ZK +ZK +ZK +ZK +RL +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -31071,32 +30488,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(148,1,1) = {" +(145,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -31113,12 +30530,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -31131,32 +30548,32 @@ xd xd xd xd -xd RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -31225,36 +30642,36 @@ xd xd xd xd -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -RX -RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -31265,32 +30682,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(149,1,1) = {" +(146,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -31307,12 +30724,12 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -31325,35 +30742,20 @@ xd xd xd xd -xd RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX RX RX RX @@ -31361,7 +30763,6 @@ RX RX RX RX -xd RX RX RX @@ -31419,34 +30820,6 @@ RX RX RX RX -MX -MX -MX -gy -gy -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -31457,34 +30830,80 @@ RX RX RX RX +xd +xd +xd +xd +xd +xd +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(150,1,1) = {" +(147,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX RX RX RX @@ -31492,8 +30911,6 @@ RX RX RX RX -xd -xd RX RX RX @@ -31501,18 +30918,18 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK +RX RX RX RX RX RX -xd xd xd xd @@ -31521,40 +30938,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -MX -DG -MX -MX -MX -RX -RX -RX +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX -xd RX RX RX @@ -31613,34 +31023,41 @@ RX RX RX RX -MX -MX -DG -eY -eY -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX RX +xd +xd +xd +xd +xd +xd +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -31653,32 +31070,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(151,1,1) = {" +(148,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -31695,13 +31112,13 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +RX RX RX RX @@ -31715,36 +31132,30 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -31756,7 +31167,6 @@ RX RX RX RX -xd RX RX RX @@ -31807,34 +31217,41 @@ RX RX RX RX -MX -MX -DG -fj -fj -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX RX +xd +xd +xd +xd +xd +xd +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -31847,32 +31264,32 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -DG -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(152,1,1) = {" +(149,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -31883,19 +31300,19 @@ RX RX RX RX -xd RX RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +RX +ZK +tV +tV +tV +ZK +ZK +RX RX RX RX @@ -31909,33 +31326,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -MX -MX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -31943,13 +31360,12 @@ RX RX RX RX +xd RX RX RX RX -xd RX -xd RX RX RX @@ -32000,36 +31416,36 @@ RX RX RX RX -MX -MX -MX -DG -fj -fj -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX +ZK +ZK +ZK +gy +gy +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -32041,33 +31457,33 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -Md -"} -(153,1,1) = {" -Md -MX -MX -MX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(150,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -32075,21 +31491,23 @@ RX RX RX RX +xd +xd +RX RX RX RX RX RX RX +ZK +tV +tV +tV +ZK +ZK RX RX -MX -DG -DG -DG -MX -MX -MX RX RX RX @@ -32101,42 +31519,41 @@ xd xd xd xd -xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK RX RX RX RX RX RX +xd RX RX RX @@ -32192,36 +31609,36 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -fj -fj -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX +ZK +ZK +tV +eY +eY +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -32235,32 +31652,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(154,1,1) = {" +(151,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -32277,17 +31694,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +RX RX RX RX -xd RX xd xd @@ -32297,33 +31714,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -32338,6 +31755,7 @@ RX RX RX RX +xd RX RX RX @@ -32385,37 +31803,36 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -fj -fj -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX +ZK +ZK +tV +fj +fj +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -32429,32 +31846,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(155,1,1) = {" +(152,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -32465,20 +31882,20 @@ RX RX RX RX +xd RX RX RX RX RX +ZK +tV +tV +tV +ZK +ZK +ZK RX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX @@ -32491,42 +31908,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +ZK +ZK RX RX RX @@ -32538,7 +31946,9 @@ RX RX RX RX +xd RX +xd RX RX RX @@ -32578,27 +31988,6 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -fj -fj -DG -DG -MX -MX -MX -RX -RX -MX -MX -MX -RX RX RX RX @@ -32610,6 +31999,34 @@ RX RX RX RX +ZK +ZK +ZK +tV +fj +fj +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -32623,33 +32040,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(156,1,1) = {" +(153,1,1) = {" Md -MX -MX -MX -RX +ZK +ZK +ZK RX RX RX @@ -32665,15 +32081,14 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX RX +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -32684,40 +32099,36 @@ xd xd xd xd +xd +xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -32771,28 +32182,7 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -fj -fj -DG -RL -MX -MX RX -xd -xd -xd -RL -RL -xd RX RX RX @@ -32801,6 +32191,33 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +fj +fj +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -32817,32 +32234,32 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(157,1,1) = {" +(154,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -32859,17 +32276,17 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX +xd RX xd xd @@ -32879,44 +32296,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -32964,29 +32370,8 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -eY -eY -RL -RL -MX RX RX -xd -xd -xd -xd -xd -xd RX RX RX @@ -32999,6 +32384,34 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +fj +fj +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -33011,36 +32424,36 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -Md -"} -(158,1,1) = {" -Md -MX -MX -MX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +Md +"} +(155,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -33052,17 +32465,21 @@ RX RX RX RX -xd -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX +RX +RX +RX +RX +RX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +RX +RX RX RX xd @@ -33073,32 +32490,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -33132,15 +32550,6 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX @@ -33156,31 +32565,9 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -gy -gy -RL -RL RX RX RX -xd -xd -xd -xd -xd -xd RX RX RX @@ -33190,6 +32577,34 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +fj +fj +tV +tV +ZK +ZK +ZK +RX +RX +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -33205,32 +32620,36 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(159,1,1) = {" +(156,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX RX RX RX @@ -33245,18 +32664,16 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX RX xd @@ -33267,32 +32684,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -DG -MX -MX -DG -MX -DG -MX -MX -DG -MX -MX -MX -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -33325,16 +32743,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -33342,38 +32750,47 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -RL -gy -gy -RL -RL -MX RX RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +fj +fj +tV +RL +ZK +ZK +RX xd xd xd -xd -xd +RL +RL xd RX RX @@ -33399,32 +32816,33 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(160,1,1) = {" +(157,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX RX RX RX @@ -33440,17 +32858,16 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX RX RX xd @@ -33461,37 +32878,33 @@ xd xd xd RL -MX -DG -DG -DG -MX -DG -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -MX -MX -DG -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -33516,51 +32929,55 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RL -gy -gy +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +eY +eY RL RL -RX +ZK RX RX xd @@ -33593,35 +33010,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(161,1,1) = {" +(158,1,1) = {" Md -MX -MX -MX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -33637,15 +33051,18 @@ RX RX RX RX +xd +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK RX -MX -MX -DG -DG -DG -DG -MX -MX RX xd xd @@ -33654,29 +33071,35 @@ xd xd xd xd -xd -MX -DG -DG -DG -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX RX RX RX @@ -33706,54 +33129,48 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RL -gy +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV gy gy RL +RL RX RX RX @@ -33787,34 +33204,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(162,1,1) = {" +(159,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -33831,17 +33246,18 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -MX -MX -xd xd xd xd @@ -33849,25 +33265,39 @@ xd xd xd xd -MX -DG -DG -DG -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +tV +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -MX -MX RX RX RX @@ -33894,69 +33324,56 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX -RL -gy -gy -gy -RL -MX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +RL +gy +gy +RL +RL +ZK +RX +RX +xd +xd xd xd xd xd -xd -xd RX RX RX @@ -33981,60 +33398,35 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(163,1,1) = {" +(160,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX RX RX RX @@ -34043,22 +33435,53 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX +xd +xd +xd +xd +xd +xd +xd +RL +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +tV +ZK RX RX RX @@ -34089,60 +33512,54 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RL gy gy -gy RL -MX +RL +RX RX RX xd @@ -34175,37 +33592,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(164,1,1) = {" +(161,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -34219,36 +33631,51 @@ RX RX RX RX -xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK RX RX RX @@ -34278,67 +33705,57 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RL +gy +gy +gy +RL RX RX RX -RX -RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RX -RX -RX -RX -MX -gy -gy -gy -gy -RL -MX -RX -RX xd xd xd @@ -34369,40 +33786,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(165,1,1) = {" +(162,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -34415,40 +33824,49 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX +ZK +ZK +ZK +ZK RX RX RX @@ -34475,62 +33893,61 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX -MX -MX +RL gy gy gy RL -RL -MX +ZK RX RX xd @@ -34563,32 +33980,33 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(166,1,1) = {" +(163,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX RX RX RX @@ -34608,36 +34026,31 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -34669,62 +34082,66 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX -MX -MX +ZK +RL gy gy gy RL -RL -MX +ZK RX RX xd @@ -34757,33 +34174,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(167,1,1) = {" +(164,1,1) = {" Md -MX -MX -MX -RX +ZK +ZK +ZK RX RX RX @@ -34804,34 +34220,34 @@ RX RX xd RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -MX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -34858,69 +34274,70 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -gy -gy -gy -gy -RL -RL +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX +RX +ZK +gy +gy +gy +gy RL -xd -xd +ZK +RX +RX xd xd xd @@ -34951,32 +34368,34 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL +ZK +ZK +ZK +ZK RL RL RL RL RL -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(168,1,1) = {" +(165,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX RX RX RX @@ -34995,43 +34414,39 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX @@ -35050,71 +34465,73 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX RX RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +ZK +ZK gy gy -RL gy RL RL -xd -xd -xd +ZK +RX +RX xd xd xd @@ -35145,40 +34562,32 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL +ZK +ZK +ZK +ZK RL RL RL RL RL -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(169,1,1) = {" +(166,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -35190,131 +34599,51 @@ RX RX RX RX -xd RX RX RX RX RX -MX -MX -MX -DG -DG -DG -MX RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX RX RX -xd -xd -xd -xd -xd -RL -RL -RL -gy -RL -RL -gy -RL -RL -xd -xd -xd -xd -xd -xd -xd -xd -xd RX RX RX @@ -35339,33 +34668,45 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL -RL -RL -RL -RL -RL -DG -DG -MX -MX -MX -Md -"} -(170,1,1) = {" -Md -MX -MX -MX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -35375,8 +34716,22 @@ RX RX RX RX +ZK +ZK +gy +gy +gy +RL +RL +ZK RX RX +xd +xd +xd +xd +xd +xd RX RX RX @@ -35384,79 +34739,49 @@ RX RX RX RX -xd RX RX RX RX RX RX -MX -MX -MX -DG -DG -MX -MX RX RX RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +ZK +ZK +RL +RL +RL +RL +RL +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(167,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -35476,39 +34801,37 @@ RX RX RX RX +xd RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX -xd -xd -xd -xd -xd -RL -RL -Lc -gy -RL -RL -gy -RL -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd RX RX RX @@ -35534,6 +34857,49 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -35542,23 +34908,24 @@ xd xd xd xd +xd RL RL +gy +gy +gy +gy RL RL RL -DG -DG -MX -MX -MX -Md -"} -(171,1,1) = {" -Md -MX -MX -MX +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX @@ -35583,66 +34950,40 @@ RX RX RX RX +ZK +ZK +ZK +ZK +RL +RL +RL +RL +RL +RL +RL +RL +RL +RL +tV +tV +ZK +ZK +ZK +Md +"} +(168,1,1) = {" +Md +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX RX RX -MX -MX -MX -DG -MX -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -35660,50 +35001,36 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -xd -xd -xd -xd -xd -RL -RL -RL -gy -RL -gy -gy -RL -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -35722,11 +35049,50 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -35736,26 +35102,24 @@ xd xd xd xd +xd RL RL +gy +gy RL +gy RL RL -DG -DG -MX -MX -MX -Md -"} -(172,1,1) = {" -Md -MX -MX -MX -RX -RX -RX +xd +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX @@ -35779,62 +35143,35 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX RX +ZK +ZK +ZK +ZK +RL +RL +RL +RL +RL +RL +RL +RL +RL +RL +tV +tV +ZK +ZK +ZK +Md +"} +(169,1,1) = {" +Md +ZK +ZK +ZK RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -35852,16 +35189,85 @@ RX RX RX RX +xd RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -35869,6 +35275,17 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -35883,10 +35300,11 @@ RL RL RL gy -gy -gy +RL +RL gy RL +RL xd xd xd @@ -35896,10 +35314,6 @@ xd xd xd xd -xd -RX -RX -RX RX RX RX @@ -35924,44 +35338,32 @@ RX RX RX RX -RX -xd -xd -xd -xd -xd +ZK +ZK +ZK +ZK +RL +RL RL RL RL RL RL -DG -DG -MX -MX -MX +RL +RL +RL +tV +tV +ZK +ZK +ZK Md "} -(173,1,1) = {" +(170,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -35973,61 +35375,9 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -36040,6 +35390,80 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +ZK +ZK +RX +RX +RX +RX +RX +RX +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -36053,13 +35477,6 @@ RX RX RX RX -RX -RX -RX -RX -RX -xd -xd RX RX RX @@ -36071,16 +35488,16 @@ RX xd xd xd +xd +xd RL RL +Lc +gy RL RL -RL -gy -gy gy RL -RL xd xd xd @@ -36129,28 +35546,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK Md "} -(174,1,1) = {" +(171,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -36169,15 +35576,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -36186,47 +35584,66 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX +ZK +ZK +ZK +tV +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -xd RX RX RX @@ -36264,17 +35681,17 @@ RX RX xd xd -RL -RL +xd +xd +xd RL RL RL gy +RL gy gy RL -RL -xd xd xd xd @@ -36323,55 +35740,24 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK Md "} -(175,1,1) = {" +(172,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -36389,36 +35775,67 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -xd -xd RX RX RX @@ -36458,17 +35875,17 @@ RX RX xd xd -RL -RL +xd +xd +xd RL RL RL gy gy +gy +gy RL -RL -RL -xd xd xd xd @@ -36517,28 +35934,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK Md "} -(176,1,1) = {" +(173,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -36558,14 +35965,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -MX RX RX RX @@ -36573,14 +35972,67 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX +xd RX RX RX @@ -36593,10 +36045,6 @@ RX RX RX RX -MX -MX -MX -MX RX RX RX @@ -36619,37 +36067,8 @@ RX RX RX RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +xd +xd xd RL RL @@ -36671,8 +36090,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -36711,55 +36128,21 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(177,1,1) = {" +(174,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX RX RX RX @@ -36785,6 +36168,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -36796,19 +36188,44 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX xd -xd -RX -RX -RX -RX -RX -RX RX RX RX @@ -36845,6 +36262,8 @@ RX RX RX xd +xd +RL RL RL RL @@ -36854,8 +36273,6 @@ gy gy RL RL -RL -xd xd xd xd @@ -36905,27 +36322,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(178,1,1) = {" +(175,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -36947,13 +36355,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX @@ -36962,7 +36363,14 @@ RX RX RX RX -bG +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -36980,6 +36388,26 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -36987,17 +36415,9 @@ RX RX RX RX -xd RX xd xd -xd -xd -xd -xd -RX -RX -RX RX RX RX @@ -37035,14 +36455,13 @@ RX RX RX RX -RX -RX -RX -RL +xd +xd +RL +RL RL RL RL -gy gy gy RL @@ -37059,8 +36478,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -37099,18 +36516,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(179,1,1) = {" +(176,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37140,16 +36557,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +tV +ZK RX -MX -MX -MX -DG -DG -MX -MX -gy -MX RX RX RX @@ -37174,12 +36590,14 @@ RX RX RX RX -xd RX -xd RX -xd -xd +ZK +ZK +ZK +ZK +RX +RX RX RX RX @@ -37190,6 +36608,8 @@ RX RX RX RX +xd +xd RX RX RX @@ -37230,7 +36650,6 @@ RX RX RX xd -MX RL RL RL @@ -37238,7 +36657,7 @@ RL RL gy gy -RL +gy RL RL xd @@ -37253,8 +36672,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -37293,18 +36710,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(180,1,1) = {" +(177,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37334,18 +36751,15 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX -MX -MX -gy -eY -fj -fj -eY -gy -gy -ax -ax RX RX RX @@ -37386,6 +36800,15 @@ RX RX RX RX +xd +xd +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -37421,11 +36844,7 @@ RX RX RX xd -xd -MX -MX -MX -MX +RL RL RL RL @@ -37447,8 +36866,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -37487,18 +36904,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(181,1,1) = {" +(178,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37529,18 +36946,14 @@ RX RX RX RX -ax -gy -gy -eY -fj -fj -eY -gy -gy -ax -ax -ax +ZK +ZK +tV +tV +tV +ZK +ZK +RX RX RX RX @@ -37548,6 +36961,8 @@ RX RX RX RX +bG +RX RX RX RX @@ -37571,7 +36986,14 @@ RX RX RX RX +xd RX +xd +xd +xd +xd +xd +xd RX RX RX @@ -37613,15 +37035,12 @@ RX RX RX RX -xd RX RX -MX -MX -MX RL -MX -gy +RL +RL +RL gy gy gy @@ -37641,8 +37060,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -37681,18 +37098,18 @@ RL RL RL RL -MX -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(182,1,1) = {" +(179,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37722,16 +37139,17 @@ RX RX RX RX -ax -ax -gy +RX +ZK +ZK +ZK +tV +tV +ZK +ZK gy -MX -MX -DG -DG -MX -MX +ZK +RX RX RX RX @@ -37739,7 +37157,6 @@ RX RX RX RX -bG RX RX RX @@ -37756,8 +37173,12 @@ RX RX RX RX +xd RX +xd RX +xd +xd RX RX RX @@ -37808,17 +37229,14 @@ RX RX RX xd -RX -MX -MX +ZK +RL +RL +RL +RL RL -MX -MX -MX -MX gy gy -MX RL RL RL @@ -37836,7 +37254,6 @@ xd xd xd xd -xd RX RX RX @@ -37875,18 +37292,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(183,1,1) = {" +(180,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37901,7 +37318,6 @@ RX RX RX RX -xd RX RX RX @@ -37915,18 +37331,20 @@ RX RX RX RX +RX +RX +RX +ZK +ZK +gy +eY +fj +fj +eY +gy +gy ax ax -ax -gy -MX -MX -MX -DG -DG -MX -MX -RX RX RX RX @@ -38002,16 +37420,17 @@ RX RX RX xd -MX -MX +xd +ZK +ZK +ZK +ZK +RL RL RL -MX -MX gy gy gy -MX RL RL RL @@ -38029,8 +37448,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -38069,18 +37486,21 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(184,1,1) = {" +(181,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX +RX RX RX RX @@ -38109,18 +37529,17 @@ RX RX RX ax +gy +gy +eY +fj +fj +eY +gy +gy ax ax ax -MX -MX -MX -MX -DG -DG -MX -MX -RX RX RX RX @@ -38193,23 +37612,21 @@ RX RX RX RX +xd RX RX -xd -MX -RL +ZK +ZK +ZK RL -MX -MX +ZK +gy gy gy gy -MX RL RL -xd -xd -xd +RL xd xd xd @@ -38263,18 +37680,18 @@ RL RL RL RL -MX -DG -DG -MX -MX +ZK +tV +tV +ZK +ZK Md "} -(185,1,1) = {" +(182,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -38294,27 +37711,26 @@ RX RX RX RX -xd RX RX -xd RX -xd -xd RX RX -PP RX RX RX RX -MX -MX -DG -DG -DG -MX RX +ax +ax +gy +gy +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -38322,6 +37738,11 @@ RX RX RX RX +bG +RX +RX +RX +RX RX RX RX @@ -38353,9 +37774,7 @@ RX RX RX RX -xd RX -xd RX RX RX @@ -38389,21 +37808,19 @@ RX RX xd RX +ZK +ZK RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +gy gy -MX -MX +ZK +RL RL RL -xd -xd -xd xd xd xd @@ -38457,18 +37874,21 @@ RL RL RL RL -MX -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(186,1,1) = {" +(183,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX +RX RX RX RX @@ -38480,6 +37900,7 @@ RX RX RX RX +xd RX RX RX @@ -38493,6 +37914,17 @@ RX RX RX RX +ax +ax +ax +gy +ZK +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -38502,13 +37934,6 @@ RX RX RX RX -MX -MX -MX -DG -MX -MX -xd RX RX RX @@ -38542,20 +37967,13 @@ RX RX RX RX -xd -xd -xd -xd RX RX RX RX RX -xd RX -xd RX -xd RX RX RX @@ -38582,21 +38000,20 @@ RX RX RX RX -MX -MX +xd +ZK +ZK +RL RL -MX -MX +ZK +ZK gy -MX gy gy -MX +ZK +RL RL RL -xd -xd -xd xd xd xd @@ -38651,22 +38068,18 @@ RL RL RL RL -MX -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(187,1,1) = {" +(184,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -38694,18 +38107,23 @@ RX RX RX RX +ax +ax +ax +ax +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK RX RX -MX -MX -MX -DG -DG -MX RX RX RX -xd RX RX RX @@ -38776,19 +38194,18 @@ RX RX RX RX -MX +xd +ZK RL -MX -MX -gy +RL +ZK +ZK gy gy gy -MX -MX -xd -xd -xd +ZK +RL +RL xd xd xd @@ -38845,18 +38262,18 @@ RL RL RL RL -MX -DG -DG -MX -MX +ZK +tV +tV +ZK +ZK Md "} -(188,1,1) = {" +(185,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -38876,26 +38293,32 @@ RX RX RX RX +xd RX RX +xd RX +xd +xd RX RX +PP RX RX RX RX +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX -MX -DG -MX RX RX RX @@ -38904,15 +38327,11 @@ RX RX RX RX -xd RX RX RX -xd RX -xd RX -xd RX RX RX @@ -38933,7 +38352,9 @@ RX RX RX RX +xd RX +xd RX RX RX @@ -38965,20 +38386,41 @@ RX RX RX RX +xd RX +RL +ZK +ZK +ZK +ZK +ZK +ZK +gy +ZK +ZK +RL +RL +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX RX RX RX @@ -39004,6 +38446,28 @@ RX RX RX RX +xd +xd +xd +xd +xd +RL +RL +RL +RL +RL +ZK +tV +tV +ZK +ZK +Md +"} +(186,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -39034,26 +38498,16 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -Md -"} -(189,1,1) = {" -Md -MX -MX -MX RX RX RX +ZK +ZK +ZK +tV +ZK +ZK +xd RX RX RX @@ -39085,20 +38539,22 @@ RX RX RX RX -MX -MX -MX -MX -MX RX RX +xd +xd +xd +xd RX RX RX RX RX +xd RX +xd RX +xd RX RX RX @@ -39125,6 +38581,37 @@ RX RX RX RX +ZK +ZK +RL +ZK +ZK +gy +ZK +gy +gy +ZK +RL +RL +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX @@ -39153,6 +38640,28 @@ RX RX RX RX +xd +xd +xd +xd +xd +RL +RL +RL +RL +RL +ZK +tV +tV +ZK +ZK +Md +"} +(187,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -39162,17 +38671,141 @@ RX RX RX RX -MX -MX -MX -MX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +ZK +RX +RX +RX +xd +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +RL +ZK +ZK gy gy gy -MX -MX -MX -MX +gy +ZK +ZK +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX @@ -39189,636 +38822,1002 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -Md -"} -(190,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -Md -"} -(191,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RL -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -DG -MX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +xd +xd +xd +xd +xd +RL +RL +RL +RL +RL +ZK +tV +tV +ZK +ZK Md "} -(192,1,1) = {" +(188,1,1) = {" Md ZK -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +ZK +RX +RX +RX +RX +RX +RX +RX +RX +xd +RX +RX +RX +xd +RX +xd +RX +xd +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +Md +"} +(189,1,1) = {" +Md +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +Md +"} +(190,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +Md +"} +(191,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RL +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK tV -lT -lT +ZK +ZK tV -lT +ZK +Md +"} +(192,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +tV +ZK Md "} diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm index e48f0e6335..e001226868 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm @@ -697,7 +697,9 @@ /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/bunker/kitchen) "es" = ( -/obj/machinery/mining/drill, +/obj/machinery/mining/drill{ + drill_id = 112 + }, /turf/simulated/mineral/floor/cave{ name = "dirt" }, @@ -1191,7 +1193,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/bunk) "ik" = ( @@ -1252,7 +1254,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/engi) "iF" = ( @@ -1359,7 +1361,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/mineyard) "jD" = ( @@ -1548,8 +1550,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /turf/simulated/floor/wood/broken, @@ -1579,8 +1580,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /obj/structure/cable/cyan{ @@ -2536,7 +2536,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /mob/living/simple_mob/animal/roach/jaeger, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker) @@ -3641,7 +3641,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/aa) "Eq" = ( -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -3650,8 +3650,7 @@ }, /area/tether_away/beach/resort/bunk) "Ew" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/closet/cabinet{ @@ -3940,7 +3939,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) "Ho" = ( -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -3995,7 +3994,7 @@ /area/tether_away/beach/mineyard) "HH" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/asteroid_steel{ outdoors = 1 }, @@ -4061,8 +4060,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable/cyan{ @@ -4142,7 +4140,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /obj/structure/flora/pottedplant/dead, /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/resort/lockermed) @@ -4546,7 +4544,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /obj/structure/table/standard, /obj/item/storage/box/donkpockets{ pixel_x = 2; @@ -4715,7 +4713,7 @@ }, /area/tether_away/beach/station/tram) "OE" = ( -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -5069,8 +5067,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable/cyan{ @@ -5113,7 +5110,7 @@ /area/tether_away/beach/desalinator) "Se" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/bunker/restroom) "Sl" = ( @@ -5246,8 +5243,7 @@ /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/bunker/restroom) "Tp" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable, @@ -5472,7 +5468,7 @@ /area/tether_away/beach/jungle) "VU" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/janitor) "Wc" = ( @@ -5634,7 +5630,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/table/woodentable, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/mess) diff --git a/maps/sectors/mining_140/levels/mining_140.dmm b/maps/sectors/mining_140/levels/mining_140.dmm index e9d07d1098..3933183aaa 100644 --- a/maps/sectors/mining_140/levels/mining_140.dmm +++ b/maps/sectors/mining_140/levels/mining_140.dmm @@ -16,7 +16,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "mining_planet"; - layer = 3.3; name = "Mining Dock Controller"; pixel_y = 30 }, diff --git a/maps/sectors/mining_192/levels/mining_192.dmm b/maps/sectors/mining_192/levels/mining_192.dmm index 14dd20f249..9ecc891bb6 100644 --- a/maps/sectors/mining_192/levels/mining_192.dmm +++ b/maps/sectors/mining_192/levels/mining_192.dmm @@ -30,7 +30,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "mining_planet"; - layer = 3.3; name = "Mining Dock Controller"; pixel_y = 30 }, diff --git a/maps/sectors/piratebase_140/levels/piratebase_140.dmm b/maps/sectors/piratebase_140/levels/piratebase_140.dmm index 0919c6894e..e69c9fe43e 100644 --- a/maps/sectors/piratebase_140/levels/piratebase_140.dmm +++ b/maps/sectors/piratebase_140/levels/piratebase_140.dmm @@ -18,7 +18,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "pirate_docker"; - layer = 3.3; name = "Belting Dock Controller"; pixel_y = 30; req_one_access = null @@ -896,11 +895,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/reinforced, /area/shuttle/pirate/deck) "Pr" = ( diff --git a/maps/sectors/piratebase_192/levels/piratebase_192.dmm b/maps/sectors/piratebase_192/levels/piratebase_192.dmm index e79aef7ce0..2121c4b02e 100644 --- a/maps/sectors/piratebase_192/levels/piratebase_192.dmm +++ b/maps/sectors/piratebase_192/levels/piratebase_192.dmm @@ -141,10 +141,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -156,6 +152,9 @@ name = "Bunks"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/red, /area/piratebase/bunks) "bt" = ( @@ -419,8 +418,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 24; req_access = list(168) @@ -520,7 +518,7 @@ /area/shuttle/pirate/deck) "eC" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 26; pixel_y = -6; @@ -683,6 +681,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/sickbay) "gg" = ( @@ -935,6 +936,12 @@ }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) +"iT" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty/silver, +/area/piratebase/halls) "jf" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -986,8 +993,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -1035,6 +1041,15 @@ }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) +"jT" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/piratebase/mess) "jX" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -1206,9 +1221,6 @@ /turf/simulated/mineral/floor/vacuum, /area/piratebase/atmospherics) "lk" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1218,6 +1230,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(168) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/halls) "lv" = ( @@ -1567,8 +1580,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 24; req_access = list(168) @@ -1667,6 +1679,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) "oV" = ( @@ -1687,7 +1702,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump{ +/obj/machinery/power/apc/alarms_hidden/east_mount{ req_access = list(168) }, /turf/simulated/floor/tiled/steel_dirty/yellow, @@ -1740,6 +1755,9 @@ /area/piratebase/captain) "pD" = ( /obj/effect/floor_decal/rust, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/atmospherics) "pG" = ( @@ -1813,10 +1831,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/mess) "qq" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -1828,6 +1842,9 @@ name = "Sickbay"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/sickbay) "qs" = ( @@ -1929,7 +1946,7 @@ /area/piratebase/sickbay) "ru" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 8; pixel_x = 8; pixel_y = -26; @@ -2169,7 +2186,7 @@ /area/piratebase/power) "tG" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 1; frequency = 1380; pixel_x = -26; @@ -2209,6 +2226,10 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/halls) +"uc" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_dirty/silver, +/area/piratebase/halls) "up" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2577,6 +2598,12 @@ }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/power) +"ye" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty/silver, +/area/piratebase/bunks) "yh" = ( /obj/effect/floor_decal/rust, /obj/machinery/air_alarm/alarms_hidden{ @@ -2654,7 +2681,7 @@ /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/brig) "yK" = ( -/obj/machinery/power/apc/alarms_hidden/east_bump{ +/obj/machinery/power/apc/alarms_hidden/east_mount{ req_access = list(168) }, /obj/structure/cable/yellow{ @@ -2809,7 +2836,7 @@ /turf/simulated/floor/reinforced, /area/piratebase/vault) "zV" = ( -/obj/machinery/power/apc/alarms_hidden/east_bump{ +/obj/machinery/power/apc/alarms_hidden/east_mount{ req_access = list(168) }, /obj/structure/cable/yellow, @@ -2898,9 +2925,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(168) }, /turf/simulated/floor/tiled/steel_dirty/dark, @@ -2933,7 +2958,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; dir = 4; pixel_x = 8; pixel_y = -26; @@ -3139,9 +3164,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/sickbay) @@ -3874,10 +3898,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/pirate/bridge) "It" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -3889,6 +3909,9 @@ name = "Head"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/bunks) "Ix" = ( @@ -3977,7 +4000,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump{ +/obj/machinery/power/apc/alarms_hidden/east_mount{ req_access = list(168) }, /obj/item/radio/intercom/raider{ @@ -3993,15 +4016,14 @@ /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mess) "JH" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Mining Operations"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) "JM" = ( @@ -4063,9 +4085,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(168) }, /turf/simulated/floor/reinforced, @@ -4083,6 +4103,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) +"KJ" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/piratebase/bunks) "KN" = ( /obj/machinery/light{ dir = 8 @@ -4181,8 +4207,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -4334,6 +4359,10 @@ }, /turf/simulated/floor, /area/shuttle/pirate/engine) +"MT" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_dirty/silver, +/area/piratebase/mining) "MU" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 @@ -4454,10 +4483,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -4468,6 +4493,9 @@ dir = 4; name = "Atmospherics" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/atmospherics) "Ot" = ( @@ -4515,8 +4543,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -4669,14 +4696,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/halls) "Qu" = ( @@ -4757,7 +4783,7 @@ "QM" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 8; pixel_x = -8; pixel_y = -26; @@ -4786,15 +4812,13 @@ "QW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(168) - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(168) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) "QX" = ( @@ -4900,6 +4924,9 @@ /area/piratebase/mess) "Sb" = ( /obj/effect/floor_decal/rust, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/construction) "Sh" = ( @@ -4929,6 +4956,9 @@ /area/piratebase/brig) "Sp" = ( /obj/structure/curtain/medical, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/sickbay) "Ss" = ( @@ -5111,8 +5141,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -5176,7 +5205,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 1; pixel_x = -26; req_access = list(168) @@ -5299,10 +5328,6 @@ /turf/simulated/floor/tiled/steel_dirty/dark, /area/piratebase/dock) "Wd" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -5314,6 +5339,9 @@ name = "Mess Hall"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/mess) "Wf" = ( @@ -5352,8 +5380,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 24; req_access = list(168) @@ -5471,10 +5498,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -5485,6 +5508,9 @@ dir = 4; name = "DECOMMISSIONED" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/construction) "Xy" = ( @@ -5558,7 +5584,7 @@ /area/piratebase/mining) "XV" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; pixel_x = 26; req_access = list(168) }, @@ -5632,8 +5658,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -5654,7 +5679,7 @@ req_access = list(168) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; dir = 4; pixel_x = -5; pixel_y = -26; @@ -24351,7 +24376,7 @@ tV Uf kc Uf -Uf +uc Uf pY Fn @@ -25710,7 +25735,7 @@ Rp Fn Fn Fn -Uf +iT Qn Fn Fn @@ -25718,7 +25743,7 @@ Fn Fn Fn Fn -Uj +jT Wd Fn Fn @@ -25882,7 +25907,7 @@ lO gq ww RN -gq +MT Hn gq BB @@ -26874,7 +26899,7 @@ Rp Fn Fn Fn -HB +ye bn Fn Fn @@ -28232,7 +28257,7 @@ ON ON ON ON -Ib +KJ It ON ON diff --git a/maps/sectors/tradeport_140/levels/tradeport_140.dmm b/maps/sectors/tradeport_140/levels/tradeport_140.dmm index 08804e8637..487df665ba 100644 --- a/maps/sectors/tradeport_140/levels/tradeport_140.dmm +++ b/maps/sectors/tradeport_140/levels/tradeport_140.dmm @@ -1022,7 +1022,7 @@ /area/tradeport/safarizoo) "dC" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 8018; master_tag = "trade_space_lock"; pixel_x = -25; @@ -1238,9 +1238,8 @@ "es" = ( /obj/machinery/light, /obj/structure/flora/pottedplant/drooping, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/floor/wood, /area/tradeport/cafeteria) @@ -1566,9 +1565,6 @@ /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) "fN" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(160) - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/multi_tile/glass{ @@ -1578,6 +1574,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) "fP" = ( @@ -1861,7 +1858,7 @@ /area/tradeport/facility) "gS" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 8018; master_tag = "trade_space_lock"; pixel_x = 25; @@ -1951,7 +1948,7 @@ pixel_x = 30; req_access = list(160) }, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "traderstardoor"; pixel_x = -8; pixel_y = -23 @@ -2038,7 +2035,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 5; pixel_y = 25; @@ -2121,13 +2118,11 @@ /turf/simulated/floor/airless, /area/space) "ie" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/wall, /area/tradeport/commons) @@ -2325,8 +2320,7 @@ /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "iU" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(160) @@ -2352,10 +2346,8 @@ "iW" = ( /obj/structure/cable/yellow, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /turf/simulated/floor, @@ -2368,9 +2360,7 @@ dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /turf/simulated/floor/tiled/neutral, @@ -3347,9 +3337,7 @@ /turf/simulated/floor/grass, /area/tradeport/safarizoo) "mK" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -3393,7 +3381,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "tradeport_hangar_dock"; pixel_x = 25; @@ -3870,7 +3858,6 @@ "os" = ( /obj/machinery/conveyor_switch/oneway{ id = "spine_inbound"; - layer = 3.3; name = "inbound conveyor"; pixel_y = 8 }, @@ -4725,7 +4712,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "tradeport_hangar_dock"; pixel_x = -25; @@ -4985,10 +4972,8 @@ /obj/machinery/vending/nifsoft_shop{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /turf/simulated/floor/tiled/old_tile/blue, @@ -5140,9 +5125,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) @@ -5259,7 +5243,7 @@ pixel_x = 34; pixel_y = 3 }, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "traderportdoor"; pixel_x = -8; pixel_y = 23 @@ -5557,16 +5541,9 @@ /turf/simulated/floor/tiled/freezer, /area/tradeport) "uF" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tradeport/spine) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/old_tile/red, +/area/tradeport) "uG" = ( /obj/structure/window/reinforced, /turf/simulated/floor/snow, @@ -5615,9 +5592,8 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -6022,7 +5998,7 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 25; pixel_y = 5; @@ -6079,7 +6055,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/tradeport) "ww" = ( @@ -6354,7 +6330,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; pixel_x = -10; pixel_y = 25; req_access = list(160) @@ -6372,9 +6348,7 @@ dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/effect/floor_decal/rust, @@ -7033,9 +7007,7 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/effect/floor_decal/corner/blue/border, @@ -7592,9 +7564,8 @@ /turf/simulated/floor/reinforced, /area/tradeport/pads) "BZ" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) @@ -7911,7 +7882,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; pixel_x = -5; pixel_y = -25; @@ -8289,8 +8260,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow{ @@ -8419,8 +8389,7 @@ /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) "Fw" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/green{ @@ -9104,9 +9073,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/floor/carpet/blue, /area/tradeport/commons) @@ -9727,7 +9695,6 @@ "KY" = ( /obj/machinery/conveyor_switch/oneway{ id = "spine_outbound"; - layer = 3.3; name = "outbound conveyor"; pixel_y = 8 }, @@ -10281,9 +10248,7 @@ /turf/simulated/floor/airless, /area/space) "MV" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -10622,7 +10587,7 @@ name = "Nebula Gas - Employees Only" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; pixel_x = -6; pixel_y = 25; @@ -10787,9 +10752,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "OT" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -10992,8 +10955,7 @@ /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) "PQ" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/green{ @@ -11219,9 +11181,7 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/shuttle/trade_ship/cockpit) "QF" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -11459,18 +11419,14 @@ /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/spine) "Rm" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, /turf/simulated/floor/wood, /area/tradeport/cyndi) "Ro" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -11538,15 +11494,14 @@ /area/tradeport/commons) "RH" = ( /obj/item/stool/padded, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, /obj/item/toy/plushie/squid/blue, /obj/landmark/spawnpoint/job/trader, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/commons) "RJ" = ( @@ -13001,6 +12956,9 @@ /area/tradeport/atmospherics) "Xo" = ( /obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/commons) "Xt" = ( @@ -13492,10 +13450,8 @@ /turf/simulated/floor/wood, /area/tradeport/cyndishow) "Zg" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /obj/structure/cable/yellow, @@ -13659,7 +13615,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; pixel_x = 10; pixel_y = -25; req_access = list(160) @@ -13696,9 +13652,7 @@ /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "ZZ" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -22999,7 +22953,7 @@ sm sm GT fE -uF +zd zd zd zd @@ -23010,7 +22964,7 @@ Xt zd zd zd -uF +zd fE Mq sm @@ -27827,7 +27781,7 @@ Tk Tk GT fE -uF +zd lm zd hC @@ -27838,7 +27792,7 @@ Xt mZ zd lm -uF +zd fE Pf rX @@ -29388,7 +29342,7 @@ lA VZ EP LP -EP +uF AV Ag vs diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm index c653fb3244..1eca98de80 100644 --- a/maps/sectors/tradeport_192/levels/tradeport_192.dmm +++ b/maps/sectors/tradeport_192/levels/tradeport_192.dmm @@ -2058,10 +2058,8 @@ /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) "hr" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /obj/structure/cable/yellow, @@ -2286,8 +2284,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -2669,7 +2666,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 5; pixel_y = 25; @@ -3143,15 +3140,16 @@ /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) "lg" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/turf/simulated/wall, +/turf/simulated/floor/carpet, /area/tradeport/commons) "lh" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -3287,7 +3285,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; pixel_x = -5; pixel_y = -25; @@ -3389,17 +3387,14 @@ dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/tradeport/atmospherics) "lX" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/green{ @@ -3536,8 +3531,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/shuttle/floor/white, @@ -3676,7 +3670,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; pixel_x = 10; pixel_y = -25; req_access = list(160) @@ -5203,7 +5197,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; pixel_x = -10; pixel_y = 25; req_access = list(160) @@ -5453,9 +5447,7 @@ /turf/simulated/floor/tiled/old_tile/red, /area/tradeport) "uf" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -6563,7 +6555,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "tradeport_hangar_dock"; pixel_x = 25; @@ -6674,7 +6666,7 @@ pixel_x = 34; pixel_y = 3 }, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "traderportdoor"; pixel_x = -8; pixel_y = 23 @@ -6794,15 +6786,14 @@ /area/shuttle/trade_ship/cockpit) "yI" = ( /obj/item/stool/padded, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, /obj/item/toy/plushie/squid/blue, /obj/landmark/spawnpoint/job/trader, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/commons) "yJ" = ( @@ -6864,7 +6855,7 @@ pixel_x = 30; req_access = list(160) }, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "traderstardoor"; pixel_x = -8; pixel_y = -23 @@ -6978,8 +6969,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(160) @@ -7105,7 +7095,7 @@ /area/shuttle/trade_ship/general) "zH" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 8018; master_tag = "trade_space_lock"; pixel_x = 25; @@ -7245,9 +7235,7 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/effect/floor_decal/corner/blue/border, @@ -7325,8 +7313,7 @@ /turf/simulated/floor/tiled/asteroid_steel/airless, /area/tradeport/pads) "AG" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/shuttle/floor/white, @@ -7407,7 +7394,7 @@ name = "Nebula Gas - Employees Only" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; pixel_x = -6; pixel_y = 25; @@ -7443,9 +7430,7 @@ /turf/simulated/floor/tiled/freezer, /area/tradeport) "Ba" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -7569,7 +7554,7 @@ /area/tradeport/atmospherics) "Bq" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 8018; master_tag = "trade_space_lock"; pixel_x = -25; @@ -7678,8 +7663,7 @@ /turf/simulated/wall/r_wall, /area/tradeport/pads) "BK" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/green{ @@ -7838,7 +7822,6 @@ "Ci" = ( /obj/machinery/conveyor_switch/oneway{ id = "spine_outbound"; - layer = 3.3; name = "outbound conveyor"; pixel_y = 8 }, @@ -7969,8 +7952,7 @@ /turf/simulated/floor, /area/tradeport/pads) "CK" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(160) @@ -8560,8 +8542,7 @@ "EX" = ( /obj/machinery/light, /obj/structure/flora/pottedplant/drooping, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -9023,7 +9004,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "tradeport_hangar_dock"; pixel_x = -25; @@ -9606,8 +9587,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/carpet/blue, @@ -9709,10 +9689,8 @@ /obj/machinery/vending/nifsoft_shop{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /turf/simulated/floor/tiled/old_tile/blue, @@ -9800,8 +9778,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow{ @@ -10206,9 +10183,7 @@ dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /turf/simulated/floor/tiled/neutral, @@ -10317,9 +10292,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "LI" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -10734,7 +10707,7 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 25; pixel_y = 5; @@ -11182,9 +11155,7 @@ /turf/simulated/floor/tiled/old_cargo/beige, /area/tradeport/atmospherics) "OG" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -12089,9 +12060,7 @@ /turf/simulated/floor/outdoors/dirtlight, /area/tradeport/cyndishow) "RG" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -13305,7 +13274,6 @@ "Wf" = ( /obj/machinery/conveyor_switch/oneway{ id = "spine_inbound"; - layer = 3.3; name = "inbound conveyor"; pixel_y = 8 }, @@ -13321,7 +13289,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/tradeport) "Wj" = ( @@ -13546,9 +13514,7 @@ /turf/simulated/floor/tiled/old_tile/red, /area/tradeport) "Xd" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -13899,10 +13865,8 @@ "Yu" = ( /obj/structure/cable/yellow, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /turf/simulated/floor, @@ -13990,9 +13954,7 @@ /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) "YF" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -42575,7 +42537,7 @@ PJ NQ nq tu -lg +tu cA tu tu @@ -43945,7 +43907,7 @@ GO fE Rv Hq -iq +lg nq rf Ym diff --git a/maps/sectors/virgo2_140/levels/virgo2_140_aerostat.dmm b/maps/sectors/virgo2_140/levels/virgo2_140_aerostat.dmm index a4497e36db..6705323243 100644 --- a/maps/sectors/virgo2_140/levels/virgo2_140_aerostat.dmm +++ b/maps/sectors/virgo2_140/levels/virgo2_140_aerostat.dmm @@ -295,12 +295,9 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ alarms_hidden = 1; cell_type = /obj/item/cell/high/empty; - dir = 4; - name = "east bump"; - pixel_x = 28; req_access = list() }, /turf/simulated/floor/bluegrid/virgo2, diff --git a/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm b/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm index b57aca7451..22989556e1 100644 --- a/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm +++ b/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm @@ -637,8 +637,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/lockermed) "kk" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /obj/structure/cable/cyan{ @@ -702,8 +701,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /turf/simulated/floor/wood, @@ -719,8 +717,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /obj/structure/cable/cyan{ @@ -736,8 +733,7 @@ /turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/resort) "mb" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ pixel_y = 26 }, /obj/structure/cable/cyan{ @@ -1421,8 +1417,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable/cyan{ @@ -1776,8 +1771,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ pixel_y = 26 }, /obj/structure/table/woodentable, @@ -1820,8 +1814,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable/cyan{ @@ -1891,8 +1884,7 @@ /turf/simulated/floor/water, /area/tether_away/beach/cavebase) "Tp" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable, diff --git a/maps/sectors/wasteland_140/levels/wasteland_140.dmm b/maps/sectors/wasteland_140/levels/wasteland_140.dmm index 878402424b..74b31bf531 100644 --- a/maps/sectors/wasteland_140/levels/wasteland_140.dmm +++ b/maps/sectors/wasteland_140/levels/wasteland_140.dmm @@ -256,11 +256,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, /area/class_d/wildcat_mining_base/exterior_workshop) @@ -297,11 +293,7 @@ /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/exterior_power) "lx" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange, /turf/simulated/floor/classd/indoors, /area/class_d/wildcat_mining_base/refueling_outbuilding) @@ -344,11 +336,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -436,11 +424,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, /area/class_d/wildcat_mining_base/interior/main_room) @@ -517,11 +501,7 @@ /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/refueling_outbuilding) "qj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -639,11 +619,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, @@ -1033,7 +1009,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "airless"; - layer = 3.3; name = "Airless Dock Controller"; pixel_y = 30 }, @@ -1433,11 +1408,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/exterior_power) "OL" = ( diff --git a/maps/sectors/wasteland_192/levels/wasteland_192.dmm b/maps/sectors/wasteland_192/levels/wasteland_192.dmm index 07d51d5c41..8bacb72365 100644 --- a/maps/sectors/wasteland_192/levels/wasteland_192.dmm +++ b/maps/sectors/wasteland_192/levels/wasteland_192.dmm @@ -357,11 +357,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, /area/class_d/wildcat_mining_base/exterior_workshop) @@ -451,11 +447,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/exterior_power) "rg" = ( @@ -506,11 +498,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, /area/class_d/wildcat_mining_base/interior/main_room) @@ -964,11 +952,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, @@ -1217,7 +1201,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "airless"; - layer = 3.3; name = "Airless Dock Controller"; pixel_y = 30 }, @@ -1291,11 +1274,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -1493,11 +1472,7 @@ /turf/simulated/floor/classd/indoors, /area/class_d/wildcat_mining_base/refueling_outbuilding) "SU" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange, /turf/simulated/floor/classd/indoors, /area/class_d/wildcat_mining_base/refueling_outbuilding) @@ -1604,11 +1579,7 @@ /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/exterior_workshop) "WE" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, diff --git a/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm b/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm index e924f18374..9cfd25343f 100644 --- a/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm +++ b/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm @@ -109,7 +109,9 @@ /turf/simulated/mineral/floor/classd/indoors, /area/class_d/explored) "xj" = ( -/obj/machinery/mining/drill, +/obj/machinery/mining/drill{ + drill_id = 666 + }, /turf/simulated/mineral/floor/classd/indoors, /area/class_d/explored/underground) "yh" = ( diff --git a/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm b/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm index a6d9330957..d404f8732c 100644 --- a/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm +++ b/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm @@ -1047,8 +1047,7 @@ /area/submap/HeadscientistHQ) "VI" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/power/apc/east_mount{ pixel_y = -32; req_access = null; start_charge = 0 diff --git a/maps/submaps/level_specific/debrisfield/clownship.dmm b/maps/submaps/level_specific/debrisfield/clownship.dmm index 4b76dd1056..5b3e7e9758 100644 --- a/maps/submaps/level_specific/debrisfield/clownship.dmm +++ b/maps/submaps/level_specific/debrisfield/clownship.dmm @@ -23,9 +23,7 @@ "aP" = ( /obj/item/toy/figure/clown, /obj/structure/table/bananium_reinforced, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -250,9 +248,7 @@ /area/submap/debrisfiled_vr/clownshuttle/engine) "nK" = ( /mob/living/simple_mob/humanoid/clown/commando/ranged/space, -/obj/machinery/power/apc/alarms_hidden{ - pixel_x = -28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -420,9 +416,7 @@ /turf/simulated/shuttle/floor/yellow/airless, /area/submap/debrisfiled_vr/clownshuttle/cargo) "ve" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -828,9 +822,7 @@ pixel_x = 28 }, /obj/structure/table/bananium_reinforced, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -906,9 +898,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/table/bananium_reinforced, /turf/simulated/shuttle/floor/yellow/airless, /area/submap/debrisfiled_vr/clownshuttle/engine) diff --git a/maps/submaps/level_specific/debrisfield/derelict.dmm b/maps/submaps/level_specific/debrisfield/derelict.dmm index 72685c2164..83a4475be6 100644 --- a/maps/submaps/level_specific/debrisfield/derelict.dmm +++ b/maps/submaps/level_specific/debrisfield/derelict.dmm @@ -369,10 +369,8 @@ /area/debrisfield/derelict) "bJ" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - alarms_hidden = 1; - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/south_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/debrisfield/derelict) @@ -549,11 +547,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/debrisfield/derelict) @@ -608,11 +603,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/greengrid/airless, /area/debrisfield/derelict) @@ -638,11 +630,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/plating/external, /area/debrisfield/derelict) diff --git a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm index 112ce7b172..a6e10fddeb 100644 --- a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm @@ -1,8 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/item/material/shard/shrapnel, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; +/obj/machinery/fire_alarm/alarms_hidden/east_mount{ pixel_x = -24 }, /turf/simulated/floor/airless, diff --git a/maps/submaps/level_specific/debrisfield_vr/derelict.dmm b/maps/submaps/level_specific/debrisfield_vr/derelict.dmm index d9ccb4de70..29e0a3e15a 100644 --- a/maps/submaps/level_specific/debrisfield_vr/derelict.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/derelict.dmm @@ -82,11 +82,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 2; - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/south_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/techfloor, /area/submap/debrisfield_vr/derelict/bridge) @@ -669,11 +666,8 @@ /area/submap/debrisfield_vr/derelict/interior) "cs" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 2; - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/south_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/dark, /area/submap/debrisfield_vr/derelict/interior) @@ -824,11 +818,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/dark, /area/submap/debrisfield_vr/derelict/ai_access_port) @@ -851,11 +842,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/plating, /area/submap/debrisfield_vr/derelict/ai_access_starboard) @@ -907,12 +895,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/greengrid, /area/submap/debrisfield_vr/derelict/ai_chamber) diff --git a/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm index 3d919787d0..9f9f172923 100644 --- a/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm @@ -180,10 +180,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ start_charge = 0 }, /obj/structure/cable{ @@ -593,8 +590,7 @@ /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "lV" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /obj/structure/closet/crate{ @@ -723,8 +719,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/machinery/light/flicker, @@ -732,9 +727,7 @@ /area/shuttle/gecko_cr_cockpit_wreck) "pf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -886,9 +879,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/airless, /area/shuttle/gecko_cr_engineering_wreck) @@ -939,10 +930,7 @@ /area/shuttle/gecko_cr_engineering_wreck) "sV" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24; +/obj/machinery/power/apc/north_mount{ start_charge = 0 }, /obj/structure/cable{ @@ -1053,9 +1041,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/railing/grey{ dir = 4 @@ -1205,9 +1191,7 @@ /area/shuttle/gecko_cr_cockpit_wreck) "yR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "yX" = ( @@ -2416,9 +2400,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/airless, /area/shuttle/gecko_cr_engineering_wreck) @@ -2446,10 +2428,7 @@ /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "Tw" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /obj/structure/bed/pod, /obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, @@ -2612,8 +2591,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/handrail{ diff --git a/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm b/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm index 1378233591..27c88e83d9 100644 --- a/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm @@ -72,8 +72,7 @@ /turf/simulated/floor/airless, /area/submap/debrisfield_vr/mining_outpost) "o" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ pixel_y = 24 }, /obj/structure/cable{ diff --git a/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm b/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm index 047612333c..1ad03d941b 100644 --- a/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm @@ -18,10 +18,9 @@ /turf/simulated/floor/airless, /area/submap/debrisfield_vr/old_tele) "f" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/north_mount{ cell_type = null; coverlocked = 0; - dir = 1; locked = 0; opened = 1; pixel_y = 24 diff --git a/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm index ead9f574ff..895927c9fa 100644 --- a/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm @@ -68,10 +68,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24; +/obj/machinery/power/apc/north_mount{ start_charge = 0 }, /obj/structure/bed/chair/bay/chair{ @@ -158,9 +155,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24; +/obj/machinery/power/apc/south_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techfloor{ @@ -291,7 +286,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/voidcraft{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_head) @@ -410,10 +405,7 @@ /obj/structure/bed/chair/bay/comfy{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28; +/obj/machinery/power/apc/west_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techmaint/airless, @@ -665,10 +657,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ density = 0; dir = 4; - icon_state = "door_open" - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 + icon_state = "open" }, /obj/structure/cable{ icon_state = "4-8" @@ -676,6 +665,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_cockpit) "ks" = ( @@ -756,7 +748,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/voidcraft{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_q2) @@ -855,7 +847,7 @@ }, /obj/machinery/door/airlock/glass_external/public{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) @@ -1082,10 +1074,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24; +/obj/machinery/power/apc/north_mount{ start_charge = 0 }, /obj/structure/bed/chair/bay/chair{ @@ -1176,6 +1165,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_engineering) "tL" = ( @@ -1287,9 +1279,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24; +/obj/machinery/power/apc/south_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techfloor{ @@ -1312,7 +1302,7 @@ /obj/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external/public{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) @@ -1339,6 +1329,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_cockpit) "DK" = ( @@ -1604,7 +1597,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/voidcraft{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_galley) @@ -1736,7 +1729,7 @@ "UT" = ( /obj/machinery/door/airlock/glass_external/public{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techmaint/airless, @@ -1748,10 +1741,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techfloor{ @@ -1802,16 +1792,16 @@ /obj/machinery/door/airlock/multi_tile/metal{ density = 0; dir = 4; - icon_state = "door_open"; + icon_state = "open"; name = "Salamander Engineering Bay"; opacity = 0 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_engineering) "WP" = ( @@ -1902,10 +1892,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techfloor{ diff --git a/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm b/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm index 9b8feff75b..b7fbe28e9d 100644 --- a/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm @@ -290,11 +290,7 @@ /turf/simulated/floor/tiled, /area/submap/debrisfield_vr/tinyshuttle/crew) "aG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -505,11 +501,7 @@ /turf/simulated/floor/tiled/airless, /area/submap/debrisfield_vr/tinyshuttle/bridge) "aZ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /obj/effect/debris/cleanable/dirt, /obj/machinery/light_switch{ @@ -913,11 +905,7 @@ /turf/simulated/floor/reinforced/airless, /area/submap/debrisfield_vr/tinyshuttle/hangar) "bI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/reinforced/airless, /area/submap/debrisfield_vr/tinyshuttle/hangar) @@ -955,11 +943,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/submap/debrisfield_vr/tinyshuttle/engine) "bM" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -1020,8 +1004,7 @@ /area/submap/debrisfield_vr/tinyshuttle/engine) "bS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /obj/effect/debris/cleanable/liquid_fuel, @@ -1042,10 +1025,7 @@ /turf/simulated/shuttle/plating/airless/carry, /area/submap/debrisfield_vr/tinyshuttle/engine) "bV" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/alarms_hidden/west_mount, /turf/simulated/floor/reinforced/airless, /area/submap/debrisfield_vr/tinyshuttle/hangar) "bW" = ( diff --git a/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm b/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm index 6e8840e4eb..690b7eccf7 100644 --- a/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm +++ b/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm @@ -235,11 +235,9 @@ /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aP" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; - name = "Unknown APC"; - pixel_x = -24 + name = "Unknown APC" }, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) diff --git a/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm b/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm index e147d0dc15..3ff7a669ec 100644 --- a/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm +++ b/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm @@ -17,9 +17,8 @@ /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/CrashedSmuggler/ship) "cc" = ( -/obj/machinery/power/apc/alarms_hidden{ - cell_type = /obj/item/cell/high/empty; - pixel_x = 28 +/obj/machinery/power/apc/alarms_hidden/south_mount{ + cell_type = /obj/item/cell/high/empty }, /obj/structure/cable/cyan{ dir = 4 diff --git a/maps/submaps/level_specific/virgo2/DJOutpost1.dmm b/maps/submaps/level_specific/virgo2/DJOutpost1.dmm index 390e0c4497..5cb6f72583 100644 --- a/maps/submaps/level_specific/virgo2/DJOutpost1.dmm +++ b/maps/submaps/level_specific/virgo2/DJOutpost1.dmm @@ -170,16 +170,14 @@ "B" = ( /obj/structure/table/steel_reinforced, /obj/item/radio, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; - operating = 0; - pixel_x = 24 + operating = 0 }, /obj/structure/cable/yellow, /turf/simulated/floor/wood, diff --git a/maps/submaps/level_specific/virgo2/DoomP.dmm b/maps/submaps/level_specific/virgo2/DoomP.dmm index 6a298be75b..d367cdd4e8 100644 --- a/maps/submaps/level_specific/virgo2/DoomP.dmm +++ b/maps/submaps/level_specific/virgo2/DoomP.dmm @@ -134,11 +134,8 @@ /turf/simulated/floor/plating, /area/submap/virgo2/DoomP) "aG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "PAPC"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + name = "PAPC" }, /obj/structure/cable/green{ icon_state = "0-8" diff --git a/maps/submaps/level_specific/virgo2/Epod4.dmm b/maps/submaps/level_specific/virgo2/Epod4.dmm index f6050ae72c..3609878f5f 100644 --- a/maps/submaps/level_specific/virgo2/Epod4.dmm +++ b/maps/submaps/level_specific/virgo2/Epod4.dmm @@ -42,7 +42,6 @@ pixel_y = 0 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0 diff --git a/maps/submaps/level_specific/virgo2/Lab1.dmm b/maps/submaps/level_specific/virgo2/Lab1.dmm index 463ba1bdc6..dda75b8bbd 100644 --- a/maps/submaps/level_specific/virgo2/Lab1.dmm +++ b/maps/submaps/level_specific/virgo2/Lab1.dmm @@ -117,12 +117,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "u" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/hyper; - dir = 8; name = "Unknown APC"; - operating = 0; - pixel_x = -24 + operating = 0 }, /obj/structure/cable{ icon_state = "0-4" diff --git a/maps/submaps/level_specific/virgo2/Manor1.dmm b/maps/submaps/level_specific/virgo2/Manor1.dmm index bad95ce6a5..8d2b6ea957 100644 --- a/maps/submaps/level_specific/virgo2/Manor1.dmm +++ b/maps/submaps/level_specific/virgo2/Manor1.dmm @@ -446,7 +446,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/submap/virgo2/Manor1) "bO" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bP" = ( diff --git a/maps/submaps/level_specific/virgo2/Rockybase.dmm b/maps/submaps/level_specific/virgo2/Rockybase.dmm index 104eecfeb3..5cf8ce41d5 100644 --- a/maps/submaps/level_specific/virgo2/Rockybase.dmm +++ b/maps/submaps/level_specific/virgo2/Rockybase.dmm @@ -651,11 +651,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; - dir = 8; - name = "Unknown APC"; - pixel_x = -24 + name = "Unknown APC" }, /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/Rockybase) diff --git a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm index 25004892de..74012cbd5a 100644 --- a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm +++ b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm @@ -73,7 +73,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/submap/lythios/west_caves/buried_structure) "nK" = ( -/obj/machinery/power/apc/alarms_hidden/north_bump{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ start_charge = 0 }, /obj/structure/cable{ diff --git a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm index 221cb22a3d..1480d0f9c3 100644 --- a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm +++ b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm @@ -43,7 +43,7 @@ /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/outside/west_caves) "A" = ( -/obj/machinery/power/apc/alarms_hidden/north_bump{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ start_charge = 0 }, /turf/simulated/floor/lythios43c/indoors, diff --git a/maps/submaps/mountains/Mineshaft1.dmm b/maps/submaps/mountains/Mineshaft1.dmm index 24e3ef4b81..07a6aff45a 100644 --- a/maps/submaps/mountains/Mineshaft1.dmm +++ b/maps/submaps/mountains/Mineshaft1.dmm @@ -120,9 +120,8 @@ /turf/simulated/floor, /area/submap/cave/AMine1) "y" = ( -/obj/machinery/power/apc{ - operating = 0; - pixel_x = 31 +/obj/machinery/power/apc/south_mount{ + operating = 0 }, /turf/simulated/floor, /area/submap/cave/AMine1) diff --git a/maps/submaps/mountains/Rockb1.dmm b/maps/submaps/mountains/Rockb1.dmm index ef20b4734f..6463cee7ab 100644 --- a/maps/submaps/mountains/Rockb1.dmm +++ b/maps/submaps/mountains/Rockb1.dmm @@ -144,11 +144,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - operating = 0; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + operating = 0 }, /turf/simulated/floor/tiled, /area/submap/Rockb1) diff --git a/maps/submaps/mountains/crashed_ufo.dmm b/maps/submaps/mountains/crashed_ufo.dmm index c2b55ec9bf..c118f1c0ee 100644 --- a/maps/submaps/mountains/crashed_ufo.dmm +++ b/maps/submaps/mountains/crashed_ufo.dmm @@ -153,7 +153,7 @@ /area/submap/cave/crashed_ufo) "aI" = ( /obj/machinery/door/airlock/alien/locked{ - p_open = 1 + panel_open = 1 }, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) diff --git a/maps/submaps/mountains/quarantineshuttle.dmm b/maps/submaps/mountains/quarantineshuttle.dmm index d1e3e3d87a..a722dea882 100644 --- a/maps/submaps/mountains/quarantineshuttle.dmm +++ b/maps/submaps/mountains/quarantineshuttle.dmm @@ -39,7 +39,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "QShuttlePoIDoors"; - layer = 3.3; name = "Emergency Lockdown Shutters" }, /obj/item/barrier_tape_segment/medical{ diff --git a/maps/submaps/plains/Epod.dmm b/maps/submaps/plains/Epod.dmm index ab9df9baf9..33d320c7ab 100644 --- a/maps/submaps/plains/Epod.dmm +++ b/maps/submaps/plains/Epod.dmm @@ -48,7 +48,6 @@ "k" = ( /obj/structure/bed/chair, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0 diff --git a/maps/submaps/wilderness/Blackshuttledown.dmm b/maps/submaps/wilderness/Blackshuttledown.dmm index 3d8b0f0d5b..37f301e158 100644 --- a/maps/submaps/wilderness/Blackshuttledown.dmm +++ b/maps/submaps/wilderness/Blackshuttledown.dmm @@ -542,10 +542,8 @@ /turf/simulated/floor/plating, /area/submap/Blackshuttledown) "bH" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "BSD APC"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + name = "BSD APC" }, /turf/simulated/floor/tiled/yellow, /area/submap/Blackshuttledown) diff --git a/maps/submaps/wilderness/Blueshuttledown.dmm b/maps/submaps/wilderness/Blueshuttledown.dmm index c14e899734..d792afe298 100644 --- a/maps/submaps/wilderness/Blueshuttledown.dmm +++ b/maps/submaps/wilderness/Blueshuttledown.dmm @@ -554,10 +554,8 @@ /turf/simulated/floor/plating, /area/submap/Blackshuttledown) "bH" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "BSD APC"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + name = "BSD APC" }, /turf/simulated/floor/tiled/yellow, /area/submap/Blackshuttledown) diff --git a/maps/submaps/wilderness/DJOutpost1.dmm b/maps/submaps/wilderness/DJOutpost1.dmm index 110c273483..f4a9c67cf7 100644 --- a/maps/submaps/wilderness/DJOutpost1.dmm +++ b/maps/submaps/wilderness/DJOutpost1.dmm @@ -178,16 +178,14 @@ "B" = ( /obj/structure/table/steel_reinforced, /obj/item/radio, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; - operating = 0; - pixel_x = 24 + operating = 0 }, /obj/structure/cable/yellow, /turf/simulated/floor/wood, diff --git a/maps/submaps/wilderness/DJOutpost3.dmm b/maps/submaps/wilderness/DJOutpost3.dmm index c730da481b..e537b58943 100644 --- a/maps/submaps/wilderness/DJOutpost3.dmm +++ b/maps/submaps/wilderness/DJOutpost3.dmm @@ -174,16 +174,14 @@ "aC" = ( /obj/structure/table/steel_reinforced, /obj/item/radio, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; - operating = 0; - pixel_x = 24 + operating = 0 }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/techfloor, diff --git a/maps/submaps/wilderness/DJOutpost4.dmm b/maps/submaps/wilderness/DJOutpost4.dmm index e8d4064bfa..83c429e70c 100644 --- a/maps/submaps/wilderness/DJOutpost4.dmm +++ b/maps/submaps/wilderness/DJOutpost4.dmm @@ -223,16 +223,14 @@ "aK" = ( /obj/structure/table/steel_reinforced, /obj/item/radio, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; - operating = 0; - pixel_x = 24 + operating = 0 }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/techfloor, diff --git a/maps/submaps/wilderness/DoomP.dmm b/maps/submaps/wilderness/DoomP.dmm index 212b24f3c0..926d8772ee 100644 --- a/maps/submaps/wilderness/DoomP.dmm +++ b/maps/submaps/wilderness/DoomP.dmm @@ -152,10 +152,8 @@ /turf/simulated/floor/plating, /area/submap/DoomP) "aG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "PAPC"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + name = "PAPC" }, /obj/structure/cable/green{ icon_state = "0-8" diff --git a/maps/submaps/wilderness/Epod4.dmm b/maps/submaps/wilderness/Epod4.dmm index ecda831343..8fdeac1043 100644 --- a/maps/submaps/wilderness/Epod4.dmm +++ b/maps/submaps/wilderness/Epod4.dmm @@ -58,7 +58,6 @@ dir = 8 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, diff --git a/maps/submaps/wilderness/Lab1.dmm b/maps/submaps/wilderness/Lab1.dmm index a740b2179d..870939b822 100644 --- a/maps/submaps/wilderness/Lab1.dmm +++ b/maps/submaps/wilderness/Lab1.dmm @@ -117,12 +117,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "u" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/hyper; - dir = 8; name = "Unknown APC"; - operating = 0; - pixel_x = -24 + operating = 0 }, /obj/structure/cable{ icon_state = "0-4" diff --git a/maps/submaps/wilderness/Manor1.dmm b/maps/submaps/wilderness/Manor1.dmm index cb933d4c4f..6c95746644 100644 --- a/maps/submaps/wilderness/Manor1.dmm +++ b/maps/submaps/wilderness/Manor1.dmm @@ -456,7 +456,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/submap/Manor1) "bO" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bP" = ( diff --git a/maps/submaps/wilderness/Rockybase.dmm b/maps/submaps/wilderness/Rockybase.dmm index 54534d23a1..1571a38f7a 100644 --- a/maps/submaps/wilderness/Rockybase.dmm +++ b/maps/submaps/wilderness/Rockybase.dmm @@ -889,11 +889,9 @@ /turf/simulated/floor/tiled, /area/submap/Rockybase) "de" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; - dir = 8; - name = "Unknown APC"; - pixel_x = -24 + name = "Unknown APC" }, /obj/structure/cable/green{ icon_state = "0-4" diff --git a/maps/templates/admin/dhael_centcom.dmm b/maps/templates/admin/dhael_centcom.dmm index c8981f47d1..1572ed56fe 100644 --- a/maps/templates/admin/dhael_centcom.dmm +++ b/maps/templates/admin/dhael_centcom.dmm @@ -2636,7 +2636,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchenC"; - layer = 3.3; name = "Kitchen Shutters" }, /turf/unsimulated/floor/steel, @@ -3344,7 +3343,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "ArmouryC2"; - layer = 3.3; name = "Armoury" }, /turf/unsimulated/floor/steel, @@ -6504,7 +6502,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -8956,7 +8954,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "ArmouryC4"; - layer = 3.3; name = "Armoury" }, /turf/unsimulated/floor{ @@ -12331,6 +12328,12 @@ icon_state = "dark" }, /area/centcom/specops) +"NC" = ( +/obj/machinery/door/firedoor/glass, +/turf/unsimulated/floor/steel{ + icon_state = "white" + }, +/area/centcom/medical) "NE" = ( /obj/structure/table/reinforced, /obj/item/material/minihoe, @@ -14677,7 +14680,6 @@ /area/centcom/evac) "Yc" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 28 }, /obj/effect/floor_decal/borderfloorblack{ @@ -21803,7 +21805,7 @@ kv pT oS kv -kv +NC kv kv kv diff --git a/maps/templates/admin/dojo.dmm b/maps/templates/admin/dojo.dmm index 052f9cb247..8fab16c5e5 100644 --- a/maps/templates/admin/dojo.dmm +++ b/maps/templates/admin/dojo.dmm @@ -855,7 +855,7 @@ /area/ninja_dojo/dojo) "eW" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "ninja_shuttle"; name = "interior access button"; diff --git a/maps/templates/admin/ert.dmm b/maps/templates/admin/ert.dmm index c1a4cd57fd..8cd64145b6 100644 --- a/maps/templates/admin/ert.dmm +++ b/maps/templates/admin/ert.dmm @@ -212,6 +212,7 @@ "ch" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) "ci" = ( @@ -280,9 +281,8 @@ dir = 4 }, /obj/machinery/meter, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "VB APC - North"; pixel_y = 24 }, @@ -295,8 +295,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "cY" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -392,6 +391,7 @@ name = "Medical Bay"; req_access = list(103) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "dB" = ( @@ -474,14 +474,15 @@ "dY" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "ee" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) "ef" = ( /obj/structure/table/rack/steel, /obj/item/clothing/glasses/night, @@ -490,9 +491,7 @@ /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -591,10 +590,9 @@ dir = 4 }, /obj/machinery/meter, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 + name = "VB APC - South" }, /obj/structure/cable/yellow, /obj/machinery/light/small{ @@ -608,9 +606,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light_switch{ dir = 4; pixel_x = -23 @@ -778,9 +774,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "gR" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -793,9 +788,8 @@ /obj/structure/table/rack/steel, /obj/item/mecha_parts/mecha_equipment/shocker, /obj/item/mecha_parts/mecha_equipment/shocker, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "VB APC - North"; pixel_y = 24 }, @@ -819,6 +813,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "ha" = ( @@ -833,9 +830,7 @@ /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) @@ -999,6 +994,9 @@ id = "NRV_DELTA"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "iB" = ( @@ -1072,6 +1070,9 @@ name = "Engineering"; req_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "jQ" = ( @@ -1128,6 +1129,9 @@ id = "NRV_MECHS"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "kl" = ( @@ -1327,8 +1331,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways_aft) "lR" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techmaint, @@ -1465,14 +1468,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(103) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/barracks) "mJ" = ( @@ -1540,13 +1542,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/barracks) "na" = ( @@ -1564,8 +1566,7 @@ /obj/item/gun/energy/xray, /obj/item/gun/energy/xray, /obj/machinery/light, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -1604,8 +1605,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) @@ -1676,14 +1677,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/blast/regular{ closed_layer = 4; id = "NRV_MECHS"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "nB" = ( @@ -1696,14 +1697,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/blast/regular{ closed_layer = 4; id = "NRV_DELTA"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "nC" = ( @@ -1790,9 +1791,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "op" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6 }, @@ -1846,6 +1845,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) +"oS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) "oV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1865,9 +1876,8 @@ /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -1988,6 +1998,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "pq" = ( @@ -2024,13 +2037,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "pA" = ( @@ -2369,7 +2382,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "sd" = ( @@ -2428,9 +2441,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sw" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/teleporter) "sz" = ( @@ -2538,10 +2549,10 @@ "ta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "tg" = ( @@ -2688,6 +2699,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "uq" = ( @@ -2698,9 +2712,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "uu" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/dock_star) "ux" = ( @@ -2814,8 +2826,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways) "vv" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2851,10 +2862,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways) "wl" = ( @@ -3016,9 +3027,8 @@ /obj/item/gun/energy/ionrifle/pistol, /obj/item/gun/energy/ionrifle, /obj/item/gun/energy/ionrifle, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -3184,9 +3194,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "yv" = ( @@ -3213,9 +3221,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "yC" = ( @@ -3291,9 +3297,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "zc" = ( @@ -3383,9 +3387,8 @@ /turf/simulated/floor/wood, /area/ship/ert/commander) "Af" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -3411,18 +3414,15 @@ /turf/simulated/floor/wood, /area/ship/ert/commander) "Ai" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways_aft) "An" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -3438,9 +3438,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "Aq" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) @@ -3484,6 +3482,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_dl) "AI" = ( @@ -3615,6 +3616,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) "Br" = ( @@ -3660,9 +3664,8 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/eng_storage) "Cn" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -3738,13 +3741,13 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "CP" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "CT" = ( @@ -3882,9 +3885,8 @@ /obj/item/extinguisher/mini, /obj/item/extinguisher/mini, /obj/item/extinguisher/mini, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "VB APC - North"; pixel_y = 24 }, @@ -3909,8 +3911,7 @@ /obj/item/hardsuit/ert/security, /obj/item/hardsuit/ert/security, /obj/item/hardsuit/ert/security, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -4001,8 +4002,7 @@ "EB" = ( /obj/effect/floor_decal/corner/white, /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/light_switch{ @@ -4086,9 +4086,8 @@ /obj/structure/table/rack/steel, /obj/item/storage/box/frags, /obj/item/storage/box/frags, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -4168,8 +4167,8 @@ /obj/machinery/door/airlock/glass/security{ req_one_access = list(103) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) @@ -4315,10 +4314,9 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) "GT" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 + name = "VB APC - South" }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/white, @@ -4517,16 +4515,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "Ip" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -4594,8 +4590,7 @@ /obj/item/pen{ pixel_y = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/item/toy/figure/ert, @@ -5059,9 +5054,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/item/gun/energy/laser, /obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/grey, @@ -5176,9 +5169,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -5545,6 +5537,12 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) +"OQ" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) "OR" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -5757,9 +5755,8 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/teleporter) "Qc" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "VB APC - West"; pixel_x = -24 }, @@ -5806,10 +5803,9 @@ /obj/item/smes_coil, /obj/item/t_scanner/advanced, /obj/item/t_scanner/advanced, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 + name = "VB APC - South" }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/techfloor, @@ -5888,11 +5884,9 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/engineering) "Rh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) "Rt" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5903,13 +5897,13 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/bridge) "Rv" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/glass/medical{ name = "Medical Bay"; req_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "Rw" = ( @@ -5929,8 +5923,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_dl) @@ -6078,9 +6072,8 @@ /area/ship/ert/dock_star) "SA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -6240,8 +6233,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/teleporter) "Ul" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/item/modular_computer/console/preset/medical{ @@ -6354,13 +6346,13 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "VJ" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/glass/medical{ name = "Medical Bay"; req_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "VO" = ( @@ -6589,9 +6581,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -6614,9 +6604,8 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/barracks) "Yq" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -6656,6 +6645,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/bridge) +"Yv" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) "Yx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6762,8 +6755,7 @@ /area/ship/ert/med) "ZU" = ( /obj/machinery/light, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/power/port_gen/pacman/mrs, @@ -14979,7 +14971,7 @@ Sz Sz Ql sC -Rh +ch bJ uE yo @@ -15101,7 +15093,7 @@ yz ae am dn -ee +dY ik lX oV @@ -16668,7 +16660,7 @@ OU mF ip ip -BW +Yv Bc BW Js @@ -16678,7 +16670,7 @@ BW VP sX Jf -BW +Yv Br Br Br @@ -16948,7 +16940,7 @@ Ye Zo Bo Bo -Jd +oS mI Bo tH @@ -16965,7 +16957,7 @@ Rz Yd ZT yI -QT +OQ pz KI KI @@ -18226,7 +18218,7 @@ Ye Zo Bo Bo -ip +ee mZ Bo tH @@ -18655,7 +18647,7 @@ fj jD JM ip -Tl +Rh JE Nf Nf diff --git a/maps/templates/admin/ert_base.dmm b/maps/templates/admin/ert_base.dmm index 4290c73862..b08446daef 100644 --- a/maps/templates/admin/ert_base.dmm +++ b/maps/templates/admin/ert_base.dmm @@ -92,7 +92,7 @@ }, /obj/structure/fans/tiny, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ert1_control"; pixel_x = 24; @@ -304,7 +304,7 @@ "aL" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ert1_control"; pixel_x = -22; @@ -1824,7 +1824,7 @@ /area/shuttle/specops/centcom) "dL" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1381; master_tag = "ert2_control"; pixel_x = -22; @@ -2007,7 +2007,7 @@ /area/shuttle/specops/centcom) "ed" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1381; master_tag = "ert2_control"; pixel_x = 24; diff --git a/maps/templates/admin/killhouse1.dmm b/maps/templates/admin/killhouse1.dmm index 210e4039da..526bb740db 100644 --- a/maps/templates/admin/killhouse1.dmm +++ b/maps/templates/admin/killhouse1.dmm @@ -5,7 +5,7 @@ /turf/simulated/floor/wood, /area/killhouse/one) "au" = ( -/obj/machinery/power/apc/hyper/west_bump{ +/obj/machinery/power/apc/hyper/west_mount{ cell_type = /obj/item/cell/infinite }, /obj/machinery/light/small, @@ -823,7 +823,7 @@ /area/killhouse/one) "MR" = ( /obj/structure/trash_pile, -/obj/machinery/power/apc/hyper/east_bump{ +/obj/machinery/power/apc/hyper/east_mount{ cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/concrete/rng/lythios43c/outdoors, diff --git a/maps/templates/admin/killhouse2.dmm b/maps/templates/admin/killhouse2.dmm index 0ab364717f..fbbffdcfd6 100644 --- a/maps/templates/admin/killhouse2.dmm +++ b/maps/templates/admin/killhouse2.dmm @@ -1723,7 +1723,7 @@ /turf/simulated/floor/tiled/white, /area/killhouse/two) "Ev" = ( -/obj/machinery/power/apc/hyper/east_bump{ +/obj/machinery/power/apc/hyper/east_mount{ cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/outdoors/snow/lythios43c, @@ -2105,10 +2105,7 @@ /area/killhouse/two) "Nu" = ( /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/filingcabinet/medical, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -2721,7 +2718,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/killhouse/two) "Wi" = ( -/obj/machinery/power/apc/hyper/south_bump{ +/obj/machinery/power/apc/hyper/south_mount{ cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/concrete/rng/lythios43c/outdoors, diff --git a/maps/templates/admin/killhouseteleporter.dmm b/maps/templates/admin/killhouseteleporter.dmm index 74ab423318..61ddde6323 100644 --- a/maps/templates/admin/killhouseteleporter.dmm +++ b/maps/templates/admin/killhouseteleporter.dmm @@ -124,7 +124,7 @@ dir = 6; icon_state = "warning" }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/reinforced, diff --git a/maps/templates/admin/kk_mercship.dmm b/maps/templates/admin/kk_mercship.dmm index 3b4fa404ea..1a4d79112a 100644 --- a/maps/templates/admin/kk_mercship.dmm +++ b/maps/templates/admin/kk_mercship.dmm @@ -47,18 +47,15 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ak" = ( /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "Merc APC - West"; pixel_x = -24 }, @@ -125,13 +122,13 @@ id = "Merc_Rear_Blast"; name = "Blast Shield" }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal{ req_one_access = list(150) }, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "aE" = ( @@ -167,9 +164,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "aS" = ( @@ -279,8 +274,7 @@ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -588,9 +582,8 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -636,9 +629,8 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -1258,10 +1250,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/machinery/light{ dir = 4 }, @@ -1520,10 +1509,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "hH" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/wood, /area/ship/manta/commander) "hL" = ( @@ -1819,9 +1805,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "iQ" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -1903,9 +1888,8 @@ /turf/simulated/wall/rshull, /area/shuttle/manta_ship_boat) "jg" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -2158,6 +2142,13 @@ /obj/machinery/appliance/cooker/grill, /turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) +"kA" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/engineering) "kF" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/surgery, @@ -2332,8 +2323,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -2380,7 +2370,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "lM" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, @@ -2390,6 +2379,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "lO" = ( @@ -2441,9 +2431,8 @@ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -2538,10 +2527,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/manta_ship_boat) "my" = ( @@ -2594,8 +2580,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "mN" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /obj/structure/bed/chair/bay/shuttle{ @@ -2697,9 +2682,8 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -2915,6 +2899,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) +"oj" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/armoury_st) "om" = ( /obj/structure/cable/orange{ icon_state = "2-4" @@ -2961,9 +2954,8 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_port) "ov" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -3136,8 +3128,7 @@ /area/ship/manta/hallways_star) "pt" = ( /obj/structure/catwalk, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/plating, @@ -3217,9 +3208,8 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -3371,9 +3361,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "qK" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -3388,10 +3376,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -3444,10 +3429,9 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rl" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/effect/floor_decal/techfloor, /obj/structure/cable/orange{ @@ -3526,8 +3510,7 @@ /area/ship/manta/hallways_aft) "rE" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/white, @@ -3706,13 +3689,13 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "sz" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "sG" = ( @@ -3721,6 +3704,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "sM" = ( @@ -3766,6 +3750,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "th" = ( @@ -3818,9 +3803,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light{ dir = 1 }, @@ -3873,6 +3856,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "tL" = ( @@ -3890,6 +3876,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "tQ" = ( @@ -3924,14 +3911,14 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_port) "uc" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/techfloor, @@ -4126,9 +4113,7 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light{ dir = 1 }, @@ -4216,9 +4201,7 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light{ dir = 4 }, @@ -4232,10 +4215,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "vw" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange, /obj/machinery/light/small{ @@ -4399,9 +4381,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "wc" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; @@ -4416,6 +4395,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wd" = ( @@ -4447,8 +4429,7 @@ /obj/structure/flora/pottedplant{ icon_state = "plant-20" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/techfloor{ @@ -4589,9 +4570,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wQ" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; @@ -4600,6 +4578,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "wU" = ( @@ -4731,9 +4712,8 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "xv" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "Merc APC - West"; pixel_x = -24 }, @@ -4776,9 +4756,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "xG" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(150) @@ -4787,6 +4764,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "xK" = ( @@ -4919,8 +4899,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/techfloor{ @@ -5167,6 +5146,12 @@ id = "Manta_Wargear"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "zf" = ( @@ -5548,13 +5533,13 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "AX" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "Bi" = ( @@ -5562,9 +5547,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "Bk" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "Merc APC - West"; pixel_x = -24 }, @@ -5608,6 +5592,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "BJ" = ( @@ -5706,10 +5691,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "Cn" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange, /obj/machinery/light/small{ @@ -5788,9 +5772,6 @@ /turf/space, /area/ship/manta/radiator_star) "CF" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; name = "Mech Bay"; @@ -5811,6 +5792,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "CK" = ( @@ -5921,9 +5905,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light{ dir = 8 }, @@ -6060,10 +6042,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon, @@ -6292,6 +6271,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_star) "EY" = ( @@ -6390,10 +6370,9 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange{ icon_state = "0-8" @@ -6662,10 +6641,9 @@ /obj/structure/table/rack, /obj/item/mecha_parts/mecha_equipment/shocker, /obj/effect/floor_decal/techfloor, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange, /turf/simulated/floor/tiled/techfloor, @@ -7282,6 +7260,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "KI" = ( @@ -7367,8 +7348,7 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/light, @@ -7432,10 +7412,9 @@ /area/ship/manta/dock_star) "LC" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange{ icon_state = "0-4" @@ -7525,10 +7504,10 @@ /obj/machinery/door/airlock/multi_tile/metal{ req_one_access = list(150) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_star) "LZ" = ( @@ -7868,6 +7847,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "NK" = ( @@ -8022,10 +8002,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) @@ -8299,9 +8276,8 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -8319,9 +8295,8 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "Merc APC - West"; pixel_x = -24 }, @@ -8391,8 +8366,7 @@ /area/ship/manta/teleporter) "QE" = ( /obj/structure/catwalk, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/plating, @@ -8414,13 +8388,10 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "QJ" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "QO" = ( @@ -8608,10 +8579,10 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "RU" = ( @@ -8664,6 +8635,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Se" = ( @@ -8720,7 +8692,6 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -8729,12 +8700,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "St" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "SF" = ( @@ -8803,8 +8776,7 @@ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -8815,9 +8787,8 @@ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -9163,7 +9134,6 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks/bed_2) "UF" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ @@ -9175,6 +9145,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "UH" = ( @@ -9214,10 +9185,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "UR" = ( @@ -9509,10 +9477,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "Ww" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange, /turf/simulated/floor/wood, @@ -9538,7 +9505,6 @@ /turf/simulated/wall/rshull, /area/ship/manta/dock_port) "WN" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/structure/cable/orange{ icon_state = "1-2" }, @@ -9551,6 +9517,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "WO" = ( @@ -9567,7 +9534,6 @@ /obj/machinery/door/airlock/multi_tile/metal{ req_one_access = list(150) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9575,6 +9541,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_port) "WV" = ( @@ -9744,6 +9711,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "XE" = ( @@ -9798,9 +9768,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "XR" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; name = "Brig"; @@ -9813,6 +9780,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "XS" = ( @@ -9828,6 +9798,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "XY" = ( @@ -9844,9 +9817,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Yf" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; @@ -9858,6 +9828,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "Yh" = ( @@ -9884,9 +9857,6 @@ /area/ship/manta/hangar) "Yl" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(150) @@ -9897,8 +9867,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"Ym" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/bridge) "Yo" = ( /obj/machinery/door/window/brigdoor/northleft{ req_access = list(150); @@ -9939,9 +9919,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -9960,6 +9939,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "YF" = ( @@ -10129,9 +10109,8 @@ pixel_x = 12; pixel_y = 8 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -10215,7 +10194,6 @@ /turf/simulated/floor/plating, /area/ship/manta/dock_star) "ZY" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, @@ -10227,6 +10205,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) @@ -17950,7 +17929,7 @@ ZT ZT ZT ZT -ic +oj wc ZT ZT @@ -19807,7 +19786,7 @@ ag ag aJ tm -WV +Ym wd dn er @@ -20384,9 +20363,9 @@ gR zU Yd er -WV +Ym IG -sg +kA sg NM sg diff --git a/maps/templates/admin/mercbase.dmm b/maps/templates/admin/mercbase.dmm index d2faec5037..259bf3732a 100644 --- a/maps/templates/admin/mercbase.dmm +++ b/maps/templates/admin/mercbase.dmm @@ -167,7 +167,6 @@ /area/antag/antag_base) "ar" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_y = 32 }, /turf/unsimulated/floor{ @@ -2619,7 +2618,7 @@ opacity = 0 }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1331; master_tag = "merc_shuttle"; name = "exterior access button"; @@ -2892,7 +2891,7 @@ req_access = list(150) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "merc_shuttle"; name = "interior access button"; @@ -4095,7 +4094,7 @@ /area/shuttle/mercenary) "hh" = ( /obj/machinery/access_button/airlock_exterior{ - command = "cycle_interior"; + command = "cycle_int"; master_tag = "merc_south_airlock"; pixel_x = -25 }, diff --git a/maps/templates/admin/skipjack.dmm b/maps/templates/admin/skipjack.dmm index 0e63db3d04..caad2f9255 100644 --- a/maps/templates/admin/skipjack.dmm +++ b/maps/templates/admin/skipjack.dmm @@ -787,7 +787,7 @@ /area/shuttle/skipjack) "cb" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1331; master_tag = "vox_west_control"; req_one_access = list(150) @@ -812,7 +812,7 @@ /area/shuttle/skipjack) "ce" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1331; master_tag = "vox_east_control"; req_access = list(150) @@ -1023,7 +1023,7 @@ "cA" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "vox_west_control"; pixel_x = -22; @@ -1061,7 +1061,7 @@ "cE" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "vox_east_control"; pixel_x = 22; diff --git a/maps/templates/admin/wizard.dmm b/maps/templates/admin/wizard.dmm index 9b1fa966bb..32cc58385e 100644 --- a/maps/templates/admin/wizard.dmm +++ b/maps/templates/admin/wizard.dmm @@ -88,7 +88,6 @@ "am" = ( /obj/structure/bed/chair/wood/wings, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 0; pixel_y = 30 }, @@ -154,7 +153,6 @@ /area/wizard_station) "at" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 0; pixel_y = 30 }, @@ -749,7 +747,6 @@ /obj/item/suit_cooling_unit, /obj/structure/table/steel_reinforced, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 0; pixel_y = 30 }, @@ -760,7 +757,6 @@ /area/wizard_station) "bN" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 0; pixel_y = 30 }, diff --git a/maps/templates/archive/tradeship.dmm b/maps/templates/archive/tradeship.dmm index 31625cdfd8..326c3fa52d 100644 --- a/maps/templates/archive/tradeship.dmm +++ b/maps/templates/archive/tradeship.dmm @@ -1699,7 +1699,7 @@ /area/shuttle/trade) "dQ" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "trade2_control"; pixel_x = -22; @@ -1874,7 +1874,7 @@ /area/shuttle/trade) "ei" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1331; master_tag = "trade2_control"; pixel_x = 24; diff --git a/maps/templates/shuttles/overmaps/generic/bearcat.dmm b/maps/templates/shuttles/overmaps/generic/bearcat.dmm index 7ecc31fc6a..d01aec9717 100644 --- a/maps/templates/shuttles/overmaps/generic/bearcat.dmm +++ b/maps/templates/shuttles/overmaps/generic/bearcat.dmm @@ -114,7 +114,7 @@ /obj/machinery/light_switch{ pixel_x = 28 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/comms) "at" = ( @@ -131,7 +131,7 @@ /obj/machinery/light_switch{ pixel_x = 28 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/command) "av" = ( @@ -327,8 +327,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4 +/obj/machinery/power/apc/alarms_hidden/east_mount{ }, /turf/simulated/floor/wood, /area/shuttle/bearcat/command_captain) @@ -543,7 +542,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_port) "bx" = ( @@ -580,7 +579,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_starboard) "bB" = ( @@ -737,7 +736,7 @@ /obj/machinery/light_switch{ pixel_x = 28 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_central) "bZ" = ( @@ -880,7 +879,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_saloon) "cr" = ( @@ -1074,7 +1073,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_toilets) "cQ" = ( @@ -1216,7 +1215,7 @@ /obj/structure/handrail{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_dorms) "dh" = ( @@ -1332,7 +1331,7 @@ /obj/structure/handrail{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/crew_corridors) "dy" = ( @@ -1356,7 +1355,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_kitchen) "dC" = ( @@ -1588,7 +1587,7 @@ /obj/item/storage/box/syringes, /obj/structure/cable, /obj/item/storage/firstaid, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_medbay) "ed" = ( @@ -1634,7 +1633,7 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine) "ej" = ( @@ -1707,7 +1706,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/cargo) "ev" = ( @@ -1879,7 +1878,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/unused1) "eU" = ( @@ -2227,7 +2226,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/unused2) "fH" = ( @@ -2316,7 +2315,7 @@ /area/shuttle/bearcat/unused2) "fS" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_wash) "fT" = ( @@ -2412,7 +2411,7 @@ icon_state = "0-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/maintenance_enginecontrol) "gf" = ( @@ -2735,7 +2734,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_atmos) "gP" = ( @@ -2822,7 +2821,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /obj/machinery/air_alarm/alarms_hidden{ dir = 4; pixel_x = -26 @@ -3037,7 +3036,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine_pod_starboard) "kD" = ( @@ -3188,7 +3187,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine_pod_port) "FG" = ( diff --git a/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm b/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm index b4c5cec30d..5cc9139826 100644 --- a/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm +++ b/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm @@ -514,7 +514,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/wood, /area/shuttle/cruise_ship) "Ub" = ( @@ -584,7 +584,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/shuttle/cruise_ship/bedroom) "Za" = ( diff --git a/maps/templates/shuttles/overmaps/generic/cruiser.dmm b/maps/templates/shuttles/overmaps/generic/cruiser.dmm index 9038bdf427..2ba877ae41 100644 --- a/maps/templates/shuttles/overmaps/generic/cruiser.dmm +++ b/maps/templates/shuttles/overmaps/generic/cruiser.dmm @@ -26,7 +26,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_8"; name = "exterior access button"; @@ -134,11 +134,7 @@ /turf/simulated/floor/wood, /area/mothership/breakroom) "ap" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/mothership/breakroom) "aq" = ( @@ -350,7 +346,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/breakroom) "aR" = ( @@ -482,16 +478,12 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bn" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bo" = ( @@ -603,11 +595,7 @@ }, /obj/item/material/knife/butch, /obj/item/material/kitchen/rollingpin, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/mothership/kitchen) "bB" = ( @@ -902,8 +890,7 @@ /area/mothership/hydroponics) "ci" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -917,7 +904,7 @@ /area/mothership/kitchen) "ck" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/white, /area/mothership/kitchen) "cl" = ( @@ -1061,11 +1048,7 @@ /obj/item/radio/off, /obj/item/radio/off, /obj/item/radio/off, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cH" = ( @@ -1077,7 +1060,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_7"; name = "exterior access button"; @@ -1132,7 +1115,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_7"; name = "interior access button"; @@ -1233,7 +1216,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_2"; name = "interior access button"; @@ -1297,8 +1280,7 @@ /obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/table/rack/shelf/steel, @@ -1349,7 +1331,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "de" = ( @@ -1370,11 +1352,7 @@ /obj/structure/cable/cyan{ icon_state = "2-4" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -1494,11 +1472,7 @@ /obj/structure/cable/cyan{ icon_state = "2-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -1544,7 +1518,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom1) "dw" = ( @@ -1614,7 +1588,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom2) "dH" = ( @@ -1772,7 +1746,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ee" = ( @@ -1793,11 +1767,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eg" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/cyan{ icon_state = "2-8" }, @@ -1891,10 +1861,7 @@ /turf/simulated/floor/tiled/white, /area/mothership/surgery) "eq" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -1904,8 +1871,7 @@ "er" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/button/remote/airlock{ @@ -1944,7 +1910,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/dorm1) "eu" = ( @@ -2057,7 +2023,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/dorm2) "eE" = ( @@ -2079,10 +2045,7 @@ "eF" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/button/remote/airlock{ id = "ship-dorm2-door"; name = "Dorm 2 Lock"; @@ -2130,10 +2093,7 @@ /obj/item/clothing/suit/armor/pcarrier/blue/sol, /obj/item/clothing/suit/armor/pcarrier/blue/sol, /obj/item/clothing/suit/armor/pcarrier/blue/sol, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -2449,11 +2409,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fA" = ( -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /obj/structure/cable/cyan{ icon_state = "0-2" @@ -2484,8 +2441,7 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "fC" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2714,8 +2670,7 @@ "gc" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/gloves, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/white, @@ -2726,7 +2681,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/mothership/surgery) "ge" = ( @@ -2763,7 +2718,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/mothership/chemistry) "gh" = ( @@ -2790,8 +2745,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gk" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/cable, @@ -2944,19 +2898,12 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/mothership/treatment) "gL" = ( -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -3208,7 +3155,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/pathfinder, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "hj" = ( @@ -3362,8 +3309,7 @@ "hH" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/button/remote/airlock{ @@ -3399,7 +3345,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/wood, /area/mothership/dorm3) "hK" = ( @@ -3459,7 +3405,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/wood, /area/mothership/dorm4) "hO" = ( @@ -3478,10 +3424,7 @@ "hP" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/button/remote/airlock{ id = "ship-dorm4-door"; name = "Dorm 4 Lock"; @@ -3662,10 +3605,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "ip" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iq" = ( @@ -3918,7 +3858,7 @@ dir = 4 }, /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iS" = ( @@ -4006,7 +3946,7 @@ icon_state = "0-2" }, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "jg" = ( @@ -4219,7 +4159,7 @@ /obj/structure/cable/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "jC" = ( @@ -4272,7 +4212,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/mothership/resleeving) "jM" = ( @@ -4363,10 +4303,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) @@ -4375,11 +4312,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jT" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jU" = ( @@ -4769,7 +4702,7 @@ /obj/item/book/manual/security_space_law, /obj/structure/closet/secure_closet/nanotrasen_warden, /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kM" = ( @@ -4852,8 +4785,7 @@ "kU" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/button/remote/airlock{ @@ -4890,7 +4822,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/dorm5) "kX" = ( @@ -4950,7 +4882,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/dorm6) "lb" = ( @@ -4970,10 +4902,7 @@ "lc" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/button/remote/airlock{ id = "ship-dorm6-door"; name = "Dorm 6 Lock"; @@ -5042,7 +4971,7 @@ icon_state = "0-2" }, /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/mothership/medical) "lo" = ( @@ -5562,7 +5491,7 @@ /area/mothership/rnd) "mp" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mq" = ( @@ -5829,7 +5758,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "mV" = ( @@ -5857,7 +5786,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "mZ" = ( @@ -6345,8 +6274,7 @@ /area/mothership/rnd) "nS" = ( /obj/structure/closet/wardrobe/robotics_black, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/steel_grid, @@ -6427,8 +6355,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6443,7 +6370,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "ob" = ( @@ -6516,8 +6443,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "oi" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/bed/chair/bay/shuttle{ @@ -6788,8 +6714,7 @@ /area/mothership/robotics) "oO" = ( /obj/machinery/mech_recharger, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/bluegrid, @@ -6813,7 +6738,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oS" = ( @@ -6922,15 +6847,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "pd" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/closet/secure_closet/personal, @@ -6955,7 +6879,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_6"; name = "exterior access button"; @@ -7008,16 +6932,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms1) "pu" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_6"; name = "interior access button"; @@ -7048,7 +6968,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pz" = ( @@ -7207,7 +7127,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "pO" = ( @@ -7225,16 +7145,12 @@ /turf/simulated/floor/greengrid, /area/mothership/telecomms2) "pR" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_3"; name = "interior access button"; @@ -7295,7 +7211,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_3"; name = "exterior access button"; @@ -7577,10 +7493,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -7595,7 +7508,7 @@ dir = 8 }, /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/cryotube) "qZ" = ( @@ -7610,8 +7523,7 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -7651,7 +7563,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rf" = ( @@ -8382,7 +8294,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_5"; name = "exterior access button"; @@ -8439,10 +8351,7 @@ /turf/simulated/floor/tiled/techfloor, /area/mothership/telecomms2) "tl" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "ts" = ( @@ -8452,8 +8361,7 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "tA" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -8582,11 +8490,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "xS" = ( @@ -8683,7 +8587,7 @@ "zE" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_4"; name = "interior access button"; @@ -8697,7 +8601,7 @@ "Am" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_5"; name = "interior access button"; @@ -8909,7 +8813,7 @@ "Gi" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_8"; name = "interior access button"; @@ -9078,7 +8982,7 @@ "PC" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_1"; name = "interior access button"; @@ -9100,7 +9004,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_4"; name = "exterior access button"; @@ -9132,11 +9036,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "QI" = ( @@ -9177,8 +9077,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -9257,7 +9156,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_1"; name = "exterior access button"; @@ -9291,8 +9190,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -9452,11 +9350,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "ZS" = ( @@ -9468,7 +9362,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_2"; name = "exterior access button"; diff --git a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm index 2e458cf5db..ad04dfc27d 100644 --- a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm +++ b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm @@ -122,7 +122,7 @@ name = "curabitur fax machine"; pixel_y = 6 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/bcarpet, /area/shuttle/curabitur/curashuttle/cockpit) "aq" = ( @@ -245,8 +245,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/carpet/bcarpet, @@ -605,10 +604,7 @@ /obj/machinery/air_alarm/alarms_hidden{ pixel_y = 26 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/shuttle/curabitur/curashuttle/med) "bj" = ( @@ -746,7 +742,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/shuttle/curabitur/curashuttle/med) "bC" = ( @@ -993,7 +989,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/curabitur/curashuttle/eng) "bU" = ( @@ -1071,9 +1067,7 @@ /obj/item/surgical/bone_clamp, /obj/item/surgical/bone_clamp, /obj/item/surgical/scalpel/ripper, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/vent, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/curabitur/curashuttle/eng) @@ -1265,7 +1259,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/curabitur/curashuttle/hangar) "cB" = ( diff --git a/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm b/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm index 64211b8cf1..173f014c28 100644 --- a/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm +++ b/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm @@ -194,7 +194,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_cr_cockpit) "eP" = ( @@ -578,8 +578,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/gecko_cr) "lV" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /obj/structure/closet/crate{ @@ -707,17 +706,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit) "pf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -876,9 +872,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/gecko_cr_engineering) @@ -940,7 +934,7 @@ }, /obj/machinery/meter, /obj/effect/catwalk_plated/dark, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/gecko_cr) "te" = ( @@ -1051,9 +1045,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/railing/grey{ dir = 4 @@ -1245,9 +1237,7 @@ /area/shuttle/gecko_cr) "yR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/reinforced, /area/shuttle/gecko_cr) "yX" = ( @@ -2025,7 +2015,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_engineering) "Mf" = ( @@ -2105,8 +2095,7 @@ /area/shuttle/gecko_cr_engineering) "NM" = ( /obj/structure/handrail, -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /turf/simulated/floor/plating, @@ -2315,10 +2304,7 @@ /area/shuttle/gecko_cr_cockpit) "PW" = ( /obj/structure/handrail, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/plating, /area/shuttle/gecko_cr_engineering) "Ql" = ( @@ -2490,9 +2476,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/gecko_cr_engineering) @@ -2520,10 +2504,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/gecko_cr) "Tw" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /obj/structure/bed/pod, /obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, @@ -2676,8 +2657,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/handrail{ diff --git a/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm b/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm index f60ea7b7d9..a324572c4b 100644 --- a/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm +++ b/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm @@ -6,7 +6,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh_engineering) "aF" = ( @@ -273,7 +273,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_sh_cockpit) "eP" = ( @@ -582,8 +582,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "lV" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /obj/structure/closet/crate{ @@ -669,8 +668,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -792,9 +790,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/gecko_sh_engineering) @@ -1007,9 +1003,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/window/basic{ dir = 4 @@ -1220,7 +1214,7 @@ icon_state = "0-8" }, /obj/structure/railing/grey, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "zM" = ( @@ -1526,8 +1520,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/handrail{ @@ -1964,8 +1957,7 @@ /area/shuttle/gecko_sh_engineering) "NM" = ( /obj/structure/handrail, -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /turf/simulated/floor/plating, @@ -2100,10 +2092,7 @@ /area/shuttle/gecko_sh) "PW" = ( /obj/structure/handrail, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/plating, /area/shuttle/gecko_sh_engineering) "Ql" = ( @@ -2281,9 +2270,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/gecko_sh_engineering) @@ -2295,10 +2282,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "Tw" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /obj/structure/bed/pod, /obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, @@ -2536,9 +2520,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_sh) "XX" = ( -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "Yd" = ( diff --git a/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm index 8e2a11a3d9..3371c0c6c0 100644 --- a/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm +++ b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm @@ -490,7 +490,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -580,7 +580,7 @@ icon_state = "1-8" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "generic_shuttle_docker"; name = "interior access button"; @@ -636,7 +636,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "generic_shuttle_docker"; name = "exterior access button"; @@ -700,7 +700,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/generic_shuttle/eng) "bz" = ( diff --git a/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm b/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm index a889e376d4..748762c818 100644 --- a/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm +++ b/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm @@ -49,11 +49,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/blue_fo) "aj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, diff --git a/maps/templates/shuttles/overmaps/generic/itglight.dmm b/maps/templates/shuttles/overmaps/generic/itglight.dmm index dee2b9c973..1388889c0f 100644 --- a/maps/templates/shuttles/overmaps/generic/itglight.dmm +++ b/maps/templates/shuttles/overmaps/generic/itglight.dmm @@ -465,7 +465,7 @@ }, /obj/structure/bed/double/padded, /obj/item/bedsheet/browndouble, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew4) "cv" = ( @@ -512,7 +512,7 @@ dir = 8 }, /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/itglight/captain) "cU" = ( @@ -690,7 +690,7 @@ /area/itglight/crew1) "ed" = ( /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/carpet, /area/itglight/readyroom) "ei" = ( @@ -1085,7 +1085,7 @@ /area/itglight/captain) "hc" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_dock_1"; name = "port exterior access button"; @@ -1093,7 +1093,7 @@ pixel_y = 65 }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_dock_2"; name = "starboard exterior access button"; @@ -1610,7 +1610,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "kH" = ( @@ -1669,7 +1669,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/itglight/showers) "kY" = ( @@ -1694,7 +1694,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/afthall) "li" = ( @@ -1927,7 +1927,7 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/porthighsec) "na" = ( @@ -2249,7 +2249,7 @@ /obj/fiftyspawner/phoron, /obj/fiftyspawner/phoron, /obj/structure/closet/crate, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor, /area/itglight/starboardengi) "pm" = ( @@ -2314,7 +2314,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "pU" = ( @@ -2637,7 +2637,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/shuttle/floor/black, /area/shuttle/itglightshuttle) "sQ" = ( @@ -3270,7 +3270,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/itglight/portdocking) "xM" = ( @@ -3361,7 +3361,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "itglight_port"; name = "interior access button"; @@ -3470,7 +3470,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/itglight/starboarddocking) "yZ" = ( @@ -3561,7 +3561,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "zM" = ( @@ -3694,7 +3694,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/monotile, /area/itglight/forehall) "AK" = ( @@ -3752,7 +3752,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/monotile, /area/itglight/lockers) "Bj" = ( @@ -3855,7 +3855,7 @@ }, /obj/structure/bed/double/padded, /obj/item/bedsheet/browndouble, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew1) "BW" = ( @@ -3919,7 +3919,7 @@ icon_state = "4-8" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_dock_1"; name = "exterior access button"; @@ -4039,7 +4039,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "itglight_dock_1"; name = "interior access button"; @@ -4273,7 +4273,7 @@ id_tag = "itglight_dock_2_inner" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "itglight_dock_2"; name = "interior access button"; @@ -4351,7 +4351,7 @@ icon_state = "4-8" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_dock_2"; name = "exterior access button"; @@ -4580,7 +4580,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "itglight_starboard"; name = "interior access button"; @@ -4999,7 +4999,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/shuttlebay) "IN" = ( @@ -5031,7 +5031,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/portcargo) "Jg" = ( @@ -5046,7 +5046,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_starboard"; name = "exterior access button"; @@ -5164,7 +5164,7 @@ }, /obj/structure/bed/double/padded, /obj/item/bedsheet/browndouble, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew3) "JT" = ( @@ -5211,7 +5211,7 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardcargo) "Kj" = ( @@ -5269,7 +5269,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor, /area/itglight/portengi) "KG" = ( @@ -5443,7 +5443,7 @@ }, /obj/structure/bed/double/padded, /obj/item/bedsheet/browndouble, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew2) "Ml" = ( @@ -5750,7 +5750,7 @@ /area/itglight/lockers) "NY" = ( /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "Oc" = ( @@ -5760,7 +5760,7 @@ /obj/structure/cable/pink{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/itglight/passengersleeping) "Oe" = ( @@ -6065,7 +6065,7 @@ /obj/structure/cable/pink{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/metingroom) "Qi" = ( @@ -6931,7 +6931,7 @@ /obj/structure/table/wooden_reinforced, /obj/random/plushie, /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/common) "WN" = ( @@ -6958,7 +6958,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_port"; name = "exterior access button"; @@ -7018,7 +7018,7 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/itglight/restrooms) "Xn" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm index 0e989ae641..9434d598e3 100644 --- a/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm +++ b/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm @@ -734,7 +734,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_hc) "TG" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm index c7adc3dd5e..3cd9e90a85 100644 --- a/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm +++ b/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm @@ -122,7 +122,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_hc_skel_eng) "fI" = ( @@ -384,8 +384,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/mackerel_hc_skel) "ut" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/light, @@ -514,7 +513,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/plating, /area/shuttle/mackerel_hc_skel) "Dl" = ( @@ -706,8 +705,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; +/obj/machinery/fire_alarm/alarms_hidden/east_mount{ pixel_x = -26 }, /obj/structure/railing/grey, @@ -1014,7 +1012,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_hc_skel_cockpit) "ZJ" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm index a854ec53bc..046ffc1caa 100644 --- a/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm +++ b/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm @@ -279,7 +279,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc) "sL" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm index 7211465bfe..2703ad23b7 100644 --- a/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm +++ b/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm @@ -287,7 +287,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_sh) "sL" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm b/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm index 182bc628b8..03b2879a5b 100644 --- a/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm +++ b/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm @@ -43,7 +43,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/mercbase/airlock) "ag" = ( @@ -254,10 +254,7 @@ /turf/simulated/floor/plating, /area/mercbase/panels) "de" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/dock) "dD" = ( @@ -276,7 +273,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/power) "fM" = ( @@ -531,7 +528,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/command) "gT" = ( @@ -579,7 +576,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalOR) "ha" = ( @@ -858,7 +855,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/hydrant{ pixel_x = -32 }, @@ -965,7 +962,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/eqroom) "hV" = ( @@ -1173,7 +1170,7 @@ /area/mercbase/medicalstorage) "is" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/barracks) "iw" = ( @@ -1436,14 +1433,14 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalstorage) "jk" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/hall) "jl" = ( @@ -1477,7 +1474,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/engineering) "jo" = ( @@ -1677,7 +1674,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/mercbase/atmos) "jN" = ( @@ -1833,14 +1830,14 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/mercbase/airlock) "kh" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/mercbase/fuel) "ki" = ( @@ -2200,10 +2197,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor, /area/mercbase/fuel) "kY" = ( @@ -2222,10 +2216,7 @@ /turf/simulated/floor, /area/mercbase/atmos) "lB" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/closet/secure_closet/chemical{ req_access = list(150) }, @@ -2236,10 +2227,7 @@ /turf/simulated/floor/tiled/dark, /area/mercbase/medicalstorage) "lC" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/power/terminal, /obj/structure/cable, /obj/structure/table/reinforced, @@ -2448,10 +2436,7 @@ /area/mercbase/medical) "lZ" = ( /obj/structure/bed/padded, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/barracks) "ma" = ( @@ -2506,7 +2491,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/dock) "mu" = ( @@ -2572,7 +2557,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "mD" = ( @@ -2880,61 +2865,37 @@ /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "nq" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/medical) "nr" = ( /obj/machinery/optable, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalOR) "ns" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/power) "nt" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/solar) "nu" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/engineering) "nv" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/hall) "nw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor, /area/mercbase/atmos) "nx" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "ny" = ( @@ -3281,10 +3242,7 @@ /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "oJ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/command) "oK" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm index 4834347830..70068fe29b 100644 --- a/maps/templates/shuttles/overmaps/generic/mercship.dmm +++ b/maps/templates/shuttles/overmaps/generic/mercship.dmm @@ -33,9 +33,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/ship/mercenary/engine1) "ag" = ( @@ -167,7 +165,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/ship/mercenary/engine1) "aw" = ( @@ -307,7 +305,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/mercenary/barracks) "aO" = ( @@ -419,7 +417,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hangar) "bb" = ( @@ -519,9 +517,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "bm" = ( @@ -602,9 +598,7 @@ /obj/machinery/button/remote/blast_door{ id = "mercblast" }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/bridge) "bv" = ( @@ -853,7 +847,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "bT" = ( @@ -1038,7 +1032,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "ck" = ( @@ -1084,7 +1078,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineeringcntrl) "cq" = ( @@ -1107,7 +1101,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/northairlock) "cs" = ( @@ -1302,8 +1296,7 @@ /area/ship/mercenary/hangar) "cL" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -1450,7 +1443,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall1) "cY" = ( @@ -1484,7 +1477,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/bridge) "db" = ( @@ -1756,7 +1749,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/southairlock) "dC" = ( @@ -1811,7 +1804,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/air) "dI" = ( @@ -1856,7 +1849,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med) "dM" = ( @@ -2012,7 +2005,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineering) "ef" = ( @@ -2088,9 +2081,7 @@ }, /obj/fiftyspawner/uranium, /obj/fiftyspawner/uranium, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineeringcntrl) "ep" = ( @@ -2236,7 +2227,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall2) "eK" = ( @@ -2542,7 +2533,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/ship/mercenary/engine) "fm" = ( @@ -2646,8 +2637,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/plating, @@ -2692,8 +2682,7 @@ dir = 9 }, /obj/machinery/meter, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -2874,7 +2863,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "fU" = ( @@ -3041,7 +3030,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/mercenary/armoury) "gi" = ( @@ -3149,7 +3138,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/atmos) "gw" = ( @@ -3228,9 +3217,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall2) "gC" = ( @@ -3352,8 +3339,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -3374,8 +3360,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/white, @@ -3424,9 +3409,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineering) "gW" = ( @@ -3459,8 +3442,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/white, @@ -3615,8 +3597,7 @@ /area/ship/mercenary/engineering) "hp" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -3743,8 +3724,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, diff --git a/maps/templates/shuttles/overmaps/generic/salamander.dmm b/maps/templates/shuttles/overmaps/generic/salamander.dmm index f008eb20e9..4446ef757c 100644 --- a/maps/templates/shuttles/overmaps/generic/salamander.dmm +++ b/maps/templates/shuttles/overmaps/generic/salamander.dmm @@ -79,7 +79,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_galley) "bK" = ( @@ -155,7 +155,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_head) "cC" = ( @@ -398,7 +398,7 @@ /obj/structure/bed/chair/bay/comfy{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_cockpit) "gC" = ( @@ -651,15 +651,15 @@ dir = 4; req_one_access = list(160) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_cockpit) "ks" = ( @@ -1069,7 +1069,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_q2) "qu" = ( @@ -1165,6 +1165,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_engineering) "ub" = ( @@ -1284,7 +1290,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_q2) "Bf" = ( @@ -1325,6 +1331,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_cockpit) "DK" = ( @@ -1722,7 +1731,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_engineering) "Vs" = ( @@ -1771,12 +1780,12 @@ name = "Salamander Engineering Bay"; req_one_access = list(160) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_engineering) "WP" = ( @@ -1878,7 +1887,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) diff --git a/maps/templates/shuttles/overmaps/generic/screebarge.dmm b/maps/templates/shuttles/overmaps/generic/screebarge.dmm index fde4851e54..6002ab613b 100644 --- a/maps/templates/shuttles/overmaps/generic/screebarge.dmm +++ b/maps/templates/shuttles/overmaps/generic/screebarge.dmm @@ -158,7 +158,7 @@ /area/shuttle/screebarge/fore) "aw" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/reinforced, /area/shuttle/screebarge/fore) "ax" = ( @@ -396,7 +396,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/screebarge/mid) "bg" = ( @@ -459,7 +459,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/screebarge/aft) "bo" = ( diff --git a/maps/templates/shuttles/overmaps/generic/shelter_5.dmm b/maps/templates/shuttles/overmaps/generic/shelter_5.dmm index 684cbd11ed..912e1e3267 100644 --- a/maps/templates/shuttles/overmaps/generic/shelter_5.dmm +++ b/maps/templates/shuttles/overmaps/generic/shelter_5.dmm @@ -124,7 +124,7 @@ "n" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "escapepod_shuttle_docker"; pixel_x = -5; @@ -149,7 +149,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "escapepod_shuttle_docker"; name = "exterior access button"; @@ -190,7 +190,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "u" = ( diff --git a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm index d35c63663f..27cf678002 100644 --- a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm +++ b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm @@ -511,7 +511,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "tabiranth_airlock"; name = "exterior access button"; @@ -649,7 +649,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "tabiranth_airlock"; pixel_x = 5; @@ -667,7 +667,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "tabiranth_docker"; pixel_x = -5; @@ -1034,7 +1034,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/shuttle/tabiranth) "aY" = ( @@ -1666,7 +1666,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "tabiranth_docker"; name = "exterior access button"; diff --git a/maps/templates/shuttles/overmaps/generic/vespa.dmm b/maps/templates/shuttles/overmaps/generic/vespa.dmm index e78ec4dbb1..a41bc490c8 100644 --- a/maps/templates/shuttles/overmaps/generic/vespa.dmm +++ b/maps/templates/shuttles/overmaps/generic/vespa.dmm @@ -8,7 +8,7 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/firealarm{ +/obj/machinery/fire_alarm{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -16,8 +16,7 @@ "ac" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -243,7 +242,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor, /area/ship/expe/atmospherics) "aP" = ( @@ -380,7 +379,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/maintenancerim) "bn" = ( @@ -534,9 +533,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seccells) "bE" = ( @@ -628,7 +625,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/northairlock) "bO" = ( @@ -782,7 +779,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/maintenance2) "cq" = ( @@ -882,7 +879,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin1) @@ -902,7 +899,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin2) @@ -921,7 +918,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin3) @@ -940,7 +937,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin4) @@ -960,7 +957,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin5) @@ -980,7 +977,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin6) @@ -999,7 +996,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin7) @@ -1018,7 +1015,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin8) @@ -1038,7 +1035,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin9) @@ -1102,7 +1099,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/maintenance1) "dk" = ( @@ -1493,8 +1490,7 @@ /turf/simulated/wall/rpshull, /area/ship/expe/corridor1) "em" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1513,8 +1509,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin1) "ep" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1532,8 +1527,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin2) "es" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1552,8 +1546,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin3) "ev" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1571,8 +1564,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin4) "ey" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1591,8 +1583,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin5) "eB" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1610,8 +1601,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin6) "eE" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1630,8 +1620,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin7) "eH" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1649,8 +1638,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin8) "eK" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1784,7 +1772,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) "fg" = ( @@ -2014,7 +2002,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor4) "fD" = ( @@ -2089,7 +2077,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/bridge) "fM" = ( @@ -2456,8 +2444,7 @@ icon_state = "1-4" }, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -2741,10 +2728,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor3) "gU" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/power/terminal, /obj/structure/cable, /obj/effect/floor_decal/techfloor, @@ -2756,8 +2740,7 @@ /area/ship/expe/corridor3) "gW" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -2941,7 +2924,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor1) "ht" = ( @@ -3114,7 +3097,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineeringstorage) "hN" = ( @@ -3248,7 +3231,7 @@ }, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/yellow/bordercorner, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineering) "hU" = ( @@ -3312,8 +3295,7 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/yellow/border, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -3436,7 +3418,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/sm) "ie" = ( @@ -3743,7 +3725,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seceq) "iH" = ( @@ -3793,7 +3775,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/secmain) "iL" = ( @@ -3847,9 +3829,7 @@ /turf/simulated/wall/rpshull, /area/ship/expe/medicalchem) "iP" = ( -/obj/machinery/firealarm{ - pixel_y = 28 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -3894,7 +3874,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalchem) "iT" = ( @@ -4662,7 +4642,6 @@ dir = 9 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, @@ -4755,7 +4734,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineeringpower) "kJ" = ( @@ -5250,7 +5229,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineeringequipment) "lN" = ( @@ -5776,8 +5755,7 @@ "mL" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/yellow/border, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -5790,8 +5768,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -6190,8 +6167,7 @@ icon_state = "1-4" }, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -6233,10 +6209,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/sechall) "nG" = ( @@ -6358,8 +6331,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -6405,11 +6377,7 @@ /turf/simulated/floor/tiled/white, /area/ship/expe/medicalmain) "nY" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/power/terminal{ dir = 8 }, @@ -6722,7 +6690,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor6) "oB" = ( @@ -6911,7 +6879,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby2) "oY" = ( @@ -6988,7 +6956,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalmain) "pf" = ( @@ -7025,8 +6993,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -7323,7 +7290,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "pQ" = ( @@ -7368,7 +7335,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangar) "pU" = ( @@ -7396,7 +7363,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seccells) "pW" = ( @@ -7430,10 +7397,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby) "pZ" = ( @@ -7446,7 +7410,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/sechall) "qa" = ( @@ -7456,10 +7420,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 6 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby2) "qb" = ( @@ -7719,11 +7680,7 @@ /area/ship/expe/smstorage) "qD" = ( /obj/machinery/power/emitter, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/power/terminal{ dir = 1 }, @@ -7771,7 +7728,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/captqua) "qK" = ( @@ -8153,7 +8110,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor, /area/ship/expe/corridor4) "rJ" = ( @@ -8483,7 +8440,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby) "sv" = ( @@ -8536,9 +8493,7 @@ /turf/simulated/floor/tiled/white, /area/ship/expe/medical) "sz" = ( -/obj/machinery/firealarm{ - pixel_y = 31 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/bed/chair, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -8611,7 +8566,7 @@ dir = 9 }, /obj/item/storage/box/freezer, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalsur) "sF" = ( @@ -8730,9 +8685,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medical1) "sN" = ( @@ -8995,8 +8948,7 @@ }, /obj/structure/table/reinforced, /obj/item/storage/firstaid/surgery, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -9034,7 +8986,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medical1) "tN" = ( @@ -9144,7 +9096,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor5) "tY" = ( @@ -9489,10 +9441,7 @@ /turf/simulated/floor/tiled/white, /area/ship/expe/medical) "uP" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/power/terminal, /obj/structure/cable, /obj/structure/bed/chair{ @@ -9512,7 +9461,6 @@ dir = 6 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, @@ -9660,8 +9608,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -9994,7 +9941,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor2) "wf" = ( @@ -10304,9 +10251,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor2) "wT" = ( @@ -10489,7 +10434,7 @@ /area/ship/expe/maintenancerim) "xH" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/southairlock) "xI" = ( @@ -10539,7 +10484,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/engines) "xZ" = ( diff --git a/maps/tether/engines.dm b/maps/tether/engines.dm index 6d739a471a..1ace0522c5 100644 --- a/maps/tether/engines.dm +++ b/maps/tether/engines.dm @@ -9,11 +9,11 @@ suffix = "rust.dmm" display_name = list("Budget Star", "Bane of Synthetics", "Glowy Field", "Funny Spinny EM Field", "Protean Rarity Enforcement") -/datum/map_template/engine/tether/singulo +/*/datum/map_template/engine/tether/singulo name = "ProcEngine_Tether_Singulo" desc = "Lord Singuloth" suffix = "singulo.dmm" - display_name = list("Hypnosis Swirls", "Lord Singuloth", "The Devourer of Stations", "Contained Black Hole", "The Forbidden Succ") + display_name = list("Hypnosis Swirls", "Lord Singuloth", "The Devourer of Stations", "Contained Black Hole", "The Forbidden Succ")*/ /datum/map_template/engine/tether/supermatter name = "ProcEngine_Tether_Supermatter" diff --git a/maps/tether/engines/rust.dmm b/maps/tether/engines/rust.dmm index 04fc0efe6a..457bdf0cb2 100644 --- a/maps/tether/engines/rust.dmm +++ b/maps/tether/engines/rust.dmm @@ -88,7 +88,7 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "an" = ( /turf/simulated/floor/reinforced, @@ -104,9 +104,8 @@ /turf/simulated/floor, /area/engineering/engine_room) "ar" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "as" = ( @@ -334,7 +333,7 @@ /turf/simulated/floor/reinforced, /area/engineering/engine_room) "bc" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) "bd" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, @@ -370,11 +369,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor, /area/engineering/engine_room) "bj" = ( @@ -587,22 +582,19 @@ /turf/space, /area/space) "bM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 + opacity = 0; + dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "bN" = ( @@ -698,22 +690,19 @@ /turf/space, /area/space) "bZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + opacity = 0; dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "ca" = ( @@ -789,19 +778,16 @@ /turf/space, /area/space) "ck" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 + opacity = 0; + dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cl" = ( @@ -969,15 +955,11 @@ /obj/machinery/camera/network/engine{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/engineering/engine_room) "cG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) "cH" = ( /turf/simulated/floor, @@ -1030,9 +1012,7 @@ /area/engineering/engine_room) "cO" = ( /obj/machinery/door/blast/regular{ - dir = 4; id = "EngineEmitterPortWest"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/machinery/door/firedoor/glass, @@ -1198,7 +1178,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "dk" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -1235,11 +1215,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, @@ -1248,8 +1224,7 @@ "dp" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor, @@ -1271,13 +1246,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "EngineEmitterPortWest2"; - name = "Engine Room Blast Doors"; - pixel_x = 25; - req_one_access = list(11,24) - }, /turf/simulated/floor, /area/engineering/engine_gas) "dt" = ( @@ -1286,18 +1254,16 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) "du" = ( /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineEmitterPortWest2"; - layer = 3.3; + id = "EngineEmitterPortWest"; name = "Engine Gas Storage" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/template_noop) "dv" = ( @@ -1306,11 +1272,16 @@ icon_state = "1-2" }, /obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineEmitterPortWest2"; - layer = 3.3; + id = "EngineEmitterPortWest"; name = "Engine Gas Storage" }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine control room blast doors."; + id = "EngineEmitterPortWest2"; + name = "Engine Room Blast Doors"; + pixel_x = 25; + req_one_access = list(11,24) + }, /turf/simulated/floor/tiled/steel_grid, /area/template_noop) "dw" = ( @@ -1359,6 +1330,17 @@ /obj/machinery/power/smes/buildable/engine/rust, /turf/template_noop, /area/template_noop) +"Cy" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + id = "EngineEmitterPortWest"; + name = "Engine Gas Storage" + }, +/turf/simulated/floor, +/area/engineering/engine_gas) +"YO" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) (1,1,1) = {" aa @@ -1684,20 +1666,20 @@ aa aa ai aj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO bM bZ ck @@ -1716,7 +1698,7 @@ aa aa ai ab -ak +YO an an an @@ -1748,7 +1730,7 @@ aa aa ai ab -ak +YO an an an @@ -1780,7 +1762,7 @@ aa aa aj aj -ak +YO an an an @@ -1799,7 +1781,7 @@ cc cn cy cJ -cO +Cy cH dg dm @@ -1844,7 +1826,7 @@ aa aa aj aj -ak +YO an aA an @@ -1876,7 +1858,7 @@ aa aa ai ab -ak +YO an aA an @@ -1908,7 +1890,7 @@ aa aa ai ab -ak +YO an aA an @@ -1929,7 +1911,7 @@ cA cL cP cY -ak +YO aa aa aa @@ -1940,7 +1922,7 @@ aa aa ai aj -ak +YO ao ag ao @@ -1961,7 +1943,7 @@ cB cM cQ cZ -ak +YO aa aa aa @@ -1972,7 +1954,7 @@ aa aa aj ab -ak +YO aU aC aJ @@ -1993,7 +1975,7 @@ bT ce cR da -ak +YO aa aa aa @@ -2004,7 +1986,7 @@ aa aa ai ab -ak +YO af aD aK @@ -2036,7 +2018,7 @@ aa aa ai aj -ak +YO ar aE ar @@ -2057,7 +2039,7 @@ cC cg cs dc -ak +YO aa aa aa @@ -2068,7 +2050,7 @@ aa aa ai ab -ak +YO as aq aL @@ -2089,7 +2071,7 @@ cD ch ct dd -ak +YO aa aa aa @@ -2100,7 +2082,7 @@ aa aa aj ab -ak +YO at aq aq @@ -2121,7 +2103,7 @@ cE bk cS aq -ak +YO aa aa aa @@ -2132,7 +2114,7 @@ aa aa ai ab -ak +YO au aq aM @@ -2153,7 +2135,7 @@ cF cN cT de -ak +YO aa aa aa @@ -2165,11 +2147,11 @@ aa ai aj am -ak -ak -ak -ak -ak +YO +YO +YO +YO +YO bc bc bc diff --git a/maps/tether/engines/singulo.dmm b/maps/tether/engines/singulo.dmm index 7c4506fb7f..43d250292f 100644 --- a/maps/tether/engines/singulo.dmm +++ b/maps/tether/engines/singulo.dmm @@ -116,7 +116,7 @@ /area/space) "at" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_north_airlock"; name = "exterior access button"; @@ -170,7 +170,7 @@ /area/engineering/engine_room) "aw" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_north_airlock"; name = "interior access button"; @@ -224,11 +224,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor, /area/engineering/engine_gas) "az" = ( @@ -323,7 +319,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, @@ -399,11 +394,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "aO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -449,7 +440,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, @@ -552,7 +542,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, @@ -750,11 +739,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -1132,7 +1117,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, @@ -1276,7 +1260,7 @@ /area/space) "ct" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_south_airlock"; name = "exterior access button"; @@ -1329,7 +1313,7 @@ icon_state = "4-8" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_south_airlock"; name = "interior access button"; @@ -1438,7 +1422,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, diff --git a/maps/tether/engines/sme.dmm b/maps/tether/engines/sme.dmm index ebafa4928f..96b254410c 100644 --- a/maps/tether/engines/sme.dmm +++ b/maps/tether/engines/sme.dmm @@ -107,14 +107,14 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "au" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "av" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) "aw" = ( /obj/machinery/atmospherics/portables_connector{ @@ -208,11 +208,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor, /area/engineering/engine_room) "aL" = ( @@ -249,20 +245,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, +/obj/spawner/window/borosillicate/reinforced/full, /obj/machinery/door/blast/regular{ - dir = 2; + dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -354,20 +340,7 @@ }, /area/engineering/engine_room) "aZ" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - dir = 2; - id = "SupermatterPort"; - layer = 3.3; - name = "Reactor Blast Door" - }, -/turf/simulated/floor, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "ba" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central4{ @@ -493,18 +466,10 @@ }, /area/engineering/engine_room) "bk" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, +/obj/spawner/window/borosillicate/reinforced/full, /obj/machinery/door/blast/regular{ - dir = 2; + dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -551,21 +516,10 @@ /area/engineering/engine_room) "br" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, +/obj/spawner/window/borosillicate/reinforced/full, /obj/machinery/door/blast/regular{ - dir = 4; + dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -580,21 +534,10 @@ /turf/simulated/floor/reinforced, /area/engineering/engine_room) "bt" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, +/obj/spawner/window/borosillicate/reinforced/full, /obj/machinery/door/blast/regular{ - dir = 4; + dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -661,7 +604,6 @@ /area/template_noop) "bB" = ( /obj/machinery/computer/general_air_control/supermatter_core{ - dir = 1; input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; @@ -802,22 +744,19 @@ /turf/space, /area/space) "bP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 + opacity = 0; + dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "bQ" = ( @@ -922,22 +861,19 @@ /turf/simulated/floor, /area/engineering/engine_room) "ce" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + opacity = 0; dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cf" = ( @@ -1013,19 +949,16 @@ /turf/space, /area/space) "cp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 + opacity = 0; + dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cq" = ( @@ -1180,15 +1113,11 @@ /obj/machinery/camera/network/engine{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/engineering/engine_room) "cJ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) "cK" = ( /turf/simulated/floor, @@ -1200,7 +1129,6 @@ id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; pixel_y = -25; - req_access = null; req_one_access = list(11,24) }, /obj/machinery/camera/network/engine{ @@ -1248,7 +1176,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/machinery/door/firedoor/glass, @@ -1309,7 +1236,6 @@ id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; pixel_y = 25; - req_access = null; req_one_access = list(11,24) }, /turf/simulated/floor, @@ -1407,7 +1333,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "dn" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -1444,11 +1370,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, @@ -1457,8 +1379,7 @@ "ds" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor, @@ -1480,14 +1401,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "EngineEmitterPortWest2"; - name = "Engine Room Blast Doors"; - pixel_x = 25; - req_access = null; - req_one_access = list(11,24) - }, /turf/simulated/floor, /area/engineering/engine_gas) "dw" = ( @@ -1496,14 +1409,13 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) "dx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest2"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1518,9 +1430,15 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest2"; - layer = 3.3; name = "Engine Gas Storage" }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine control room blast doors."; + id = "EngineEmitterPortWest2"; + name = "Engine Room Blast Doors"; + pixel_x = 25; + req_one_access = list(11,24) + }, /turf/simulated/floor/tiled/steel_grid, /area/template_noop) "ge" = ( @@ -1871,13 +1789,13 @@ ad ad ad ad -as -as +aZ +aZ bP ce cp at -as +aZ cJ cJ cJ @@ -1900,10 +1818,10 @@ ac ac ac at -as -as -as -as +aZ +aZ +aZ +aZ bC bQ cf @@ -1931,7 +1849,7 @@ ab ab ab ab -as +aZ aL aW bh @@ -1995,7 +1913,7 @@ ab ab ab ab -as +aZ aN aY bj @@ -2025,11 +1943,11 @@ ac ad ac ac -as -as -as -aO aZ +aZ +aZ +aO +bk bk as bG @@ -2057,7 +1975,7 @@ ae ao ae ao -as +aZ aw aG aP @@ -2089,7 +2007,7 @@ af af af af -as +aZ ax aC aQ @@ -2104,7 +2022,7 @@ cE cO cS db -as +aZ aa aa aa @@ -2121,7 +2039,7 @@ ag ag ag ag -as +aZ ay aH aR @@ -2136,7 +2054,7 @@ cF cP cT dc -as +aZ aa aa aa @@ -2153,7 +2071,7 @@ af af af af -as +aZ az az aS @@ -2168,7 +2086,7 @@ bX cj cU dd -as +aZ aa aa aa @@ -2232,7 +2150,7 @@ bZ cl cx df -as +aZ aa aa aa @@ -2249,7 +2167,7 @@ ak ak ak ak -as +aZ aC aJ aT @@ -2264,7 +2182,7 @@ cG cm cy dg -as +aZ aa aa aa @@ -2281,7 +2199,7 @@ af af af af -as +aZ aD aD aE @@ -2296,7 +2214,7 @@ cH cb cV aE -as +aZ aa aa aa @@ -2313,7 +2231,7 @@ ag ag ag ag -as +aZ aE aK aU @@ -2328,7 +2246,7 @@ cI cQ cW dh -as +aZ aa aa aa @@ -2353,7 +2271,7 @@ aV av bz bz -aa +bz bz bz av diff --git a/maps/tether/engines/tesla.dmm b/maps/tether/engines/tesla.dmm index fc4236fdec..937505d3fb 100644 --- a/maps/tether/engines/tesla.dmm +++ b/maps/tether/engines/tesla.dmm @@ -15,10 +15,10 @@ /turf/space, /area/space) "ae" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) "af" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "ag" = ( /obj/machinery/atmospherics/portables_connector{ @@ -116,7 +116,7 @@ /area/space) "at" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_north_airlock"; name = "exterior access button"; @@ -171,7 +171,7 @@ /area/engineering/engine_room) "aw" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_north_airlock"; name = "interior access button"; @@ -225,11 +225,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor, /area/engineering/engine_gas) "az" = ( @@ -278,7 +274,7 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "aD" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -407,11 +403,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "aO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -523,25 +515,6 @@ }, /turf/simulated/floor/airless, /area/space) -"aY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/turf/simulated/floor, -/area/submap/pa_room) "aZ" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -576,20 +549,15 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "bd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; + id = "SupermatterPort"; + name = "Reactor Blast Door"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "be" = ( @@ -610,10 +578,10 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/submap/pa_room) "bi" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/submap/pa_room) "bj" = ( /obj/structure/cable/cyan{ @@ -656,24 +624,8 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "bm" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) -"bn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/submap/pa_room) "bo" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 5 @@ -708,11 +660,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -778,12 +726,10 @@ /turf/simulated/floor/tiled, /area/submap/pa_room) "bC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bD" = ( @@ -808,22 +754,18 @@ /turf/simulated/floor/airless, /area/space) "bF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; + id = "SupermatterPort"; + name = "Reactor Blast Door"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bG" = ( @@ -869,9 +811,6 @@ /turf/simulated/floor/tiled, /area/submap/pa_room) "bL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -881,6 +820,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bM" = ( @@ -936,9 +876,6 @@ /turf/template_noop, /area/template_noop) "bP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -946,9 +883,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bQ" = ( @@ -1160,20 +1095,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_room) -"cm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor, -/area/submap/pa_room) "cn" = ( /obj/structure/cable/cyan{ icon_state = "2-4" @@ -1239,7 +1160,7 @@ /area/space) "ct" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_south_airlock"; name = "exterior access button"; @@ -1293,7 +1214,7 @@ icon_state = "4-8" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_south_airlock"; name = "interior access button"; @@ -1374,23 +1295,18 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room) "cC" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/space) "cE" = ( /obj/machinery/door/blast/regular{ density = 0; - dir = 2; + dir = 4; icon_state = "pdoor0"; id = "SupermatterPort"; name = "Reactor Blast Door"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/engineering/engine_room) "cF" = ( @@ -1560,7 +1476,7 @@ ab ab ab ab -ad +ac ab aa "} @@ -1592,7 +1508,7 @@ ab ab ab ad -ad +ac ab aa "} @@ -1963,12 +1879,12 @@ aB ab ab ab -aY -bn -bn +bd +bd +bd bF -bn -bn +bd +bd bd ab ab @@ -2001,7 +1917,7 @@ bw bQ bW bX -cm +bP ab ab ab @@ -2033,7 +1949,7 @@ bx bG bR ca -cm +bP ab ab ab diff --git a/maps/tether/levels/midpoint.dmm b/maps/tether/levels/midpoint.dmm index 405d046691..3e10839ea8 100644 --- a/maps/tether/levels/midpoint.dmm +++ b/maps/tether/levels/midpoint.dmm @@ -15,11 +15,32 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"ak" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "aP" = ( /obj/effect/blocker, /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b, /area/tether/transit) +"aS" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "bq" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -27,6 +48,9 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"bS" = ( +/turf/simulated/open, +/area/tether/elevator) "bU" = ( /obj/structure/cable{ icon_state = "2-8" @@ -58,6 +82,49 @@ }, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"dz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/green/bordercorner, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"eB" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"gm" = ( +/turf/simulated/open, +/area/tether/elevator/two) +"gH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "gQ" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -65,81 +132,96 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"hh" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ +"hi" = ( +/turf/simulated/wall/prepainted, +/area/maintenance/tether_midpoint) +"il" = ( +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"in" = ( +/obj/machinery/air_alarm{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced{ +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/tether/midpoint) -"hi" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/tether_midpoint) -"ht" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +"iR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/tether/midpoint) -"il" = ( -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/maintenance/tether_midpoint) -"ir" = ( -/turf/simulated/sky/virgo3b, -/area/tether/transit) "jC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"ku" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) "kY" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) "lq" = ( /turf/simulated/floor/wood, /area/tether/midpoint) -"lw" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/midpoint) +"mr" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/blocker, +/turf/simulated/sky/virgo3b, +/area/tether/transit) "mP" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/midpoint) -"ns" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) -"nz" = ( -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) "nM" = ( /obj/structure/table/gamblingtable, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -176,6 +258,12 @@ /obj/machinery/vending/boozeomat, /turf/simulated/floor/wood, /area/tether/midpoint) +"oZ" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/blocker, +/turf/simulated/sky/virgo3b, +/area/tether/transit) "pc" = ( /obj/structure/table/gamblingtable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -184,10 +272,26 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "qm" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) +"qp" = ( +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) +"rh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) "sg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -204,11 +308,8 @@ /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) "sx" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -236,11 +337,17 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"vf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "1-2" +"tk" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/turf/simulated/sky/virgo3b, +/area/tether/transit) +"uz" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -271,37 +378,42 @@ /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b, /area/tether/transit) -"yj" = ( -/obj/machinery/holoposter{ - pixel_y = -30 +"yx" = ( +/obj/machinery/light{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "yF" = ( -/obj/machinery/air_alarm{ - pixel_y = 26 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "zk" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/computer/timeclock/premade/east, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "zm" = ( /obj/machinery/light/small{ @@ -335,6 +447,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/tether_midpoint) +"AL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "AM" = ( /obj/structure/table/woodentable, /obj/machinery/camera/network/civilian{ @@ -356,6 +480,28 @@ /obj/structure/disposalpipe/up, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"Ch" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"CE" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "CI" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -383,18 +529,10 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "DG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) -"DO" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "Ea" = ( /obj/structure/table/woodentable, @@ -430,19 +568,49 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"Hx" = ( +"Hl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Hu" = ( +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Hx" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "Id" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -453,15 +621,34 @@ /obj/machinery/disposal, /turf/simulated/floor/wood, /area/tether/midpoint) +"Ix" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "IR" = ( /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/tether/midpoint) +"Jc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) "Ji" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "Jt" = ( /obj/machinery/light{ @@ -469,11 +656,7 @@ }, /obj/structure/flora/pottedplant/unusual, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/wood, /area/tether/midpoint) "Ke" = ( @@ -482,6 +665,15 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Kf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Kk" = ( /obj/structure/table/gamblingtable, /obj/item/reagent_containers/food/drinks/shaker, @@ -493,6 +685,23 @@ /obj/random/plushie, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"LU" = ( +/obj/machinery/holoposter{ + pixel_y = -30 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "NI" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/catering/bar_soft{ @@ -513,28 +722,15 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"Ov" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +"PV" = ( /obj/machinery/light{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) -"PV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -556,17 +752,99 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "Rd" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Rk" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"So" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Sy" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"SE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) -"TB" = ( -/turf/simulated/wall/r_wall, +"SY" = ( +/obj/machinery/fire_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/tether/midpoint) "TY" = ( /obj/structure/disposalpipe/segment{ @@ -577,16 +855,42 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"UI" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Vk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"VH" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "VM" = ( /obj/machinery/light, /turf/simulated/floor/wood, /area/tether/midpoint) +"Wh" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Wz" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/catering/bar_alc{ @@ -594,6 +898,28 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Xf" = ( +/turf/simulated/wall/prepainted, +/area/tether/transit) +"XL" = ( +/obj/structure/aquarium/prefilled, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) +"XM" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) +"XU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "XZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -603,6 +929,29 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/tether_midpoint) +"Ya" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Yc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -620,12 +969,46 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"YH" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"YS" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/computer/timeclock/premade/east, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"YT" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "YW" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Zf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Zy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -647,7 +1030,18 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "ZM" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, +/area/tether/midpoint) +"ZQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner, +/turf/simulated/floor/tiled/dark, /area/tether/midpoint) (1,1,1) = {" @@ -23218,10 +23612,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm il hi @@ -23412,10 +23806,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm vA hi @@ -23606,10 +24000,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm vA hi @@ -23800,10 +24194,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm LL hi @@ -24184,18 +24578,18 @@ yi yi yi yi -yi -TB +Xf +ZM yF -Ov -vf -vf -vf +PV +Id +Id +Id Id PV -yj -TB -yi +Kf +ZM +Xf yi yi yi @@ -24378,18 +24772,18 @@ yi yi yi yi -TB -TB +mP +UI Rd Ji -ns -nz -nz +zk +zk +zk zk DG Hx -TB -TB +Kf +mP yi yi yi @@ -24572,18 +24966,18 @@ yi yi yi yi -ht -CN -Og -bY -ZM -Ke -PZ -ZM -Vk -bU -Jt -ht +mP +uz +rh +Jc +XL +XL +XL +XL +ku +qp +YT +mP yi yi yi @@ -24766,18 +25160,18 @@ yi yi yi yi -ht -YW -Og -sR -ZM -ZM -ZM -ZM -ZA -lq -YW -ht +mP +uz +rh +qp +qp +qp +qp +qp +qp +qp +YT +mP yi yi yi @@ -24960,18 +25354,18 @@ yi yi yi yi -ht -Ea -Og -bY -AV -sQ -sQ -ad -Vk -lq -AM -ht +ZM +ak +dz +Wh +Wh +Wh +Wh +AL +Wh +YH +YT +ZM yi yi yi @@ -25154,18 +25548,18 @@ yi yi yi yi -ht -As -Og -bY -IR -IR -IR -IR -Vk -lq -As -ht +mP +uz +Hu +XM +XM +CE +CE +XM +XM +yx +YT +mP yi yi yi @@ -25349,16 +25743,16 @@ yi yi yi mP -ZL -Og -jC -aj -lq -lq -sM -oe -lq -ZL +uz +Sy +XM +gm +gm +gm +gm +XM +uz +YT mP yi yi @@ -25543,16 +25937,16 @@ yi yi yi mP -YW -Og -IR -He -IR -IR -NS -IR -lq -YW +uz +Sy +XM +gm +gm +gm +gm +XM +uz +YT mP yi yi @@ -25736,18 +26130,18 @@ yi yi yi yi -mP -sQ -Og -QN -pc -Kk -QN -nM -QN -lq -sQ -mP +ZM +eB +Sy +XM +gm +gm +gm +gm +XM +uz +VH +ZM yi yi yi @@ -25931,16 +26325,16 @@ yi yi yi mP -As -bq -vu -gQ -lq -lq -lq -QG -lq -As +Zf +Ya +XM +gm +gm +gm +gm +XM +ZQ +aS mP yi yi @@ -26124,18 +26518,18 @@ yi yi yi yi -lw -hh -hh -TB -TY -lq -lq -VM -TB -hh -hh -DO +ZM +ZM +iR +XM +XM +XM +XM +XM +XM +Rk +ZM +ZM yi yi yi @@ -26318,18 +26712,18 @@ yi yi yi yi -yi -yi -yi -mP -Io -Wz -NI -oo -mP -yi -yi -yi +ZM +ZM +in +Ch +gH +gH +gH +gH +SE +LU +ZM +ZM yi yi yi @@ -26512,18 +26906,18 @@ yi yi yi yi -yi -yi -yi -lw -hh -hh -hh -hh -DO -yi -yi -yi +ZM +ZM +SY +Ix +XU +Wh +Wh +YS +Hl +So +ZM +ZM yi yi yi @@ -26706,18 +27100,18 @@ yi yi yi yi -yi -yi -yi -ir -ir -ir -ir -ir -ir -yi -yi -yi +mP +CN +Og +bY +ZM +Ke +PZ +ZM +Vk +bU +Jt +mP yi yi yi @@ -26900,18 +27294,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +YW +Og +sR +ZM +ZM +ZM +ZM +ZA +lq +YW +mP yi yi yi @@ -27094,18 +27488,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +Ea +Og +bY +AV +sQ +sQ +ad +Vk +lq +AM +mP yi yi yi @@ -27288,18 +27682,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +As +Og +bY +IR +IR +IR +IR +Vk +lq +As +mP yi yi yi @@ -27482,18 +27876,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +ZL +Og +jC +aj +lq +lq +sM +oe +lq +ZL +mP yi yi yi @@ -27676,18 +28070,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +YW +Og +IR +He +IR +IR +NS +IR +lq +YW +mP yi yi yi @@ -27860,34 +28254,34 @@ yi yi yi aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +mP +sQ +Og +QN +pc +Kk +QN +nM +QN +lq +sQ +mP +yi +yi +yi +yi +yi +yi aP yi yi @@ -28053,6 +28447,7 @@ yi yi yi yi +mr yi yi yi @@ -28063,26 +28458,25 @@ yi yi yi yi +mP +As +bq +vu +gQ +lq +lq +lq +QG +lq +As +mP yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28247,6 +28641,7 @@ yi yi yi yi +mr yi yi yi @@ -28257,26 +28652,25 @@ yi yi yi yi +mP +mP +mP +ZM +TY +lq +lq +VM +ZM +mP +mP +mP yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28441,6 +28835,7 @@ yi yi yi yi +mr yi yi yi @@ -28454,6 +28849,12 @@ yi yi yi yi +mP +Io +Wz +NI +oo +mP yi yi yi @@ -28463,14 +28864,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28635,6 +29029,7 @@ yi yi yi yi +mr yi yi yi @@ -28648,6 +29043,12 @@ yi yi yi yi +mP +mP +mP +mP +mP +mP yi yi yi @@ -28657,14 +29058,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28829,6 +29223,7 @@ yi yi yi yi +mr yi yi yi @@ -28838,6 +29233,7 @@ yi yi yi yi +tk yi yi yi @@ -28856,9 +29252,7 @@ yi yi yi yi -yi -yi -yi +mr yi yi yi @@ -29023,6 +29417,7 @@ yi yi yi yi +mr yi yi yi @@ -29032,6 +29427,7 @@ yi yi yi yi +tk yi yi yi @@ -29050,9 +29446,7 @@ yi yi yi yi -yi -yi -yi +mr yi yi yi @@ -29217,6 +29611,7 @@ yi yi yi yi +mr yi yi yi @@ -29226,6 +29621,7 @@ yi yi yi yi +tk yi yi yi @@ -29244,9 +29640,7 @@ yi yi yi yi -yi -yi -yi +mr yi yi yi @@ -29411,6 +29805,7 @@ yi yi yi yi +mr yi yi yi @@ -29420,6 +29815,7 @@ yi yi yi yi +tk yi yi yi @@ -29438,9 +29834,7 @@ yi yi yi yi -yi -yi -yi +mr yi yi yi @@ -29570,62 +29964,32 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd yi yi yi @@ -29635,6 +29999,36 @@ yi yi yi yi +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +oZ +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr yi yi yi @@ -29809,19 +30203,19 @@ yi yi yi yi +tk +tk +tk +tk yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi +tk +tk +tk yi yi yi @@ -30003,19 +30397,19 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -30781,23 +31175,23 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -xd -xd -xd -xd -yi -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -30986,10 +31380,10 @@ yi yi yi yi -xd -xd -xd -xd +yi +yi +yi +yi yi yi yi @@ -31163,7 +31557,20 @@ xd xd xd xd -xd +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +tk +yi yi yi yi @@ -31171,19 +31578,6 @@ yi yi yi yi -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd yi yi yi @@ -31357,27 +31751,6 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd yi yi yi @@ -31390,6 +31763,27 @@ yi yi yi yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi yi yi yi @@ -31551,29 +31945,29 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -31745,27 +32139,27 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi yi yi yi @@ -31939,30 +32333,30 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi xd xd xd @@ -32133,30 +32527,30 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi xd xd xd diff --git a/maps/tether/levels/mining.dmm b/maps/tether/levels/mining.dmm index 1e84a5724b..93b16abbdd 100644 --- a/maps/tether/levels/mining.dmm +++ b/maps/tether/levels/mining.dmm @@ -3,9 +3,6 @@ /obj/effect/floor_decal/rust/steel_decals_rusted1, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored) -"aA" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/outpost/mining_main/passage) "aS" = ( /turf/simulated/mineral/virgo3b, /area/mine/explored) @@ -28,18 +25,12 @@ "bo" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/outpost/mining_main/secondary_gear_storage) -"bz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "bC" = ( -/obj/machinery/door/airlock/glass/mining, +/obj/spawner/window/low_wall/borosillicate/full, /obj/machinery/door/firedoor/glass{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/outpost/mining_main/secondary_gear_storage) "bE" = ( /obj/machinery/door/firedoor/glass{ @@ -94,10 +85,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/outpost/mining_main/airlock) "dl" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -210,7 +198,9 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "fA" = ( -/obj/machinery/mining/drill, +/obj/machinery/mining/drill{ + drill_id = 2 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) "gG" = ( @@ -408,12 +398,6 @@ /obj/structure/table/woodentable, /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) -"jk" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "jz" = ( /obj/structure/railing, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -570,20 +554,12 @@ /obj/spawner/window/low_wall/borosillicate/full, /turf/simulated/floor/plating, /area/outpost/mining_main/airlock) -"nP" = ( -/obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/borosillicate/full, -/turf/simulated/floor/plating, -/area/outpost/mining_main/secondary_gear_storage) "nR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "nS" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/camera/network/mining{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, @@ -594,12 +570,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/airlock) -"oF" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "oN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -808,11 +778,7 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "tE" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -835,6 +801,9 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/light, +/obj/machinery/camera/network/mining{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "uP" = ( @@ -906,12 +875,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) -"wP" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "wV" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1044,7 +1007,7 @@ /area/outpost/mining_main/secondary_gear_storage) "zb" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "mining_outpost_airlock"; name = "Mining Outpost Access Button"; @@ -1188,6 +1151,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, +/obj/item/multitool, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) "Df" = ( @@ -1197,11 +1161,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light_switch{ dir = 1; pixel_x = 12; @@ -1349,11 +1309,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1390,27 +1346,21 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) -"IK" = ( -/obj/machinery/hyperpad/centre{ - map_pad_id = "lavaland_station"; - map_pad_link_id = "lavaland_away"; - newcolor = "#fcba03" - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "IS" = ( /obj/machinery/telecomms/relay/preset/mining, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) -"Jc" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "Jz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/camera/network/mining{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "JW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -1450,10 +1400,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -1511,26 +1458,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) -"La" = ( -/obj/machinery/camera/network/mining{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/secondary_gear_storage) "Lm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/outpost/mining_main/dorms) "LA" = ( @@ -1554,11 +1486,7 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "MT" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1601,7 +1529,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "mining_outpost_airlock"; name = "Mining Outpost Access Button"; @@ -1645,20 +1573,11 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) -"Rh" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "RF" = ( /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) @@ -1694,11 +1613,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/mine/explored) "SM" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light_switch{ dir = 1; pixel_x = 12; @@ -1738,10 +1653,7 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "SR" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light_switch{ dir = 1; pixel_x = 10; @@ -1786,7 +1698,9 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/machinery/mining/drill, +/obj/machinery/mining/drill{ + drill_id = 1 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) "Ud" = ( @@ -1807,8 +1721,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1904,10 +1817,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "Wc" = ( @@ -1934,12 +1844,6 @@ }, /turf/simulated/floor/bluegrid, /area/outpost/mining_main/airlock) -"WA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "WD" = ( /obj/structure/railing{ dir = 4 @@ -2037,6 +1941,7 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/secondary_gear_storage) "ZF" = ( +/obj/effect/step_trigger/teleporter/from_mining, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/passage) "ZO" = ( @@ -13297,10 +13202,10 @@ xE jJ jJ jJ -YL -YL -YL -bo +OH +OH +OH +OH OH OH OH @@ -13491,10 +13396,10 @@ Xe zi Vg vw -Jz -WA -Rh -nP +OH +OH +OH +OH OH OH OH @@ -13685,10 +13590,10 @@ rG rn pW vw -bz -IK -Jc -nP +OH +OH +OH +OH OH HX KJ @@ -13879,10 +13784,10 @@ rG rn AF vw -oF -jk -wP -nP +OH +OH +OH +OH OH HX iT @@ -14073,9 +13978,9 @@ rG rn LA vw -OQ bC -OQ +bC +bC bo bo HX @@ -14268,9 +14173,9 @@ Qe hF vw Dv -Ud -La df +df +Jz bm FZ Wb @@ -26699,9 +26604,9 @@ mk OH OH OH -aA -aA -aA +us +us +us ZF "} (128,1,1) = {" @@ -26893,10 +26798,10 @@ OH OH mk OH -aA -aA -aA us +us +us +ZF "} (129,1,1) = {" Se @@ -27087,10 +26992,10 @@ mk OH OH mk -aA -aA -aA us +us +us +ZF "} (130,1,1) = {" Se @@ -27281,10 +27186,10 @@ OH OH OH mk -aA -aA -aA us +us +us +ZF "} (131,1,1) = {" Se @@ -27475,10 +27380,10 @@ mk OH OH OH -aA -aA -aA us +us +us +ZF "} (132,1,1) = {" Se @@ -27669,10 +27574,10 @@ OH OH OH mk -aA -aA -aA us +us +us +ZF "} (133,1,1) = {" Se @@ -27863,10 +27768,10 @@ OH OH OH OH -aA -aA -aA us +us +us +ZF "} (134,1,1) = {" Se @@ -28057,10 +27962,10 @@ mk OH OH mk -aA -aA -aA us +us +us +ZF "} (135,1,1) = {" Se @@ -28251,10 +28156,10 @@ OH OH OH OH -aA -aA -aA us +us +us +ZF "} (136,1,1) = {" Se @@ -28445,10 +28350,10 @@ OH OH OH OH -aA -aA -aA us +us +us +ZF "} (137,1,1) = {" Se diff --git a/maps/tether/levels/misc.dmm b/maps/tether/levels/misc.dmm index a660ce24a9..2a9ac6e0ce 100644 --- a/maps/tether/levels/misc.dmm +++ b/maps/tether/levels/misc.dmm @@ -4,7 +4,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "ag" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/bottle/biomass{ @@ -29,7 +29,7 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "ah" = ( /turf/space/transit/south, /area/space) @@ -41,28 +41,37 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) +"am" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "at" = ( /obj/machinery/light, /obj/structure/bed/chair/wood/wings{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "aw" = ( /obj/structure/bed/chair/holochair{ dir = 1 }, /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"aA" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm4) "aB" = ( /obj/machinery/door/window/holowindoor{ dir = 8; name = "Red Team" }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_emptycourt) "aF" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -82,14 +91,14 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "aH" = ( /obj/structure/sign/warning/nosmoking_2, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/terminal) "aM" = ( /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm5) "aN" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -98,7 +107,7 @@ name = "Green Team" }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_emptycourt) "aT" = ( /obj/machinery/camera/network/crescent{ dir = 1 @@ -107,7 +116,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "aY" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -116,11 +125,30 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "bc" = ( /obj/machinery/ntnet_relay, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) +"bl" = ( +/turf/simulated/floor/holofloor/desert, +/area/holodeck/source_picnicarea) +"bn" = ( +/obj/item/clothing/glasses/sunglasses, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) +"bq" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"bv" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "bw" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -132,14 +160,14 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "bz" = ( /turf/space/basic, /area/space) "bB" = ( /obj/structure/sign/warning/docking_area, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/terminal) "bC" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/space/transit/east, @@ -148,25 +176,25 @@ /obj/structure/table/standard, /obj/item/material/ashtray/plastic, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) "bJ" = ( /obj/machinery/door/airlock{ name = "Unit 2" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "bO" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "bV" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/tele_pad, /turf/simulated/shuttle/floor/voidcraft, -/area/space) +/area/unknown/dorm5) "bW" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -178,22 +206,22 @@ pixel_y = 30 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "bY" = ( /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "cb" = ( /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "cf" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "ch" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloorblack{ @@ -204,7 +232,7 @@ }, /obj/item/material/ashtray/plastic, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "ck" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ @@ -214,17 +242,23 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"cm" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "cq" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "cu" = ( /obj/item/inflatable_duck, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/source_beach) "cB" = ( /obj/effect/transit/light{ dir = 4 @@ -243,7 +277,7 @@ "cK" = ( /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "cN" = ( /obj/machinery/transhuman/resleever, /obj/effect/floor_decal/borderfloorwhite{ @@ -253,7 +287,7 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "cS" = ( /obj/structure/bed/chair{ dir = 8 @@ -262,16 +296,19 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) +"cX" = ( +/turf/simulated/floor/tiled/steel, +/area/shuttle/large_escape_pod2/centcom) "cY" = ( /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) "dg" = ( /obj/machinery/computer/card{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "dj" = ( /obj/effect/floor_decal/transit/orange{ dir = 4 @@ -287,12 +324,16 @@ /turf/space, /turf/space/internal_edge/bottomright, /area/space) +"dm" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "dn" = ( /obj/machinery/vending/sovietsoda{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "ds" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -312,60 +353,70 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "dx" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "dI" = ( /obj/machinery/vending/cigarette{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "dU" = ( /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "dX" = ( /obj/structure/table/marble, /obj/item/storage/box/donut, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) +"dY" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "dZ" = ( /obj/structure/closet/crate/bin, /obj/machinery/camera/network/crescent, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "ed" = ( /obj/structure/flora/pottedplant/smalltree, /obj/machinery/camera/network/crescent{ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "ee" = ( /obj/effect/floor_decal/industrial/warning/dust/corner, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "eg" = ( /obj/effect/overlay/coconut, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"ei" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "en" = ( /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "et" = ( /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "eu" = ( /obj/structure/window/reinforced/holowindow{ dir = 1 }, /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "ev" = ( /obj/structure/bed/chair/shuttle, /obj/effect/floor_decal/borderfloorblack{ @@ -375,11 +426,20 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"ey" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) +"eA" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "eB" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) "eF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -390,7 +450,19 @@ /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/meatballspagetti, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"eL" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "eM" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 8 @@ -406,24 +478,30 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "eT" = ( /obj/effect/overlay/palmtree_l, /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/source_beach) "eY" = ( /obj/structure/sign/department/operational, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/medical) "fa" = ( /obj/machinery/tele_projector, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm4) +"fj" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "fk" = ( /obj/item/chess/bbishop, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "fn" = ( /obj/effect/transit/light{ dir = 4 @@ -443,17 +521,17 @@ /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/head/pin/flower, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_theatre) "fu" = ( /obj/structure/prop/alien/power, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm2) "fx" = ( /obj/effect/floor_decal/corner/green/full{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "fy" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -464,12 +542,12 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "fA" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/small/sugar, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "fF" = ( /obj/structure/table/reinforced, /obj/item/melee/baton/loaded, @@ -477,7 +555,7 @@ /obj/item/gun/energy/taser, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "fG" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-22" @@ -486,18 +564,18 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "fJ" = ( /obj/structure/bed/chair, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) "fK" = ( /obj/structure/table/glass, /obj/machinery/chemical_dispenser/ert, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "fL" = ( /obj/structure/closet/walllocker, /obj/effect/floor_decal/borderfloorblack{ @@ -507,7 +585,11 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"fN" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_courtroom) "fO" = ( /obj/structure/window/reinforced/holowindow/disappearing{ dir = 1 @@ -516,13 +598,17 @@ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "fW" = ( /obj/effect/floor_decal/carpet{ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"fX" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "fY" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -532,7 +618,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) "fZ" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 4 @@ -547,7 +633,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "ga" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -558,12 +644,12 @@ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "gc" = ( /obj/structure/table/standard, /obj/item/stack/nanopaste, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "gj" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -574,7 +660,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "gk" = ( /obj/effect/step_trigger/lost_in_space/tram, /obj/effect/floor_decal/transit/orange{ @@ -605,47 +691,50 @@ /obj/item/towel/random, /obj/item/towel/random, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm5) "gq" = ( /obj/effect/floor_decal/corner/green/full{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"gv" = ( +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) +"gx" = ( +/turf/unsimulated/floor/steel, +/area/centcom/control) "gy" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "gz" = ( /obj/machinery/computer/operating{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "gA" = ( /obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm1) "gC" = ( /obj/machinery/computer/crew{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "gM" = ( -/obj/machinery/fitness/heavy/lifter{ - dir = 1 - }, -/obj/machinery/fitness/punching_bag/clown{ - dir = 4; - layer = 3.4 - }, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/bathroom) "gP" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -654,13 +743,13 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "gQ" = ( /obj/item/perfect_tele_beacon{ tele_name = "Transfer" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "gR" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -692,7 +781,7 @@ name = "Shuttle Hatch" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "gY" = ( /obj/structure/table/steel, /obj/item/surgical/scalpel, @@ -700,14 +789,14 @@ /obj/item/surgical/cautery, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "gZ" = ( /obj/effect/floor_decal/rust/part_rusted3, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "ha" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -720,7 +809,7 @@ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "hb" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 8 @@ -729,12 +818,12 @@ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "hh" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "hi" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -742,19 +831,22 @@ icon_state = "right" }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_courtroom) "hk" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) +"hl" = ( +/turf/simulated/floor/tiled, +/area/shuttle/escape) "hp" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/steel_grid, -/area/space) +/area/centcom/simulated/terminal) "hr" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -764,36 +856,56 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "hs" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "hu" = ( /turf/simulated/floor/outdoors/beach/sand/desert, /area/space) +"hy" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hz" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "hG" = ( /obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "hI" = ( /obj/effect/floor_decal/corner/red/full{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"hJ" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) "hK" = ( /obj/structure/prop/alien/dispenser, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm2) "hL" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 }, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm5) +"hU" = ( +/obj/item/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "ic" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -805,10 +917,10 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "ie" = ( /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "ig" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/hotdog, @@ -817,7 +929,7 @@ pixel_y = -3 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "in" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -826,7 +938,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "iq" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -838,24 +950,24 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "iv" = ( /turf/unsimulated/floor{ icon_state = "dark" }, -/area/space) +/area/centcom/suppy) "ix" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/large_escape_pod2/centcom) "iA" = ( /obj/structure/signpost, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "iB" = ( /obj/structure/bed/chair/comfy/black, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm4) "iI" = ( /obj/structure/window/reinforced{ dir = 8 @@ -865,20 +977,32 @@ "iJ" = ( /obj/machinery/light, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"iL" = ( +/obj/structure/sign/warning{ + name = "\improper STAND AWAY FROM TRACK EDGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"iN" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_courtroom) "iO" = ( /obj/effect/floor_decal/rust/mono_rusted3, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "iT" = ( /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/holodorm/source_beach) +"iY" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm2) "ja" = ( /obj/structure/bed/double/padded, /obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm6) "jo" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -887,7 +1011,7 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "jr" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -898,7 +1022,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet/medical, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "jt" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -908,7 +1032,13 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) +"jv" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "jz" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -921,34 +1051,68 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "jA" = ( /obj/machinery/door/window/brigdoor/southright{ name = "holding cell" }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) +"jD" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"jH" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm1) +"jI" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "jJ" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"jK" = ( +/obj/effect/wingrille_spawn/reinforced/crescent, +/turf/simulated/floor/plating, +/area/centcom/simulated/restaurant) +"jM" = ( +/obj/machinery/door/window/holowindoor{ + dir = 8; + name = "Red Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) "jN" = ( /obj/item/chess/bknight, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"jO" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"jQ" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_meetinghall) "jX" = ( /obj/structure/sign/hangar/two{ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "jY" = ( /obj/structure/toilet, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm3) "kb" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 @@ -957,13 +1121,13 @@ pixel_y = -32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "kc" = ( /obj/machinery/door/airlock/security{ name = "Tram Security" }, /turf/simulated/floor/tiled/red, -/area/space) +/area/shuttle/escape) "kg" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -979,7 +1143,7 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "kn" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -988,31 +1152,43 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "kp" = ( /turf/simulated/floor/holofloor/lino, -/area/space) +/area/holodeck/source_meetinghall) "kq" = ( /turf/unsimulated/beach/coastline, -/area/space) +/area/beach) "ku" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"kz" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"kB" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) "kI" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, /obj/machinery/light, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "kJ" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "kL" = ( /obj/item/paper{ info = "You're not supposed to be here."; @@ -1021,7 +1197,7 @@ /turf/unsimulated/floor{ icon_state = "dark" }, -/area/space) +/area/centcom/suppy) "kS" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -1030,17 +1206,20 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"kT" = ( +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm5) "lc" = ( /obj/structure/closet/alien, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm1) "ld" = ( /obj/machinery/vending/snack{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "lh" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -1049,16 +1228,44 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) +"lk" = ( +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"ll" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "lr" = ( /obj/item/chess/wbishop, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "lv" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/pastatomato, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "lw" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -1067,27 +1274,38 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "ly" = ( /obj/effect/floor_decal/sign/dock/three, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "lC" = ( /turf/unsimulated/floor{ icon_state = "sandwater" }, -/area/space) +/area/beach) "lI" = ( -/obj/machinery/fitness/heavy/lifter{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/space) +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) +"lN" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/holofloor/desert, +/area/holodeck/holodorm/source_desert) "lP" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) +"lR" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "lS" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 @@ -1100,7 +1318,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "lV" = ( /obj/machinery/light{ dir = 1 @@ -1113,16 +1331,20 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "lX" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/source_picnicarea) +"lY" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "lZ" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/meatsteak, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "md" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-22" @@ -1131,13 +1353,25 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "mn" = ( /obj/landmark{ name = "Holocarp Spawn" }, /turf/simulated/floor/holofloor/reinforced, -/area/space) +/area/holodeck/source_wildlife) +"mp" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"mq" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "mr" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -1146,7 +1380,7 @@ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "mt" = ( /obj/effect/shuttle_landmark{ base_area = /area/centcom/simulated/evac; @@ -1155,16 +1389,21 @@ name = "Centcom Recovery Area" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "my" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) +"mG" = ( +/obj/machinery/door/window/holowindoor{ + name = "Entrance 1" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "mH" = ( -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/medical) "mJ" = ( /turf/space, /turf/space/internal_edge/bottomleft, @@ -1174,13 +1413,13 @@ tele_name = "Unknown" }, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm6) "mL" = ( /obj/machinery/light{ dir = 8 }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) "mM" = ( /obj/machinery/status_display{ pixel_y = -30 @@ -1193,7 +1432,7 @@ }, /obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "mO" = ( /turf/space/transit/west, /area/space) @@ -1202,17 +1441,27 @@ initial_flooring = null }, /area/space) +"mS" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "mT" = ( /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "mU" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/source_picnicarea) "mV" = ( /obj/item/chess/wpawn, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"mW" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) "mZ" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1226,7 +1475,7 @@ /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/kitsuneudon, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "ng" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1235,58 +1484,79 @@ /turf/simulated/floor/holofloor/carpet{ dir = 8 }, -/area/space) +/area/holodeck/source_meetinghall) "nm" = ( /obj/machinery/camera/network/crescent{ dir = 8 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "nq" = ( /obj/structure/shuttle/engine/propulsion, /turf/space, /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/space) +/area/shuttle/supply) +"nr" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "ns" = ( /obj/landmark{ name = "endgame_exit" }, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "nv" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "nx" = ( /obj/machinery/vending/cola{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"ny" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/living) "nz" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_boxingcourt) "nC" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"nD" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) "nG" = ( /obj/structure/bed/chair, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"nM" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "nO" = ( /obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "nQ" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ @@ -1296,7 +1566,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "nU" = ( /obj/structure/sink{ dir = 4; @@ -1307,23 +1577,27 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) +"nX" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) "nZ" = ( /obj/machinery/camera/network/crescent{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "ob" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_theatre) "oc" = ( /obj/machinery/door/blast/regular, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "oh" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1332,7 +1606,11 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) +"oi" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "oj" = ( /obj/structure/sink{ dir = 4; @@ -1343,7 +1621,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "on" = ( /obj/structure/holohoop{ dir = 1 @@ -1352,7 +1630,14 @@ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"oo" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "oA" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1368,7 +1653,10 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"oG" = ( +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) "oI" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -1381,7 +1669,10 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"oK" = ( +/turf/unsimulated/wall, +/area/beach) "oL" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 @@ -1390,7 +1681,7 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "oN" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 4 @@ -1404,7 +1695,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "oP" = ( /obj/structure/closet/walllocker, /obj/effect/floor_decal/borderfloorblack{ @@ -1414,13 +1705,22 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "oQ" = ( /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "oR" = ( /turf/space/transit/north, /area/space) +"pa" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) "pb" = ( /obj/effect/step_trigger/teleporter/random, /turf/space, @@ -1448,7 +1748,7 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "pj" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -1457,12 +1757,16 @@ initial_flooring = null }, /area/space) +"pl" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "po" = ( /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "pt" = ( /obj/effect/step_trigger/lost_in_space/tram, /turf/simulated/floor/tiled/techfloor/grid{ @@ -1472,21 +1776,24 @@ "pw" = ( /obj/machinery/telecomms/allinone, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) +"py" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "pD" = ( /obj/machinery/door/airlock/medical{ name = "Tram Medical" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "pF" = ( /obj/item/chess/bqueen, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "pG" = ( /obj/machinery/telecomms/server/presets/centcomm, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "pI" = ( /obj/effect/floor_decal/carpet{ dir = 5 @@ -1501,19 +1808,30 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) +"pN" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/medical) +"pO" = ( +/obj/effect/floor_decal/rust/part_rusted3, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/large_escape_pod2/centcom) "pP" = ( /obj/structure/table/standard, /obj/item/reagent_containers/food/snacks/bagged/chips, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "pQ" = ( /obj/machinery/chemical_dispenser/catering/bar_coffee{ dir = 8 }, /obj/structure/table/marble, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "pS" = ( /obj/machinery/computer/rdservercontrol{ badmin = 1; @@ -1521,13 +1839,13 @@ name = "Master R&D Server Controller" }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "pV" = ( /obj/landmark{ name = "Holocarp Spawn Random" }, /turf/simulated/floor/holofloor/space, -/area/space) +/area/holodeck/source_space) "pX" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/catering/bar_soft, @@ -1535,13 +1853,13 @@ dir = 1 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "qb" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "qc" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -1553,7 +1871,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "qd" = ( /obj/structure/table/glass{ desc = "It's a table, it has some scracthes..they say 'Mlem'." @@ -1565,20 +1883,23 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "qf" = ( /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "qh" = ( /obj/machinery/light, /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "qk" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) +"qm" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_seating) "qn" = ( /obj/effect/floor_decal/carpet{ dir = 1 @@ -1590,18 +1911,21 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) +"qo" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "qs" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "qy" = ( /obj/item/beach_ball/holoball, /obj/effect/floor_decal/corner/red{ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "qC" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1617,14 +1941,23 @@ name = "Shuttle Hatch" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"qD" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "qE" = ( /obj/machinery/oxygen_pump/anesthetic, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/medical) "qF" = ( /turf/unsimulated/beach/water, -/area/space) +/area/beach) +"qG" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "qI" = ( /obj/structure/table/glass, /obj/item/storage/firstaid/adv, @@ -1638,7 +1971,10 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"qK" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) "qQ" = ( /turf/space, /area/space) @@ -1649,7 +1985,7 @@ }, /obj/item/chess/bknight, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "qX" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -1663,7 +1999,7 @@ id = "QMLoad2" }, /turf/simulated/shuttle/plating, -/area/space) +/area/shuttle/supply) "qZ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -1672,42 +2008,56 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"ra" = ( +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "rb" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ pixel_y = 5 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) +"rc" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "ri" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) +"rk" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_picnicarea) "ro" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "rp" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/flask/barflask, /obj/item/reagent_containers/glass/rag, /obj/item/reagent_containers/food/drinks/flask/vacuumflask, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "rt" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/toastedsandwich{ pixel_y = 10 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "ry" = ( /obj/effect/floor_decal/transit/orange{ dir = 4 @@ -1716,19 +2066,26 @@ initial_flooring = null }, /area/space) +"rz" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "rJ" = ( /obj/structure/bed/chair/holochair{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"rS" = ( +/turf/simulated/floor/holofloor/desert, +/area/holodeck/source_desert) "rT" = ( /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/living) "rU" = ( /obj/machinery/vending/coffee, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "rW" = ( /turf/simulated/sky/virgo3b/south, /area/space) @@ -1737,7 +2094,15 @@ id = "crematorium-cc" }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) +"sa" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) +"sc" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "sf" = ( /obj/machinery/atmospherics/component/unary/cryo_cell, /obj/effect/floor_decal/borderfloorwhite{ @@ -1747,7 +2112,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "sh" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/large, @@ -1762,7 +2127,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "sm" = ( /obj/structure/bed/chair/shuttle, /obj/effect/floor_decal/borderfloorblack{ @@ -1772,11 +2137,11 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "su" = ( /obj/machinery/telecomms/relay/preset/tether, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "sw" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -1792,12 +2157,12 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "sy" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "sA" = ( /obj/structure/bed/chair/shuttle, /obj/effect/floor_decal/borderfloor/corner{ @@ -1807,19 +2172,20 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "sB" = ( -/obj/machinery/fitness/punching_bag/clown{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/main_hall) "sC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, -/area/space) +/area/centcom/simulated/terminal) +"sI" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "sJ" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 9 @@ -1830,34 +2196,54 @@ /obj/effect/floor_decal/borderfloor/corner, /obj/structure/bed/chair, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "sL" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"sP" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "sR" = ( /obj/structure/flora/tree/dead, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/source_snowfield) "sU" = ( /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "sX" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "td" = ( /turf/simulated/wall/thull, -/area/space) +/area/shuttle/escape) +"ti" = ( +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"tl" = ( +/turf/unsimulated/floor/steel, +/area/centcom/simulated/main_hall) +"to" = ( +/turf/unsimulated/wall, +/area/centcom/suppy) "tp" = ( /obj/effect/floor_decal/corner/green{ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"tq" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "tt" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 @@ -1866,15 +2252,22 @@ dir = 8 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"tv" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) "tw" = ( /obj/structure/flora/grass/both, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/source_snowfield) "tB" = ( /obj/structure/table/standard, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"tG" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_theatre) "tH" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_r" @@ -1883,40 +2276,44 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/space) +/area/shuttle/supply) "tI" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red{ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "tM" = ( /obj/machinery/sleeper/survival_pod, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm4) +"tO" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) "tR" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/catering/bar_alc, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "tT" = ( /obj/effect/overlay/palmtree_r, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/holodorm/source_beach) "tW" = ( /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "tY" = ( /turf/simulated/floor/holofloor/reinforced, -/area/space) +/area/holodeck/source_wildlife) "tZ" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "uf" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -1929,11 +2326,22 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"ug" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"um" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"us" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "uu" = ( /obj/structure/flora/pottedplant/small, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "uw" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1943,7 +2351,7 @@ "ux" = ( /obj/effect/floor_decal/rust/part_rusted3, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "uA" = ( /turf/space, /turf/space/internal_edge/topright, @@ -1956,7 +2364,7 @@ dir = 9 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "uJ" = ( /obj/machinery/door/window/holowindoor{ dir = 1; @@ -1975,7 +2383,7 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "uK" = ( /obj/machinery/status_display{ pixel_y = -30 @@ -1989,7 +2397,7 @@ /obj/structure/medical_stand, /obj/structure/medical_stand, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "uL" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 8 @@ -2001,14 +2409,17 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"uN" = ( +/turf/simulated/floor/tiled/white, +/area/shuttle/escape) "uP" = ( /obj/structure/medical_stand, /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "uQ" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -2016,34 +2427,80 @@ }, /obj/item/chess/bpawn, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"uS" = ( +/obj/structure/bed/double/padded, +/obj/item/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "uX" = ( /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/source_beach) +"vb" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/holodorm/source_garden) "vf" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "vg" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_boxingcourt) "vm" = ( /obj/machinery/light{ dir = 1 }, /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "vr" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/window/brigdoor/eastleft{ name = "CC-Cell 1" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) +"vs" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"vu" = ( +/turf/simulated/floor/holofloor/beach/water, +/area/holodeck/holodorm/source_beach) +"vw" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"vx" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"vB" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "vC" = ( /obj/effect/transit/light{ dir = 8 @@ -2058,14 +2515,14 @@ "vD" = ( /obj/structure/table/glass, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "vF" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "vG" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -2073,35 +2530,43 @@ }, /obj/item/chess/wbishop, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "vK" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_theatre) "vL" = ( /obj/effect/floor_decal/sign/dock/one, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) +"vO" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "vP" = ( /turf/unsimulated/beach/sand{ icon_state = "beach" }, -/area/space) +/area/holodeck/source_beach) "vS" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"vW" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "wc" = ( /obj/structure/flora/pottedplant/minitree, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/main_hall) "wf" = ( /obj/structure/table/standard, /obj/random/carp_plushie, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "wg" = ( /obj/structure/window/reinforced, /turf/unsimulated/wall, @@ -2115,19 +2580,33 @@ }, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"wi" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "wk" = ( /obj/machinery/door/airlock{ name = "Unit 1" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) +"wr" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"ws" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "wu" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "ww" = ( /obj/structure/table/steel, /obj/item/sleevemate, @@ -2137,7 +2616,7 @@ pixel_y = 7 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "wx" = ( /obj/structure/table/woodentable{ dir = 5 @@ -2146,7 +2625,13 @@ pixel_y = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) +"wy" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "wA" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/drinks/cup{ @@ -2186,21 +2671,28 @@ dir = 1 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "wB" = ( /obj/machinery/light/small{ dir = 4 }, /obj/structure/bed/chair, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) "wC" = ( /obj/machinery/conveyor{ dir = 4; id = "QMLoad2" }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) +"wF" = ( +/obj/machinery/door/window/holowindoor{ + dir = 8; + name = "Red Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) "wJ" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donut, @@ -2209,21 +2701,25 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "wK" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) +"wM" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "wN" = ( /obj/item/beach_ball, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/source_beach) "wO" = ( /obj/structure/flora/tree/pine, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/source_snowfield) "wQ" = ( /obj/structure/shuttle/engine/propulsion, /obj/effect/shuttle_landmark{ @@ -2236,13 +2732,17 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/space) +/area/shuttle/supply) "wR" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) +"wS" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "wU" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -2251,10 +2751,10 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "wV" = ( /turf/simulated/floor/holofloor/space, -/area/space) +/area/holodeck/source_space) "wW" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -2273,14 +2773,18 @@ "xa" = ( /obj/item/chess/bpawn, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"xb" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) "xd" = ( /obj/machinery/button/crematorium{ id = "creamtorium-cc"; pixel_x = -28 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "xh" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2299,19 +2803,19 @@ "xj" = ( /obj/machinery/light, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "xr" = ( /obj/structure/bed/chair/shuttle{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) "xs" = ( /obj/structure/closet{ name = "Evidence Closet" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "xw" = ( /obj/machinery/optable, /obj/machinery/light{ @@ -2319,7 +2823,17 @@ }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"xC" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "xD" = ( /obj/structure/bed/chair, /obj/landmark{ @@ -2330,28 +2844,40 @@ name = "Woodrat" }, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"xF" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "xI" = ( /obj/structure/sign/hangar/one{ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "xJ" = ( /obj/structure/bed/chair/wood/wings{ dir = 8 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "xM" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/meatballsoup, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "xV" = ( /obj/structure/bed/holobed, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/holodorm/source_basic) +"xX" = ( +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"xZ" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_emptycourt) "ya" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -2360,19 +2886,22 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "yb" = ( /obj/effect/floor_decal/corner/red{ dir = 9 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"yc" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) "yd" = ( /obj/landmark{ name = "Wolfgirl Spawn" }, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) "yf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -2381,7 +2910,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "yg" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -2394,13 +2923,13 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "yi" = ( /obj/machinery/camera/network/crescent{ dir = 6 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "ym" = ( /obj/structure/window/reinforced{ dir = 4 @@ -2422,7 +2951,7 @@ pixel_y = 28 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "yu" = ( /obj/structure/table/glass, /obj/item/defib_kit/loaded, @@ -2433,19 +2962,33 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "yy" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"yB" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"yD" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "yE" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-21" }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "yF" = ( /obj/structure/bed/chair{ dir = 8 @@ -2454,34 +2997,30 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "yG" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "yI" = ( /obj/structure/table/holotable, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "yJ" = ( -/obj/machinery/vending/fitness{ - dir = 8 - }, -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) "yL" = ( /obj/machinery/light/small{ dir = 4 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "yQ" = ( /turf/simulated/floor/maglev, /area/space) @@ -2490,7 +3029,7 @@ name = "\improper STAND AWAY FROM TRACK EDGE" }, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/restaurant) "yX" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2511,23 +3050,37 @@ id = "Tram_Sec" }, /turf/simulated/floor, -/area/space) +/area/shuttle/escape) "zd" = ( /obj/item/stool/padded, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "zi" = ( /obj/structure/flora/grass/brown, /obj/structure/flora/tree/dead, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) +"zl" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"zn" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"zr" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "zw" = ( /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "zy" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -2547,14 +3100,14 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "zA" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "zC" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -2567,10 +3120,10 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "zF" = ( /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "zH" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 8 @@ -2584,28 +3137,28 @@ /obj/structure/bed/padded, /obj/item/bedsheet, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "zI" = ( /obj/structure/fans, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm3) "zK" = ( /obj/machinery/door/airlock/alien/public, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm1) "zM" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "zO" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/airless, -/area/space) +/area/shuttle/supply) "zQ" = ( /obj/structure/closet/walllocker/emerglocker/east, /obj/effect/floor_decal/borderfloor/corner{ @@ -2615,23 +3168,29 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) +"zS" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) "zU" = ( /obj/machinery/computer/secure_data{ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "zX" = ( /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "zY" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "Aa" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -2640,21 +3199,14 @@ dir = 9 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "Ac" = ( -/obj/machinery/fitness/heavy/lifter{ - dir = 1 - }, -/obj/machinery/fitness/punching_bag/clown{ - dir = 8; - layer = 3.4 - }, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/living) "Ae" = ( /obj/item/chess/wking, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Af" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -2664,10 +3216,19 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"Ag" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm2) "Al" = ( /turf/space/internal_edge/right, /area/space) +"Ao" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) "Ap" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 9 @@ -2678,7 +3239,7 @@ /obj/effect/floor_decal/borderfloor, /obj/structure/bed/chair, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "As" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -2687,19 +3248,44 @@ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "At" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Av" = ( /obj/effect/floor_decal/corner/green{ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"Aw" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) +"Ay" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"AA" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"AI" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"AK" = ( +/turf/unsimulated/wall, +/area/centcom/control) "AO" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/cheeseburger{ @@ -2708,14 +3294,29 @@ }, /obj/item/reagent_containers/food/snacks/cheeseburger, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"AW" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"AX" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"Ba" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "Bb" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 }, /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "Bc" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -2728,14 +3329,14 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "Bd" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red/full{ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "Bf" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -2747,50 +3348,94 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) +"Bh" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/living) "Bi" = ( /obj/machinery/door/window/holowindoor{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_courtroom) "Bj" = ( /obj/effect/overlay/palmtree_r, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"Bl" = ( +/obj/structure/bed/double/padded, +/obj/item/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"Bq" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "Bw" = ( /obj/machinery/optable, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "By" = ( /obj/effect/blocker, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/living) "Bz" = ( /obj/effect/floor_decal/sign/c, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "BA" = ( /obj/structure/table/woodentable, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "BB" = ( /turf/space/transit/east, /area/space) +"BC" = ( +/obj/effect/floor_decal/corner_steel_grid/diagonal, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "BH" = ( /obj/machinery/door/airlock/multi_tile/metal, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "BK" = ( /turf/simulated/shuttle/wall, -/area/space) +/area/unknown/dorm6) "BM" = ( /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) +"BN" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"BP" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "BR" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 @@ -2799,7 +3444,7 @@ icon_state = "plant-10" }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_courtroom) "BS" = ( /obj/structure/window/reinforced/holowindow/disappearing{ dir = 1 @@ -2808,26 +3453,55 @@ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) +"Ca" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"Cc" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "Cd" = ( /obj/structure/flora/grass/green, /obj/structure/flora/tree/pine, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) +"Ci" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"Cj" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"Cn" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"Cp" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"Cq" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "Cv" = ( /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Cz" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "CD" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "CG" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -2852,7 +3526,7 @@ name = "CC-Cell 2" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "CM" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -2862,20 +3536,29 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) +"CO" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_theatre) "CU" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 8 }, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "CV" = ( /obj/structure/morgue{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) +"CX" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "CY" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 @@ -2884,12 +3567,12 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Db" = ( /obj/structure/table/standard, /obj/random/toy, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) "Dc" = ( /obj/structure/window/reinforced/holowindow, /obj/machinery/door/window/holowindoor{ @@ -2900,21 +3583,30 @@ }, /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Dd" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Dk" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Dm" = ( -/obj/machinery/fitness/heavy/lifter{ - dir = 4 +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"Dr" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/space) +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"Dt" = ( +/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/centcom/simulated/terminal) "Dw" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -2927,19 +3619,31 @@ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "Dz" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_meetinghall) +"DA" = ( +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/bathroom) +"DD" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"DE" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "DH" = ( /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "DM" = ( /obj/effect/floor_decal/sign/b, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "DO" = ( /obj/structure/table/reinforced, /obj/item/camera, @@ -2948,7 +3652,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "DX" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 @@ -2957,7 +3661,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "DY" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2967,6 +3671,18 @@ }, /turf/simulated/sky/virgo3b/south, /area/space) +"Ea" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"Ec" = ( +/obj/item/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"Ef" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "Eg" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -2976,7 +3692,11 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) +"Eh" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "Ei" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -2988,17 +3708,17 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "Ej" = ( /obj/structure/closet/secure_closet/nanotrasen_security, /obj/item/storage/box/handcuffs, /obj/item/gun/energy/gun, /obj/item/shield/riot, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "Ek" = ( /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm1) "Em" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -3007,13 +3727,19 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "En" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) +"Eo" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "Eq" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -3021,18 +3747,18 @@ pixel_y = 3 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Es" = ( /obj/effect/floor_decal/sign/a, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "EB" = ( /obj/effect/floor_decal/carpet, /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "EH" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3052,24 +3778,24 @@ id = "Tram_Med" }, /turf/simulated/floor/plating/eris/under, -/area/space) +/area/shuttle/escape) "EM" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "EP" = ( /obj/structure/table/woodentable/holotable, /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "ER" = ( /obj/machinery/status_display/supply_display, /turf/unsimulated/wall, -/area/space) +/area/centcom/suppy) "ET" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -3078,18 +3804,29 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "Fa" = ( /obj/structure/table/reinforced, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) +"Fb" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"Fd" = ( +/obj/machinery/door/window/holowindoor{ + dir = 1; + name = "Entrance 2" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "Ff" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "Fg" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 4 @@ -3098,14 +3835,20 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"Fh" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "Fi" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "Fk" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/drinks/bottle/grenadine, @@ -3113,7 +3856,7 @@ dir = 8 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Fl" = ( /obj/structure/table/glass, /obj/item/healthanalyzer/improved, @@ -3124,7 +3867,7 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Fo" = ( /obj/machinery/clonepod/transhuman/full, /obj/effect/floor_decal/borderfloorwhite{ @@ -3134,7 +3877,7 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Fu" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3150,7 +3893,7 @@ name = "Shuttle Hatch" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "Fz" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b/south, @@ -3160,20 +3903,20 @@ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) "FB" = ( /turf/space, /turf/space/internal_edge/topleft, /area/space) "FC" = ( /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) "FG" = ( /obj/effect/floor_decal/corner/red{ dir = 9 }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/holodorm/source_boxing) "FK" = ( /obj/machinery/light{ dir = 4 @@ -3188,7 +3931,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "FL" = ( /turf/simulated/floor/tiled/steel_grid, /area/space) @@ -3196,12 +3939,15 @@ /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"FR" = ( +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/holodorm/source_off) "FS" = ( /obj/machinery/light/small, /obj/structure/closet/crate/bin, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "FW" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -3213,18 +3959,18 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "FX" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "FZ" = ( /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Ga" = ( /obj/effect/overlay/palmtree_l, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Gb" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3235,11 +3981,15 @@ }, /turf/simulated/floor/maglev, /area/space) +"Gd" = ( +/obj/structure/window/reinforced/holowindow, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "Ge" = ( /obj/effect/overlay/palmtree_r, /obj/effect/overlay/coconut, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Gf" = ( /obj/machinery/shower{ pixel_y = 13 @@ -3249,7 +3999,20 @@ dir = 5 }, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm3) +"Gg" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"Gl" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"Gs" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "Gz" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3260,6 +4023,10 @@ }, /turf/space/transit/north, /area/space) +"GA" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "GB" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -3272,31 +4039,37 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "GC" = ( /obj/structure/flora/pottedplant/large, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "GE" = ( /obj/structure/sign/greencross, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/medical) +"GH" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "GL" = ( /obj/machinery/smartfridge/drinks, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "GN" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/bigbiteburger, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "GO" = ( /obj/machinery/camera/network/crescent, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "GT" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3309,7 +4082,7 @@ dir = 6 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) "GW" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -3317,17 +4090,17 @@ name = "HIGH VOLTAGE" }, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/terminal) "GZ" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/space) +/area/centcom/simulated/restaurant) "Hc" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "Hg" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -3335,22 +4108,44 @@ }, /obj/structure/grille, /turf/simulated/floor/plating/eris/under, -/area/space) +/area/shuttle/escape) +"Hh" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"Hj" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) "Hn" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow{ dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Ho" = ( /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) +"Hp" = ( +/obj/machinery/camera/network/crescent, +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/medical) "Hr" = ( /obj/item/chess/wrook, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Hs" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, @@ -3358,29 +4153,29 @@ dir = 8 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Ht" = ( /obj/item/chess/wknight, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Hu" = ( /obj/structure/prop/alien/computer{ dir = 8 }, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm1) "Hz" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "HA" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "HF" = ( /obj/structure/sink{ dir = 4; @@ -3388,7 +4183,7 @@ pixel_y = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "HG" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3412,14 +4207,14 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "HP" = ( /obj/machinery/account_database{ dir = 1; name = "CentComm Accounts database" }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "HQ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -3428,17 +4223,20 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "HR" = ( /obj/machinery/door/firedoor{ dir = 8 }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/terminal) +"Ib" = ( +/turf/simulated/shuttle/wall, +/area/shuttle/supply) "Ic" = ( /obj/machinery/telecomms/receiver/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "Id" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -3448,13 +4246,26 @@ dir = 4 }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/terminal) +"Ie" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"If" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "Ij" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/organ_printer/flesh, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Im" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -3478,7 +4289,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Io" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -3491,14 +4302,14 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Iq" = ( /obj/structure/sink{ dir = 8; pixel_x = -12 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Ir" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -3511,42 +4322,54 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "Is" = ( /obj/effect/floor_decal/corner_steel_grid/diagonal, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/large_escape_pod2/centcom) +"Iw" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) "Iz" = ( /obj/structure/table/woodentable, /obj/machinery/cash_register/civilian, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "IA" = ( /obj/structure/sign/double/barsign{ dir = 8 }, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/restaurant) "IB" = ( /obj/effect/floor_decal/corner/red{ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"IC" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "ID" = ( /obj/item/stool/padded, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "IE" = ( /obj/machinery/cryopod/robot/door/dorms, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "IH" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_courtroom) "II" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, @@ -3557,13 +4380,13 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "IL" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "IM" = ( /obj/machinery/turretid/stun{ check_access = 0; @@ -3575,7 +4398,7 @@ req_one_access = list(101) }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "IO" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -3589,11 +4412,11 @@ }, /obj/structure/grille, /turf/simulated/floor/plating/eris/under, -/area/space) +/area/shuttle/escape) "IP" = ( /obj/machinery/vending/medical, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "IT" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -3601,7 +4424,7 @@ }, /obj/item/chess/wqueen, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "IU" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -3616,20 +4439,20 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"IX" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) "Jb" = ( -/obj/machinery/vending/fitness{ - dir = 4 - }, -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/space) +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm1) "Jc" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "Jf" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -3638,35 +4461,49 @@ pixel_y = -32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"Jl" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"Jm" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "Jn" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/source_desert) "Jw" = ( /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/holodorm/source_beach) "Jz" = ( /obj/machinery/light, /obj/structure/table/marble, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "JB" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 }, /obj/effect/floor_decal/corner/red, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "JH" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) "JI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"JL" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "JN" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -3679,7 +4516,10 @@ }, /obj/effect/floor_decal/sign/dock/three, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) +"JV" = ( +/turf/simulated/floor/holofloor/space, +/area/holodeck/holodorm/source_space) "JX" = ( /obj/structure/table/glass, /obj/item/backup_implanter{ @@ -3693,7 +4533,7 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Ka" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove{ @@ -3701,11 +4541,16 @@ item_state = "boxinggreen" }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_boxingcourt) "Kd" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Ke" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -3715,22 +4560,38 @@ tag_door = "supply_shuttle_hatch" }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) +"Kh" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "Km" = ( /obj/effect/overlay/palmtree_l, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/holodorm/source_beach) +"Kx" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "KA" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/roastbeef, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"KD" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"KP" = ( +/turf/simulated/shuttle/wall, +/area/unknown/dorm3) "KQ" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/effect/floor_decal/corner/paleblue/bordercorner, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "KR" = ( /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law, @@ -3739,7 +4600,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "KS" = ( /obj/machinery/bodyscanner{ dir = 8 @@ -3748,7 +4609,11 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"KT" = ( +/obj/effect/floor_decal/rust/mono_rusted3, +/turf/simulated/floor/tiled/steel, +/area/shuttle/large_escape_pod2/centcom) "KU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -3758,17 +4623,22 @@ "KW" = ( /obj/structure/closet, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "KZ" = ( /obj/machinery/telecomms/hub/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "La" = ( /obj/effect/floor_decal/industrial/loading{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"Le" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm1) "Lf" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3786,13 +4656,19 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Lj" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) +"Ln" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/centcom/simulated/restaurant) "Lp" = ( /obj/structure/table/standard, /obj/item/reagent_containers/food/drinks/cans/cola, @@ -3802,7 +4678,7 @@ /obj/item/reagent_containers/food/drinks/cans/cola, /obj/item/reagent_containers/food/drinks/cans/cola, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Lq" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -3810,24 +4686,24 @@ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "Ls" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "Lu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/restaurant) "Lx" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Ly" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -3835,7 +4711,7 @@ }, /obj/item/chess/wrook, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Lz" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -3843,17 +4719,24 @@ }, /obj/structure/grille, /turf/simulated/floor/plating/eris/under, -/area/space) +/area/shuttle/escape) +"LA" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"LH" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) "LI" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "LJ" = ( /turf/simulated/shuttle/wall/alien, -/area/space) +/area/unknown/dorm2) "LK" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -3868,20 +4751,68 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "LP" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 9 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"LT" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"LV" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "LX" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/landmark{ name = "Catgirl Spawn" }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/holodorm/source_garden) +"LY" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) +"LZ" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "Mc" = ( /obj/structure/window/reinforced/holowindow/disappearing{ dir = 1 @@ -3890,21 +4821,27 @@ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) +"Mf" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) "Mn" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "Mr" = ( /obj/structure/flora/pottedplant/tall, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "Mt" = ( /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "Mx" = ( /obj/structure/table/standard, /obj/item/storage/box/gloves{ @@ -3913,7 +4850,7 @@ }, /obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "My" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -3927,11 +4864,25 @@ /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/fries, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"MB" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"MC" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"MG" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "MH" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall/thull, -/area/space) +/area/shuttle/escape) "MK" = ( /obj/structure/filingcabinet/chestdrawer{ name = "Medical Forms" @@ -3943,11 +4894,11 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "MM" = ( /obj/machinery/door/airlock, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "MO" = ( /obj/structure/window/reinforced/holowindow, /obj/machinery/door/window/holowindoor{ @@ -3956,20 +4907,24 @@ }, /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "MV" = ( /obj/machinery/door/firedoor{ dir = 8 }, /obj/machinery/door/blast/regular/open, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"MW" = ( +/obj/effect/floor_decal/rust/part_rusted3, +/turf/simulated/floor/tiled/steel, +/area/shuttle/large_escape_pod2/centcom) "MY" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "MZ" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -3980,37 +4935,43 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) +"Na" = ( +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "Nb" = ( /obj/machinery/conveyor{ dir = 4; id = "QMLoad" }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) "Nj" = ( /obj/structure/table/standard, /obj/item/material/ashtray/plastic, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "No" = ( /obj/structure/holohoop, /obj/effect/floor_decal/corner/red{ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "Ns" = ( /obj/structure/flora/pottedplant/overgrown, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Nt" = ( /obj/machinery/porta_turret/crescent{ density = 1 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "Nv" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -4018,7 +4979,7 @@ }, /obj/item/chess/bbishop, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Nx" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -4026,7 +4987,7 @@ }, /obj/item/chess/brook, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Ny" = ( /obj/machinery/atmospherics/component/unary/freezer, /obj/effect/floor_decal/borderfloorwhite{ @@ -4036,13 +4997,16 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"Nz" = ( +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/security) "ND" = ( /obj/structure/fake_stairs/north/bottom{ _stair_tag = "stairtest" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "NL" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -4054,35 +5018,41 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"NM" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/evac) "NP" = ( /obj/item/chess/brook, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "NQ" = ( /obj/machinery/telecomms/broadcaster/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "NT" = ( /obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) "NX" = ( /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"NZ" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "Ob" = ( /obj/structure/table/alien, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm5) "Oc" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 10 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Od" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -4096,21 +5066,27 @@ pixel_y = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Oe" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"Oh" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) "Ol" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/glass, /turf/unsimulated/floor/steel{ icon_state = "white" }, -/area/space) +/area/centcom/simulated/medical) "Ou" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -4122,28 +5098,35 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "Oz" = ( /obj/structure/bed/chair/wood/wings{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "OA" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor/plating, -/area/space) +/area/centcom/simulated/medical) "OB" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"OD" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_courtroom) "OF" = ( /obj/machinery/recharge_station, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm4) +"OG" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "OK" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -4152,21 +5135,21 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "OL" = ( /obj/structure/flora/pottedplant/shoot, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "OO" = ( /obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "OP" = ( /obj/structure/closet/crate/bin, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "OW" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -4184,7 +5167,7 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "OY" = ( /obj/structure/closet/walllocker/emerglocker/west, /obj/effect/floor_decal/borderfloorwhite{ @@ -4194,11 +5177,17 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "OZ" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/holodorm/source_garden) +"Pa" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "Pb" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -4207,36 +5196,36 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Pc" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_meetinghall) "Pd" = ( /obj/structure/bed/chair/holochair{ dir = 8 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/holodorm/source_basic) "Pl" = ( /obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/holodorm/source_boxing) "Pm" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Po" = ( /obj/machinery/door/airlock/security{ name = "Security" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "Pr" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -4248,7 +5237,7 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "Ps" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 @@ -4258,7 +5247,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Pt" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 9 @@ -4271,11 +5260,11 @@ }, /obj/structure/bed/chair, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Pv" = ( /obj/item/beach_ball, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Px" = ( /obj/machinery/vending/medical, /obj/effect/floor_decal/borderfloorwhite{ @@ -4285,12 +5274,12 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Py" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/drinks/bottle/cola, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "PG" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -4302,7 +5291,7 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "PJ" = ( /obj/machinery/transhuman/synthprinter, /obj/effect/floor_decal/borderfloorwhite{ @@ -4312,13 +5301,17 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "PK" = ( /obj/effect/floor_decal/rust/steel_decals_rusted2, /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) +"PL" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "PN" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -4330,18 +5323,50 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"PO" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"PP" = ( +/obj/effect/wingrille_spawn/reinforced/crescent, +/turf/simulated/floor/plating, +/area/centcom/simulated/security) "PQ" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/stewedsoymeat, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"PT" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/security) +"PU" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "PV" = ( /obj/machinery/light{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"PX" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) +"PY" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"Qb" = ( +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/source_plating) "Qd" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l" @@ -4350,7 +5375,7 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/space) +/area/shuttle/supply) "Qh" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -4358,13 +5383,13 @@ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "Qi" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "Qk" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -4376,7 +5401,11 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"Qp" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/holofloor/desert, +/area/holodeck/holodorm/source_desert) "Qq" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -4385,32 +5414,32 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Qs" = ( /obj/machinery/vending/coffee{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Qt" = ( /obj/machinery/door/blast/regular{ dir = 4 }, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/terminal) "Qu" = ( /obj/machinery/light{ dir = 1 }, /obj/structure/flora/pottedplant/aquatic, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Qw" = ( /obj/structure/table/standard, /obj/machinery/light, /obj/item/surgical/bioregen, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "QA" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -4418,7 +5447,7 @@ }, /obj/item/chess/wknight, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "QC" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4430,7 +5459,7 @@ /area/space) "QI" = ( /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "QK" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -4446,11 +5475,11 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "QL" = ( /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "QO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -4460,35 +5489,41 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"QQ" = ( +/turf/unsimulated/mineral/virgo3b, +/area/centcom/simulated/terminal) "QS" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "QU" = ( /turf/unsimulated/beach/coastline{ density = 1; opacity = 1 }, -/area/space) +/area/beach) "QV" = ( /obj/machinery/sleeper{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "QW" = ( /obj/effect/floor_decal/industrial/loading{ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Ra" = ( /obj/machinery/door/airlock/alien/blue/public, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm6) +"Rd" = ( +/turf/simulated/shuttle/wall, +/area/unknown/dorm4) "Rj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -4510,7 +5545,7 @@ name = "endgame_exit" }, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "RB" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -4520,18 +5555,18 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "RD" = ( /obj/machinery/door/airlock{ name = "Unit 3" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "RH" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "RS" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4554,34 +5589,34 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "RU" = ( /obj/structure/closet/crate/bin, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "RW" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /obj/effect/floor_decal/borderfloorblack, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "RX" = ( /obj/structure/closet/crate, /turf/unsimulated/floor{ icon_state = "dark" }, -/area/space) +/area/centcom/suppy) "RY" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Sa" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) "Sb" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -4591,14 +5626,22 @@ name = "Shuttle Hatch" }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) "Sc" = ( /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/holodorm/source_desert) +"Sf" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm3) "Sg" = ( /obj/machinery/r_n_d/server/centcom, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) +"Sj" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/restaurant) "Sk" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, @@ -4606,13 +5649,16 @@ dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Sn" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"So" = ( +/turf/simulated/floor/wood, +/area/holodeck/source_boxingcourt) "Sp" = ( /obj/structure/bed/chair/shuttle{ dir = 4 @@ -4624,14 +5670,17 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "Sq" = ( /obj/machinery/cryopod/robot/door/gateway, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"Sr" = ( +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/holodorm/source_beach) "St" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -4640,7 +5689,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Sx" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -4649,29 +5698,38 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "Sy" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/restaurant) "SB" = ( /obj/structure/fake_stairs/south/top{ _stair_tag = "stairtest" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"SC" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"SE" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_meetinghall) "SI" = ( /obj/machinery/camera/network/crescent{ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "SL" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "SS" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -4680,13 +5738,25 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "ST" = ( /turf/unsimulated/beach/water{ density = 1; opacity = 1 }, -/area/space) +/area/beach) +"SU" = ( +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) "SV" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -4705,13 +5775,20 @@ initial_flooring = null }, /area/space) +"Tc" = ( +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/living) "Tl" = ( /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) +"Ts" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "Tt" = ( /obj/structure/bed/chair, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Tv" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 4 @@ -4727,7 +5804,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "Tx" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -4735,26 +5812,50 @@ }, /obj/item/chess/wpawn, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"TF" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"TG" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/medical) "TI" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ id = "Tram_Med" }, /turf/simulated/floor, -/area/space) +/area/shuttle/escape) +"TO" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "TS" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"TT" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"TX" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "Ua" = ( /obj/machinery/telecomms/bus/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "Ub" = ( /turf/simulated/shuttle/wall/alien/hard_corner, -/area/space) +/area/unknown/dorm5) "Ui" = ( /obj/structure/bed/chair/shuttle, /obj/effect/floor_decal/borderfloor/corner, @@ -4762,7 +5863,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Uk" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -4787,23 +5888,28 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "Uq" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm3) "Ux" = ( /obj/effect/floor_decal/industrial/outline, /obj/structure/bed/chair{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"UD" = ( +/turf/unsimulated/beach/sand{ + icon_state = "beach" + }, +/area/holodeck/holodorm/source_beach) "UI" = ( /obj/structure/table/steel, /obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "UL" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data{ @@ -4819,7 +5925,7 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "UP" = ( /obj/machinery/light{ dir = 8 @@ -4834,7 +5940,10 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"UQ" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) "UU" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -4856,20 +5965,29 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) +"UW" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) "UY" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "UZ" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "Vf" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4885,7 +6003,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "Vj" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4909,12 +6027,16 @@ intercept = 1 }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "Vq" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/lasagna, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"Vr" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "Vs" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -4927,7 +6049,7 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "Vt" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 @@ -4940,7 +6062,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Vv" = ( /obj/structure/table/standard, /obj/item/clothing/under/color/rainbow, @@ -4949,45 +6071,71 @@ pixel_y = 5 }, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Vw" = ( /obj/machinery/door/airlock/medical{ name = "Operating Theatre"; req_access = list(45) }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "Vx" = ( /turf/unsimulated/wall, /area/space) "Vy" = ( /obj/structure/table/alien/blue, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm4) +"VH" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "VK" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /obj/effect/floor_decal/borderfloorblack/corner, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "VP" = ( /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "VQ" = ( /obj/structure/table/glass, /obj/machinery/chemical_dispenser/full, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"VR" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "VV" = ( /obj/structure/bed/chair/holochair{ dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/holodorm/source_basic) "VW" = ( /obj/effect/shuttle_landmark{ landmark_tag = "escape_transit"; @@ -5008,7 +6156,7 @@ dir = 8 }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/main_hall) "Wd" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 @@ -5017,7 +6165,20 @@ dir = 5 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"Wg" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) +"Wi" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"Wl" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm6) "Wn" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -5025,17 +6186,26 @@ }, /obj/item/chess/bking, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Wo" = ( /obj/machinery/telecomms/processor/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "Wr" = ( /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"Ws" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"Wt" = ( +/turf/simulated/floor/maglev, +/area/centcom/simulated/terminal) "Wv" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow{ @@ -5045,17 +6215,17 @@ dir = 1 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "WB" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/source_desert) "WC" = ( /obj/machinery/door/airlock/security{ name = "Security" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "WH" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -5065,7 +6235,7 @@ }, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "WI" = ( /obj/machinery/door/airlock/medical{ name = "Operating Theatre"; @@ -5073,7 +6243,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "WJ" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -5098,7 +6268,14 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"WO" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "WV" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -5113,23 +6290,29 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "WW" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"WY" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "Xf" = ( /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Xk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Security" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "Xn" = ( /obj/effect/step_trigger/lost_in_space/tram, /turf/simulated/floor/maglev, @@ -5157,7 +6340,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "Xq" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /obj/machinery/door/blast/regular{ @@ -5170,7 +6353,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/space) +/area/centcom/simulated/security) "Xr" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 @@ -5179,11 +6362,11 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Xs" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) "Xv" = ( /obj/effect/step_trigger/lost_in_space/tram, /obj/effect/floor_decal/transit/orange{ @@ -5196,34 +6379,38 @@ "XD" = ( /turf/space/internal_edge/top, /area/space) +"XE" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "XF" = ( /obj/structure/flora/grass/green, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/source_snowfield) "XG" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "XI" = ( /turf/unsimulated/beach/sand{ density = 1; opacity = 1 }, -/area/space) +/area/beach) "XM" = ( /obj/structure/table/holotable, /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "XR" = ( /obj/structure/bed/chair/holochair, /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) "XV" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -5239,7 +6426,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "XW" = ( /obj/structure/table/standard, /obj/item/reagent_containers/spray/cleaner{ @@ -5249,7 +6436,7 @@ pixel_y = 2 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "XZ" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -5258,19 +6445,19 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "Yb" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/grilledcheese, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Yd" = ( /obj/structure/table/bench/steel, /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "Ye" = ( /obj/effect/floor_decal/rust/steel_decals_rusted2, /obj/effect/floor_decal/industrial/warning/dust, @@ -5278,23 +6465,23 @@ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Yg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "Yh" = ( /turf/simulated/floor/holofloor/beach/water, -/area/space) +/area/holodeck/source_beach) "Yi" = ( /turf/unsimulated/mineral/virgo3b, /area/space) "Yj" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "Yk" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -5308,7 +6495,10 @@ id = "QMLoad" }, /turf/simulated/shuttle/plating, -/area/space) +/area/shuttle/supply) +"Yl" = ( +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "Yp" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/OMinus, @@ -5318,7 +6508,7 @@ /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Yr" = ( /obj/effect/floor_decal/carpet{ dir = 5 @@ -5333,7 +6523,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "Yw" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -5342,12 +6532,23 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "Yy" = ( /obj/landmark/costume/random, /obj/structure/table/rack/holorack_legacy, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_theatre) +"Yz" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "YC" = ( /obj/structure/table/standard, /obj/random/plushie, @@ -5358,13 +6559,13 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "YE" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "YH" = ( /turf/space/internal_edge/left, /area/space) @@ -5373,13 +6574,13 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "YK" = ( /obj/machinery/computer/teleporter{ dir = 1 }, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm1) "YM" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 8 @@ -5391,7 +6592,13 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) +"YN" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "YQ" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 1 @@ -5403,48 +6610,59 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) +"YW" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "Zb" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) +"Zh" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) "Zi" = ( /obj/effect/floor_decal/borderfloor/shifted, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "Zk" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/department/medbay, /turf/unsimulated/floor{ name = "plating" }, -/area/space) +/area/centcom/simulated/medical) "Zn" = ( /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Zr" = ( /obj/structure/bed/chair/wood/wings, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Zs" = ( /obj/machinery/light, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Zt" = ( /obj/machinery/door/firedoor, /turf/unsimulated/floor/steel{ icon_state = "white" }, -/area/space) +/area/centcom/simulated/medical) "Zu" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "Zv" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 @@ -5453,13 +6671,13 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Zw" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Zx" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -5481,10 +6699,19 @@ }, /turf/space/transit/east, /area/space) +"ZD" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"ZH" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "ZI" = ( /obj/structure/table/survival_pod, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm2) "ZL" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -5493,20 +6720,20 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) "ZO" = ( /obj/machinery/body_scanconsole, /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "ZQ" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "ZS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -5515,16 +6742,24 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "ZT" = ( /obj/structure/table/standard, /obj/random/action_figure, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) "ZV" = ( /obj/item/clothing/head/collectable/paper, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"ZW" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"ZX" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "ZZ" = ( /obj/structure/table/standard, /obj/item/healthanalyzer, @@ -5532,7 +6767,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) (1,1,1) = {" bz @@ -15846,26 +17081,26 @@ Zx Fz Zx qQ -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK Yi Yi Yi @@ -16040,7 +17275,7 @@ Zx Zx Zx qQ -Vx +oK XI XI XI @@ -16059,7 +17294,7 @@ XI QU ST ST -Vx +oK Yi Yi Yi @@ -16234,7 +17469,7 @@ Zx Zx Zx qQ -Vx +oK XI FZ Ga @@ -16253,7 +17488,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -16428,7 +17663,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -16447,7 +17682,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -16622,7 +17857,7 @@ Zx Fz Zx qQ -Vx +oK XI iA FZ @@ -16641,7 +17876,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -16816,7 +18051,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -16835,43 +18070,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -Ub -LJ -Ub -LJ -LJ -LJ -LJ -LJ -LJ -Ub -LJ -LJ -Ub +jH +Jb +jH +Jb +Jb +Jb +Jb +Jb +Jb +jH +Jb +Jb +jH Yi Yi Yi Yi Yi -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP Yi Yi Yi @@ -17010,7 +18245,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -17029,43 +18264,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -LJ -OF -Ub -tM -ZI +Jb +XE +jH +ug +vO lc Hu -Uq -Uq -Ub +wS +wS +jH Ek -bV -LJ +Le +Jb Yi Yi Yi Yi Yi -BK -OF -BK -tM -ZI -lc -Ek +KP +Eh +KP +YW +ws +TO +qo Uq Uq -BK -Ek -bV -BK +KP +qo +Sf +KP Yi Yi Yi @@ -17204,7 +18439,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -17223,43 +18458,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -LJ -aM +Jb +jD zK Ek -aM -mK -aM -aM +jD +Ws +jD +jD Ek zK Ek -fa -LJ +Ay +Jb Yi Yi Yi Yi Yi -BK -aM -Ra -Ek -aM -mK -aM -aM -Ek -Ra -Ek -fa -BK +KP +Cc +Kh +qo +Cc +AA +Cc +Cc +qo +Kh +qo +ZX +KP Yi Yi Yi @@ -17398,7 +18633,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -17417,43 +18652,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -LJ -jY -Ub -zI -aM -aM -aM -aM -hL -Ub +Jb +fX +jH +vw +jD +jD +jD +jD +Eo +jH Ek YK -LJ +Jb Yi Yi Yi Yi Yi -BK +KP jY -BK +KP zI -aM -aM -aM -aM -hL -BK -Ek -YK -BK +Cc +Cc +Cc +Cc +xF +KP +qo +Hh +KP Yi Yi Yi @@ -17592,7 +18827,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -17611,43 +18846,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -LJ -Gf -LJ -gl +Jb +yB +Jb +vx Ek gA -hK -iB -Ob -LJ +vs +AW +Ba +Jb Ek -fu -LJ +PU +Jb Yi Yi Yi Yi Yi -BK +KP Gf -BK -gl -Ek -ja -hK -iB -Vy -BK -Ek -fu -BK +KP +ll +qo +Bl +zl +eA +GA +KP +qo +oi +KP Yi Yi Yi @@ -17786,7 +19021,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -17805,43 +19040,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -Ub -LJ -Ub -LJ -LJ -LJ -LJ -LJ -LJ -Ub -LJ -LJ -Ub +jH +Jb +jH +Jb +Jb +Jb +Jb +Jb +Jb +jH +Jb +Jb +jH Yi Yi Yi Yi Yi -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP Yi Yi Yi @@ -17980,7 +19215,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -17999,7 +19234,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18174,7 +19409,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -18193,7 +19428,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18368,7 +19603,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -18387,7 +19622,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18562,7 +19797,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -18581,7 +19816,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18756,7 +19991,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -18775,7 +20010,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18950,7 +20185,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -18969,7 +20204,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -19144,7 +20379,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -19163,43 +20398,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -Ub +iY LJ -Ub +iY LJ LJ LJ LJ LJ LJ -Ub +iY LJ LJ -Ub +iY Yi Yi Yi Yi Yi -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd Yi Yi Yi @@ -19338,7 +20573,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -19357,43 +20592,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi LJ -OF -Ub -tM +Fb +iY +ZW ZI -lc -Hu -Uq -Uq -Ub -Ek -bV +wM +Pa +LV +LV +iY +Kx +Ag LJ Yi Yi Yi Yi Yi -BK +Rd OF -BK +Rd tM -ZI -lc -Ek -Uq -Uq -BK -Ek -bV -BK +qD +dY +ZH +sP +sP +Rd +ZH +aA +Rd Yi Yi Yi @@ -19532,7 +20767,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -19551,43 +20786,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi LJ -aM -zK -Ek -aM -mK -aM -aM -Ek -zK -Ek -fa +nr +Ea +Kx +nr +wi +nr +nr +Kx +Ea +Kx +JL LJ Yi Yi Yi Yi Yi -BK -aM -Ra -Ek -aM -mK -aM -aM -Ek -Ra -Ek +Rd +nM +hz +ZH +nM +Cp +nM +nM +ZH +hz +ZH fa -BK +Rd Yi Yi Yi @@ -19726,7 +20961,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ Ge @@ -19745,43 +20980,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi LJ -jY -Ub -zI -aM -aM -aM -aM -hL -Ub -Ek -YK +vB +iY +dm +nr +nr +nr +nr +mS +iY +Kx +Jm LJ Yi Yi Yi Yi Yi -BK -jY -BK -zI -aM -aM -aM -aM -hL -BK -Ek -YK -BK +Rd +am +Rd +OG +nM +nM +nM +nM +PY +Rd +ZH +wy +Rd Yi Yi Yi @@ -19920,7 +21155,7 @@ Zx Fz Zx qQ -Vx +oK XI XI XI @@ -19939,23 +21174,23 @@ XI QU ST ST -Vx +oK Yi Yi Yi Yi Yi LJ -Gf +LT LJ -gl -Ek -gA +VH +Kx +hU hK -iB -Ob +Cq +IC LJ -Ek +Kx fu LJ Yi @@ -19963,19 +21198,19 @@ Yi Yi Yi Yi -BK -Gf -BK -gl -Ek -ja -hK +Rd +xC +Rd +LZ +ZH +uS +VR iB Vy -BK -Ek -fu -BK +Rd +ZH +sI +Rd Yi Yi Yi @@ -20114,62 +21349,62 @@ Zx Zx Zx qQ -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK Yi Yi Yi Yi Yi -Ub +iY LJ -Ub +iY LJ LJ LJ LJ LJ LJ -Ub +iY LJ LJ -Ub +iY Yi Yi Yi Yi Yi -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd Yi Yi Yi @@ -21498,17 +22733,17 @@ Yi Yi Yi Ub -LJ +kT Ub -LJ -LJ -LJ -LJ -LJ -LJ +kT +kT +kT +kT +kT +kT Ub -LJ -LJ +kT +kT Ub Yi Yi @@ -21691,36 +22926,36 @@ Yi Yi Yi Yi -LJ -OF +kT +BP Ub -tM -ZI -lc -Hu -Uq -Uq +Ie +TT +tO +KD +Wi +Wi Ub -Ek +Gl bV -LJ +kT Yi Yi Yi Yi Yi BK -OF +TX BK -tM -ZI -lc -Ek -Uq -Uq +hy +zn +lY +py +yD +yD BK -Ek -bV +py +Wl BK Yi Yi @@ -21885,36 +23120,36 @@ Yi Yi Yi Yi -LJ +kT aM -zK -Ek +Ca +Gl aM -mK +mq aM aM -Ek -zK -Ek -fa -LJ +Gl +Ca +Gl +rz +kT Yi Yi Yi Yi Yi BK -aM +DD Ra -Ek -aM +py +DD mK -aM -aM -Ek +DD +DD +py Ra -Ek -fa +py +LA BK Yi Yi @@ -22079,36 +23314,36 @@ Yi Yi Yi Yi -LJ -jY +kT +Gg Ub -zI +Cn aM aM aM aM hL Ub -Ek -YK -LJ +Gl +WY +kT Yi Yi Yi Yi Yi BK -jY +Ts BK -zI -aM -aM -aM -aM -hL +PL +DD +DD +DD +DD +fj BK -Ek -YK +py +bv BK Yi Yi @@ -22273,36 +23508,36 @@ Yi Yi Yi Yi -LJ -Gf -LJ +kT +jI +kT gl -Ek -gA -hK -iB +Gl +Ec +mW +tv Ob -LJ -Ek -fu -LJ +kT +Gl +jO +kT Yi Yi Yi Yi Yi BK -Gf +lR BK -gl -Ek +BN +py ja -hK -iB -Vy +pl +vW +Jl BK -Ek -fu +py +Dm BK Yi Yi @@ -22468,17 +23703,17 @@ Yi Yi Yi Ub -LJ +kT Ub -LJ -LJ -LJ -LJ -LJ -LJ +kT +kT +kT +kT +kT +kT Ub -LJ -LJ +kT +kT Ub Yi Yi @@ -27846,15 +29081,15 @@ bz "} (116,1,1) = {" wg -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS +rS Jn Dw wV @@ -28040,16 +29275,16 @@ bz "} (117,1,1) = {" wg -Sc -Sc +rS +rS WB -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS Dw wV wV @@ -28234,16 +29469,16 @@ bz "} (118,1,1) = {" wg -Sc -Sc -Sc -Sc +rS +rS +rS +rS Jn -Sc -Sc +rS +rS WB -Sc -Sc +rS +rS Dw wV wV @@ -28429,15 +29664,15 @@ bz (119,1,1) = {" wg Jn -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS +rS Dw wV pV @@ -28622,15 +29857,15 @@ bz "} (120,1,1) = {" wg -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS +rS WB Dw wV @@ -28816,16 +30051,16 @@ bz "} (121,1,1) = {" wg -Sc -Sc -Sc +rS +rS +rS Jn -Sc -Sc +rS +rS WB -Sc -Sc -Sc +rS +rS +rS Dw wV wV @@ -29010,16 +30245,16 @@ bz "} (122,1,1) = {" wg -Sc -Sc -Sc -Sc +rS +rS +rS +rS Jn -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS Dw wV wV @@ -29204,16 +30439,16 @@ bz "} (123,1,1) = {" wg -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS Dw wV wV @@ -29398,16 +30633,16 @@ bz "} (124,1,1) = {" wg -Sc +rS WB -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS Dw wV pV @@ -29592,15 +30827,15 @@ bz "} (125,1,1) = {" wg -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS Jn -Sc -Sc +rS +rS WB Dw wV @@ -29981,26 +31216,26 @@ bz (127,1,1) = {" wg qs -OZ +rk CD -OZ -OZ -OZ -OZ +rk +rk +rk +rk CD -OZ +rk qs Dw -cY -cY -cY -cY -cY -cY -cY -eB -cY -cY +oG +oG +oG +oG +oG +oG +oG +MC +oG +oG eF qQ qQ @@ -30176,25 +31411,25 @@ bz wg kJ CD -OZ +rk CD CD CD CD -OZ +rk CD kJ Dw -cY +oG tw -cY -cY -cY -cY -cY -cY +oG +oG +oG +oG +oG +oG XF -cY +oG eF Yi Yi @@ -30369,26 +31604,26 @@ bz (129,1,1) = {" wg qs -OZ +rk TS Oe Oe Oe Oe sL -OZ +rk qs Dw -cY -cY -cY +oG +oG +oG sR -cY -cY -cY -cY -cY -cY +oG +oG +oG +oG +oG +oG eF Yi Yi @@ -30398,16 +31633,16 @@ Yi Yi Yi Yi -Vx -Vx -oc -oc -oc -oc -oc -Vx -Vx -Yi +yJ +yJ +Vr +Vr +Vr +Vr +Vr +yJ +yJ +QQ Yi Yi Yi @@ -30565,24 +31800,24 @@ wg kJ CD WW -Sc -Sc -Sc -Sc +bl +bl +bl +bl bO CD kJ Dw -cY -cY -cY -cY +oG +oG +oG +oG XF -cY -cY -cY +oG +oG +oG sR -cY +oG eF Yi Yi @@ -30592,16 +31827,16 @@ Yi Yi Yi Yi -Vx +yJ ee -Vh -Vh -Vh -Vh -Vh +DE +DE +DE +DE +DE Fg -Vx -Yi +yJ +QQ Yi Yi Yi @@ -30757,36 +31992,36 @@ bz (131,1,1) = {" wg qs -OZ +rk sy mU lX lX mU Fi -OZ +rk qs Dw -cY -cY -cY +oG +oG +oG wO -cY -cY +oG +oG tw -cY -cY -eB +oG +oG +MC eF Yi -Vx -Vx -Vx -Vx -Vx -Vx +sB +sB +sB +sB +sB +sB Yi -Vx +yJ Ye gZ QI @@ -30794,36 +32029,36 @@ QI QI QI Jf -Vx +yJ bB -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ GW -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ GW -Vx -Vx -Vx -Vx -Vx -Vx -yR +yJ +yJ +yJ +yJ +yJ +yJ +iL Yi Yi Yi @@ -30961,34 +32196,34 @@ bO CD qs Dw -cY -cY -cY -cY -cY -cY -cY -eB -cY -cY +oG +oG +oG +oG +oG +oG +oG +MC +oG +oG eF Yi -Vx -QI +sB +lI SB Qi NX -Vx +sB Yi -Vx -DH +yJ +Cj ux QI -ix -ix +wr +wr QI -Qi -Vx +Gs +yJ Qt EM in @@ -31145,36 +32380,36 @@ bz (133,1,1) = {" wg kJ -OZ +rk Mn -Sc -Sc -Sc -Sc +bl +bl +bl +bl Ls -OZ +rk kJ Dw -cY +oG tw -cY -cY -cY -cY +oG +oG +oG +oG sR -cY +oG XF -cY +oG eF Yi -Vx -Vx -Vx +sB +sB +sB Qi qh -Vx +sB Yi -Vx +yJ ro QI iO @@ -31182,7 +32417,7 @@ QI QI QI kI -Vx +yJ Qt Mt Mt @@ -31340,43 +32575,43 @@ bz wg qs CD -Sc -Sc +bl +bl cf jJ -Sc -Sc +bl +bl CD qs Dw -cY -cY -cY -cY -cY -cY -cY -cY -cY -cY +oG +oG +oG +oG +oG +oG +oG +oG +oG +oG eF Yi -Vx -Vx -Vx +sB +sB +sB Qi NX -Vx +sB Yi -Vx -DH +yJ +Cj QI QI QI QI -Is -Qi -Vx +BC +Gs +yJ Qt Mt Mt @@ -31533,72 +32768,72 @@ bz (135,1,1) = {" wg kJ -OZ -Sc +rk +bl cf gy vF jJ -Sc +bl CD kJ Dw -cY -cY +oG +oG wO -cY +oG XF -cY -cY -cY +oG +oG +oG sR -cY +oG eF Yi -Vx +sB ND -QI +lI Qi NX -Vx +sB Yi -Vx -DH +yJ +Cj QI -ix +wr QI QI QI -Aa -Vx +If +yJ Qt -yQ -yQ -yQ +Wt +Wt +Wt td MH Ui ri kc -QI -QI -QI -QI +xX +xX +xX +xX nC Nj hs -QI -QI -QI -QI +xX +xX +xX +xX pD OY mM td td -yQ -yQ -yQ +Wt +Wt +Wt Qt Yi Yi @@ -31728,43 +32963,43 @@ bz wg qs CD -Sc +bl Ls Oe Oe Mn -Sc -OZ +bl +rk qs Dw -cY -cY -cY -cY -cY -cY +oG +oG +oG +oG +oG +oG tw -cY -cY -eB +oG +oG +MC eF Yi -Vx -Vx -Vx -Vx -Vx -Vx +sB +sB +sB +sB +sB +sB Yi -Vx -DH +yJ +Cj QI QI QI QI QI -Qi -Vx +Gs +yJ Qt Mt Mt @@ -31776,13 +33011,13 @@ St td td nC -QI +xX MY MY MY MY MY -QI +xX VK td td @@ -31950,15 +33185,15 @@ Yi Yi Yi Yi -Vx -DH -ix +yJ +Cj +wr QI QI QI QI -Qi -Vx +Gs +yJ Qt Mt Mt @@ -31973,7 +33208,7 @@ nC Cz xr xr -oQ +ti xr xr Zi @@ -32115,26 +33350,26 @@ bz (138,1,1) = {" wg ft -mT -mT +tG +tG vK -qf -qf -qf -qf -qf +CO +CO +CO +CO +CO ob Dw Pc -dU -dU -mT -mT -mT -mT -mT -mT -mT +jQ +jQ +SE +SE +SE +SE +SE +SE +SE eF Yi qQ @@ -32144,30 +33379,30 @@ qQ qQ qQ Yi -Vx -DH +yJ +Cj QI QI -Is +BC QI -ix +wr OB -Vx +yJ Qt Mt Mt td Ap jA -Tl -Tl +hl +hl jz zc nC Cz ZT bH -oQ +ti bH Db Zi @@ -32176,8 +33411,8 @@ TI FW UY DX -sU -sU +uN +uN EK Mt Mt @@ -32309,19 +33544,19 @@ bz (139,1,1) = {" wg Yy -mT -mT +tG +tG vK -qf -qf -qf -qf -qf -qf +CO +CO +CO +CO +CO +CO Dw -dU -dU -dU +jQ +jQ +jQ kp kp kp @@ -32338,15 +33573,15 @@ qQ qQ qQ Yi -Vx -DH +yJ +Cj QI QI QI QI QI -Qi -Vx +Gs +yJ Qt Mt Mt @@ -32361,7 +33596,7 @@ nC Cz wR wR -oQ +ti wR wR Zi @@ -32503,24 +33738,24 @@ bz (140,1,1) = {" wg Yy -mT -mT +tG +tG vK -Bf +LY Ff Ff Ff -fy -qf +Yz +CO Dw -dU -dU -dU +jQ +jQ +jQ kp Ir -Ff -Ff -Ff +Zh +Zh +Zh fy kp eF @@ -32532,15 +33767,15 @@ qQ qQ qQ Yi -Vx +yJ ro QI -ix +wr QI QI QI kI -Vx +yJ Qt Mt Mt @@ -32552,13 +33787,13 @@ Io td td nC -QI +xX ZQ ZQ ZQ ZQ ZQ -QI +xX kn td td @@ -32697,17 +33932,17 @@ bz (141,1,1) = {" wg Yy -mT -mT +tG +tG vK -po -Yj -Yj -Yj -lP -qf +Na +us +us +us +qG +CO Dw -dU +jQ QK Dz kp @@ -32726,43 +33961,43 @@ qQ qQ qQ Yi -Vx -DH +yJ +Cj QI QI QI QI -Is -Qi -Vx +BC +Gs +yJ Qt -yQ -yQ -yQ +Wt +Wt +Wt td MH sA zQ kc -QI -QI -QI -QI +xX +xX +xX +xX nC wf hs -QI -QI -QI -QI +xX +xX +xX +xX pD lh uK td td -yQ -yQ -yQ +Wt +Wt +Wt Qt Yi Yi @@ -32891,17 +34126,17 @@ bz (142,1,1) = {" wg Yy -mT -mT +tG +tG vK -po -Yj -Yj -Yj -lP -qf +Na +us +us +us +qG +CO Dw -dU +jQ EB Dz kp @@ -32920,7 +34155,7 @@ qQ qQ qQ Yi -Vx +yJ hb Oc QI @@ -32928,7 +34163,7 @@ mt QI LP kb -Vx +yJ Qt Mt Mt @@ -33085,17 +34320,17 @@ bz (143,1,1) = {" wg Yy -mT -mT +tG +tG vK -po -Yj -Yj -Yj -lP -qf +Na +us +us +us +qG +CO Dw -dU +jQ EB Dz kp @@ -33114,15 +34349,15 @@ qQ qQ qQ Yi -Vx +yJ QI -YI -SL +AI +mp Ps Vt lS In -Vx +yJ Qt Mt Mt @@ -33279,17 +34514,17 @@ bz (144,1,1) = {" wg Yy -mT -mT +tG +tG vK -po -Yj -Yj -Yj -lP -qf +Na +us +us +us +qG +CO Dw -dU +jQ EB Dz kp @@ -33308,15 +34543,15 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx +yJ +yJ +yJ +yJ +yJ MV MV MV -Vx +yJ Qt wK Sx @@ -33473,17 +34708,17 @@ bz (145,1,1) = {" wg Yy -mT -mT +tG +tG vK Pr zA zA zA MZ -qf +CO Dw -dU +jQ kg Dz kp @@ -33494,32 +34729,32 @@ Yj lP kp eF -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Qk -Qk -Qk -Vx -yR -Vx -Vx -Vx -yR +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +eL +eL +eL +yJ +iL +yJ +yJ +yJ +iL hp -FL -FL -FL +NZ +NZ +NZ Tl Tl Tl @@ -33531,14 +34766,14 @@ Tl Tl Tl Tl -FL +NZ Zr FN at yR -Vx -Vx -Vx +Sj +Sj +Sj yR Yi Yi @@ -33667,40 +34902,40 @@ bz (146,1,1) = {" wg Yy -mT -mT +tG +tG vK -qf -qf -qf -qf -qf -qf +CO +CO +CO +CO +CO +CO Dw -dU -dU -dU +jQ +jQ +jQ kp Vs -zA -zA +hJ +hJ ng II kp eF -Vx -QI -QI +sB +lI +lI PV -QI -QI -QI -QI +lI +lI +lI +lI PV -QI -QI -QI -Vx +lI +lI +lI +sB xI QI QI @@ -33733,7 +34968,7 @@ Lx ie Iq wA -Vx +Sj Yi Yi Yi @@ -33861,8 +35096,8 @@ bz (147,1,1) = {" wg Yy -mT -mT +tG +tG OW oh oh @@ -33871,9 +35106,9 @@ oh XV pI Dw -dU -dU -dU +jQ +jQ +jQ kp Yr Yr @@ -33882,19 +35117,19 @@ kp kp kp eF -Vx -QI -QI -QI -QI -QI -QI -QI -QI -QI -QI -QI -Vx +sB +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +sB Qu QI QI @@ -33911,12 +35146,12 @@ Tl Tl Tl aH -Vx +yJ HR HR HR -Vx -Vx +yJ +Sj Zn Zn Zn @@ -33927,7 +35162,7 @@ dX ie ie Jz -Vx +Sj Yi Yi Yi @@ -34076,25 +35311,25 @@ ym ym ym Vx -Vx +sB Zu -QI -Vx -Vx -Vx -Vx -Vx -Vx -Vx -QI +lI +sB +sB +sB +sB +sB +sB +sB +lI xj -Vx +sB jX QI QI nZ QI -YE +SC QI QI Zv @@ -34104,7 +35339,7 @@ cS yF Jc yE -GZ +Dt md Qk VZ @@ -34121,7 +35356,7 @@ fA ie ie pQ -Vx +Sj Yi Yi Yi @@ -34248,8 +35483,8 @@ bz "} (149,1,1) = {" wg -Dz -dU +fN +OD uJ Ou mr @@ -34257,9 +35492,9 @@ mr mr mr uf -Dz +fN GT -hk +zS yb yb yb @@ -34270,52 +35505,52 @@ nO nO QL eF -Vx -QI -QI -Vx +sB +lI +lI +sB FB YH YH YH mJ -Vx -QI -QI -Vx -oc -oc -oc -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +sB +lI +lI +sB +Vr +Vr +Vr +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ Zu -QI -QI -QI +lI +lI +lI xj -Vx -Vx -Vx +Sj +Sj +Sj IA -Zn +Ln Kd -Vx -Vx +Sj +Sj MM -Vx -Vx -Vx +Sj +Sj +Sj Yi Yi Yi @@ -34442,8 +35677,8 @@ bz "} (150,1,1) = {" wg -Dz -dU +fN +OD eu IU XZ @@ -34451,7 +35686,7 @@ XZ XZ XZ zC -Dz +fN GT Dx qf @@ -34464,41 +35699,41 @@ qf qf tp eF -Vx -QI -QI -Vx +sB +lI +lI +sB XD JN KU KU KU BH -QI -QI -Vx -Vx +lI +lI +sB Vx Vx Vx +AK Ic -rT +gx HP -Vx +PT Ej Ej -Vx +PT KR zU dg Xq Nt -QI -QI -QI -QI -QI -Vx +lI +lI +lI +lI +lI +Sj Zn tt Wd @@ -34508,7 +35743,7 @@ ID Fk ie GL -Vx +Sj Yi Yi Yi @@ -34636,8 +35871,8 @@ bz "} (151,1,1) = {" wg -Dz -dU +fN +OD Wv Hn Hn @@ -34647,7 +35882,7 @@ Hn Hn Hn GT -hk +zS yb Dx qf @@ -34658,41 +35893,41 @@ tp nO QL eF -Vx -QI -QI -Vx +sB +lI +lI +sB XD fr Rj Rj Rj -Rj -QI -QI -Vx +Mf +lI +lI +sB Yi Yi Yi -Vx +AK Ua -rT +gx KZ -Vx +PT LI -QI +Nz WC -QI -QI +Nz +Nz nv UU zX La -QI -QI -QI -QI -OA +lI +lI +lI +lI +jK Zr lv ne @@ -34702,7 +35937,7 @@ ID Py ie Dd -Vx +Sj Yi Yi Yi @@ -34830,11 +36065,11 @@ bz "} (152,1,1) = {" wg -Dz -dU -dU +fN +OD +OD MO -Bf +Hj EP As Wr @@ -34852,40 +36087,40 @@ tp qf on eF -Vx -QI -QI -Vx +sB +lI +lI +sB uA Al Al Al dl -Vx -QI -QI -Vx +sB +lI +lI +sB Yi Yi Yi -Vx +AK NQ -rT +gx su -Vx +PT LI FX -Vx -QI -QI +PT +Nz +Nz Yg zy zX et -QI -QI -QI -QI +lI +lI +lI +lI Lu Zr eG @@ -34896,7 +36131,7 @@ ID Iz ie pX -Vx +Sj Yi Yi Yi @@ -35024,62 +36259,62 @@ bz "} (153,1,1) = {" wg -Dz -dU -Dz +fN +OD +fN Hs po -Xs +Ao rJ zF rJ aw GT hI -GV +TF Dx qf IB Av qf tp -NT -FA +Dr +lk eF -Vx +sB Zu -QI -Vx -Vx -Vx -Vx -Vx -Vx -Vx -QI +lI +sB +sB +sB +sB +sB +sB +sB +lI xj -Vx +sB Yi Yi Yi -Vx +AK Wo -rT +gx pS -Vx +PT fF -QI -Vx +Nz +PT IM DO aT Xq Nt -QI -QI -QI -QI -QI +lI +lI +lI +lI +lI Sy Zn xJ @@ -35090,7 +36325,7 @@ ID Pm ie tR -Vx +Sj Yi Yi Yi @@ -35218,8 +36453,8 @@ bz "} (154,1,1) = {" wg -Dz -dU +fN +OD Cv my po @@ -35240,41 +36475,41 @@ qf qf tp eF -Vx -QI -QI -QI -QI -QI -QI -QI -QI -QI -QI -QI -Vx +sB +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +sB Yi Yi Yi -Vx +AK pG -rT +gx Sg -Vx -Vx +PT +PT WC -Vx -Vx -Vx -Vx -Vx -Vx -QI -QI -QI -QI -QI -OA +PT +PT +PT +PT +PT +PT +lI +lI +lI +lI +lI +jK Zn Zn Zn @@ -35284,7 +36519,7 @@ ID rt ie rp -Vx +Sj Yi Yi Yi @@ -35412,63 +36647,63 @@ bz "} (155,1,1) = {" wg -Dz -dU -Dz +fN +OD +fN Sk po -Xs +Ao rJ zF rJ aw GT hI -GV -GV -GV +TF +TF +TF UZ gq -NT -NT -NT -FA +Dr +Dr +Dr +lk eF -Vx -QI -QI -YE -QI -QI -QI -QI -YE -QI -QI -QI -Vx +sB +lI +lI +Oh +lI +lI +lI +lI +Oh +lI +lI +lI +sB Yi Yi Yi -Vx +AK Vl -rT +gx pw -Vx +PT OP -QI +Nz uu -QI -QI +Nz +Nz GC FS -Vx +PT Zu -QI -QI -QI +lI +lI +lI xj -OA +jK Zn vf vf @@ -35478,7 +36713,7 @@ ID BA ie ie -Vx +Sj Yi Yi Yi @@ -35606,11 +36841,11 @@ bz "} (156,1,1) = {" wg -Dz -dU -dU +fN +OD +OD Dc -Pr +SU oB kS fW @@ -35619,50 +36854,50 @@ Bc GT Bb Bb -aB +wF Bb Bb Bb Bb -aN +pa Bb Bb eF -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB Yi Yi Yi -Vx -Vx +AK +AK bc -Vx -Vx +AK +PT wJ -QI -QI -QI -QI -QI -QI +Nz +Nz +Nz +Nz +Nz +Nz Xk -QI -QI -QI -QI -QI -OA +lI +lI +lI +lI +lI +jK Zr Mz ig @@ -35672,7 +36907,7 @@ Zn Zn Zn Zs -Vx +Sj Yi Yi Yi @@ -35811,16 +37046,16 @@ hi IH BR GT -JH -JH -mT -JH -JH -JH -JH -mT -JH -JH +Ci +Ci +UQ +Ci +Ci +Ci +Ci +UQ +Ci +Ci eF pb pb @@ -35838,25 +37073,25 @@ pb Yi Yi Yi -Vx -Vx -Vx -Vx -Vx +PT +PT +PT +PT +PT zM -QI -QI +Nz +Nz fJ Fa Fa Sa -Vx -QI -QI -QI -QI -QI -OA +PT +lI +lI +lI +lI +lI +jK Zr AO GN @@ -35866,7 +37101,7 @@ Zn Zn Zn Qs -Vx +Sj Yi Yi Yi @@ -35994,62 +37229,62 @@ bz "} (158,1,1) = {" wg -qf -qf -qf -qf -qf -qf -qf -qf -qf -qf +iN +iN +iN +iN +iN +iN +iN +iN +iN +iN GT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +UQ +UQ +UQ +UQ +UQ +UQ +UQ +UQ +UQ +UQ eF pb -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +to +to +to +to +to +to +to +to +to +to +to pb Yi Yi Yi -Vx +PT eM Xp zH -Vx +PT rb -QI -QI +Nz +Nz wB Fa qk Sa -Vx -QI -QI -QI -QI -QI +PT +lI +lI +lI +lI +lI Lu Zn xJ @@ -36060,7 +37295,7 @@ vf Zn Zn dn -Vx +Sj Yi Yi Yi @@ -36211,7 +37446,7 @@ ym ym Vx pb -Vx +to RX RX iv @@ -36221,29 +37456,29 @@ RX iv RX RX -Vx +to pb Yi Yi Yi -Vx +PT tZ BM QS -Vx -Vx +PT +PT WC -Vx -Vx -Vx -Vx -Vx -Vx +PT +PT +PT +PT +PT +PT Zu -QI -QI -QI -QI +lI +lI +lI +lI Sy Zn Zn @@ -36254,7 +37489,7 @@ KA Oz Zn ld -Vx +Sj Yi Yi Yi @@ -36405,7 +37640,7 @@ Yh Yh eF pb -Vx +to iv iv iv @@ -36415,30 +37650,30 @@ iv iv iv iv -Vx +to pb Yi Yi Yi -Vx -OA +PT +PP vr -OA -Vx -QI -QI -QI +PP +PT +Nz +Nz +Nz Ho -Vx +PT BM xs -Vx -QI -QI -QI -QI -QI -OA +PT +lI +lI +lI +lI +lI +jK Zn Zn Zn @@ -36448,7 +37683,7 @@ lZ Oz Zn nx -Vx +Sj Yi Yi Yi @@ -36599,7 +37834,7 @@ Yh Yh eF pb -Vx +to RX RX iv @@ -36609,30 +37844,30 @@ RX iv RX RX -Vx +to pb Yi Yi Yi -Vx -QI -QI +PT +Nz +Nz FX -Vx +PT ac -QI -QI +Nz +Nz Ho -Vx +PT VP xs -Vx -QI -QI -QI -QI -QI -Vx +PT +lI +lI +lI +lI +lI +Sj dZ yy Zn @@ -36642,7 +37877,7 @@ xJ yy nm dI -Vx +Sj Yi Yi Yi @@ -36782,7 +38017,7 @@ tY tY GT uX -tT +nX uX uX uX @@ -36808,35 +38043,35 @@ pb Yi Yi Yi -Vx +PT yi -QI -QI +Nz +Nz WC -QI -QI -QI -QI +Nz +Nz +Nz +Nz Po BM xs -Vx -QI -QI -QI -QI -QI -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +PT +lI +lI +lI +lI +lI +sB +gM +gM +gM +gM +gM +gM +gM +gM +gM +gM Yi Yi Yi @@ -36987,50 +38222,50 @@ Yh Yh eF pb -BK -BK -BK +Ib +Ib +Ib qX Sb -BK +Ib Sb Yk -BK -BK -BK +Ib +Ib +Ib pb pb Yi Yi -Vx -QI -QI +PT +Nz +Nz FX -Vx +PT cK cK cK Yd -Vx +PT IL xs -Vx +PT Zu -QI -QI -QI -QI +lI +lI +lI +lI Mr -Vx +gM RU Lj OL -sU -sU +DA +DA ed Lj RU -Vx +gM Yi Yi Yi @@ -37181,7 +38416,7 @@ Yh Yh eF pb -BK +Ib FC mL wC @@ -37190,41 +38425,41 @@ Ke FC Nb mL -BK -BK +Ib +Ib Qd pb Yi Yi -Vx -OA +PT +PP CH -OA -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -QI -QI -QI -QI -QI -QI +PP +PT +PT +PT +PT +PT +PT +PT +PT +PT +lI +lI +lI +lI +lI +lI HA -sU -sU -sU -sU -sU -sU -sU -sU -Vx +DA +DA +DA +DA +DA +DA +DA +DA +gM Yi Yi Yi @@ -37375,7 +38610,7 @@ Yh Yh eF pb -BK +Ib FC FC wC @@ -37390,35 +38625,35 @@ nq pb Yi Yi -Vx +PT cq BM QS -Vx -ee +PT +MG Vh Vh Vh Vh Vh XG -Vx -QI -QI -QI -QI -QI +sB +lI +lI +lI +lI +lI Ux -Vx +gM cb -sU -Vx +DA +gM wk -Vx +gM bJ -Vx +gM RD -Vx +gM Yi Yi Yi @@ -37559,7 +38794,7 @@ tY GT uX uX -iT +bn uX uX uX @@ -37569,7 +38804,7 @@ Yh Yh eF pb -BK +Ib FC FC wC @@ -37584,35 +38819,35 @@ wQ pb Yi Yi -Vx +PT Tv fZ oN -Vx +PT PK -gZ -QI -QI -QI -QI -Qi -Vx -QI -QI -QI -QI -QI +pO +cX +cX +cX +cX +Aw +sB +lI +lI +lI +lI +lI Ux -Vx +gM nU oj -Vx +gM ak -Vx +gM ak -Vx +gM yL -Vx +gM Yi Yi Yi @@ -37763,7 +38998,7 @@ Yh Yh eF pb -BK +Ib FC FC FC @@ -37778,39 +39013,39 @@ nq pb Yi Yi -Vx -Vx -Vx -Vx -Vx +PT +PT +PT +PT +PT DH -ux -QI +MW +cX ix ix -QI -Qi -Vx +cX +Aw +sB Zu -QI -QI -QI +lI +lI +lI xj -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +sB +gM +gM +gM +gM +gM +gM +gM +gM +gM +gM +mH +mH +mH +mH Yi qQ qQ @@ -37957,7 +39192,7 @@ Yh Yh eF pb -BK +Ib FC En FC @@ -37966,8 +39201,8 @@ FC FC FC En -BK -BK +Ib +Ib tH pb Yi @@ -37976,35 +39211,35 @@ Yi Yi Yi Yi -Vx -ro -QI -iO -QI -QI -QI -kI -Vx -QI -QI -QI -QI -QI -Vx +NM +tq +cX +KT +cX +cX +cX +oo +sB +lI +lI +lI +lI +lI +mH sU sU JX gC IP -Vx +mH aF WV oI -Vx +mH gY xd rZ -Vx +mH Yi qQ qQ @@ -38151,17 +39386,17 @@ Yh Yh eF pb -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib qQ pb Yi @@ -38170,35 +39405,35 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI -QI -QI +cX +cX +cX +cX Is -Qi -Vx -QI -QI -QI -QI -QI +Aw +sB +lI +lI +lI +lI +lI OA Tt sU Fl vS sU -Vx +mH sf dx aY -Vx +mH Bw oQ oQ -Vx +mH Yi qQ qQ @@ -38364,35 +39599,35 @@ Yi Yi Yi Yi -Vx +NM DH -QI +cX ix -QI -QI -QI +cX +cX +cX Aa -Vx -QI -QI -QI -QI -QI +sB +lI +lI +lI +lI +lI Zk sU Qq UL GO SI -Vx +mH Ny JI qb -Vx +mH ww oQ oQ -Vx +mH Yi qQ qQ @@ -38516,26 +39751,26 @@ bz "} (171,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT Qh -yb -yb -yb +MB +MB +MB Hc BS -nO -nO -nO +ZD +ZD +ZD XM eF uw @@ -38558,35 +39793,35 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI -QI -QI -QI -Qi -Lu -QI -QI -QI -QI -QI +cX +cX +cX +cX +cX +Aw +ey +lI +lI +lI +lI +lI Ol sU sU qd vS sU -Vx +mH sf yG VQ -Vx +mH UI oQ CV -Vx +mH Yi qQ qQ @@ -38710,39 +39945,39 @@ bz "} (172,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT -dU -dU -dU +qK +qK +qK GT -WB +Qp Sc Sc GT -dU -dU -dU +qm +qm +qm eF qQ qQ @@ -38752,35 +39987,35 @@ Yi Yi Yi Yi -Vx +NM DH ix -QI -QI -QI -QI -Qi -Sy -QI -QI -QI -QI -QI +cX +cX +cX +cX +Aw +sa +lI +lI +lI +lI +lI Zt sU sU vD Eq iJ -Vx +mH sh vS OO -Vx +mH oQ oQ CV -Vx +mH Yi qQ qQ @@ -38904,38 +40139,38 @@ bz "} (173,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT VV -dU +qK xV GT Sc Sc -Jn +lN GT Bf -mr +UW fY eF qQ @@ -38946,19 +40181,19 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI +cX +cX Is -QI +cX ix -OB -Vx +gv +sB Zu -QI -QI -QI +lI +lI +lI xj GE sU @@ -38966,15 +40201,15 @@ sU sU sU sU -Vx +mH ck sU fK -Vx +mH oQ oQ CV -Vx +mH Yi qQ qQ @@ -39098,31 +40333,31 @@ bz "} (174,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT -Dz -dU -Dz +xb +qK +xb GT Sc Sc @@ -39130,7 +40365,7 @@ Sc GT XR Xs -aw +kz eF qQ qQ @@ -39140,35 +40375,35 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI -QI -QI -QI -Qi -Vx -QI -QI -QI -QI -QI +cX +cX +cX +cX +cX +Aw +sB +lI +lI +lI +lI +lI OA Tt sU jo sU Ns -Vx -Vx +mH +mH WI -Vx -Vx +mH +mH Vw -Vx -Vx -Vx +mH +mH +mH Yi qQ qQ @@ -39292,39 +40527,39 @@ bz "} (175,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT Pd -dU -dU +qK +qK GT Sc -WB +Qp Sc GT XR Xs -aw +kz eF qQ qQ @@ -39334,34 +40569,34 @@ Yi Yi Yi Yi -Vx -ro -QI +NM +tq +cX ix -QI -QI -QI -kI -Vx -QI -QI -QI -QI -QI +cX +cX +cX +oo +sB +lI +lI +lI +lI +lI OA Tt jo jo jo sU -Vx +mH Px HQ HQ HQ HQ MK -Vx +mH Yi Yi qQ @@ -39486,30 +40721,30 @@ bz "} (176,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT -Dz -dU +xb +qK xV GT Sc @@ -39528,20 +40763,20 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI -QI -QI +cX +cX +cX +cX Is -Qi -Vx -QI -QI -QI -QI -QI +Aw +sB +lI +lI +lI +lI +lI OA Tt sU @@ -39555,7 +40790,7 @@ sU KS sU RT -Vx +mH Yi Yi qQ @@ -39680,39 +40915,39 @@ bz "} (177,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT yI -GV -GV -GV +Fh +Fh +Fh Bd Mc -NT -NT -NT +CX +CX +CX Lq GT -Dz -dU -Dz +xb +qK +xb GT -Jn +lN Sc Sc GT -dU -dU -dU +qm +qm +qm eF qQ qQ @@ -39722,34 +40957,34 @@ Yi Yi Yi Yi -Vx +NM CU -Oc -QI -QI -QI -LP +YN +cX +cX +cX +PX Hz -Vx -QI -QI -QI -QI -QI -Vx +sB +lI +lI +lI +lI +lI +mH hG sU Sn sU sU -sU +pN dw sU sU ZO sU -wu -Vx +TG +mH Yi Yi qQ @@ -39874,27 +41109,27 @@ bz "} (178,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT -Bb -Bb -aB -Bb -Bb -Bb -Bb -aN -Bb -Bb +AX +AX +jM +AX +AX +AX +AX +nD +AX +AX eF ym ym @@ -39916,34 +41151,34 @@ Yi Yi Yi Yi -Vx -QI +NM +Yl YI SL JR SL Hz -QI -Vx -QI -QI -QI -QI -QI -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Yl +sB +lI +lI +lI +lI +lI +mH +mH +mH +mH +mH +mH +mH yu sU sU sU sU Ij -Vx +mH Yi Yi qQ @@ -40068,39 +41303,39 @@ bz "} (179,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT -JH -JH -mT -JH -JH -JH -JH -mT -JH -JH +sc +sc +yc +sc +sc +sc +sc +yc +sc +sc GT tT -vP -Yh +UD +vu GT -CD +vb OZ -CD +vb GT -nz -mT -mT +kB +LH +LH eF qQ qQ @@ -40110,34 +41345,34 @@ Yi Yi Yi Yi -Vx -Vx +NM +NM oc oc oc oc oc -Vx -Vx +NM +sB Zu -QI -QI -QI +lI +lI +lI xj -Vx +mH XW gc qE RY Mx -Vx +mH qI sU sU sU sU Od -Vx +mH Yi Yi qQ @@ -40262,34 +41497,34 @@ bz "} (180,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc GT -uX -vP -Yh +Sr +UD +vu GT OZ -CD +vb OZ GT FG @@ -40304,34 +41539,34 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +Ac +Ac +Ac +Ac +Ac wc -QI -QI -QI -QI -QI -Vx +lI +lI +lI +lI +lI +mH hh Xf xw QW hh -Vx +mH Li sU sU LL sU Zw -Vx +mH Yi Yi qQ @@ -40479,16 +41714,16 @@ ym ym wg Jw -vP -Yh +UD +vu GT -CD +vb LX -CD +vb GT -mT -mT -mT +LH +LH +LH eF qQ qQ @@ -40498,21 +41733,21 @@ Yi Yi Yi Yi -Vx +Ac WK -KU -KU -KU -KU +ny +ny +ny +ny Af rT -rT -QI -QI -QI -QI -QI -Vx +tl +lI +lI +lI +lI +lI +mH ZZ oL gz @@ -40525,7 +41760,7 @@ sU QV sU RH -Vx +mH Yi Yi qQ @@ -40651,38 +41886,38 @@ bz (182,1,1) = {" wg hk -yb -yb -yb -yb -nO -nO -nO -nO -QL +PO +PO +PO +PO +zr +zr +zr +zr +ra GT nz -mT -mT -mT -mT -mT -mT -mT -mT -mT +um +um +um +um +um +um +um +um +um GT iT -vP -Yh +UD +vu GT OZ -CD +vb OZ GT -mT -mT -mT +LH +LH +LH eF qQ qQ @@ -40692,21 +41927,21 @@ Yi Yi Yi Yi -Vx +Ac vm -QI +Tc gQ -QI +Tc sX QO rT -rT -QI -QI -QI -QI -QI -Vx +tl +lI +lI +lI +lI +lI +mH nG HF At @@ -40718,8 +41953,8 @@ sU sU sU sU -wu -Vx +TG +mH Yi Yi qQ @@ -40844,35 +42079,35 @@ bz "} (183,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT nz -mT -mT +um +um vg vg vg vg -mT -mT -mT +um +um +um GT Km -vP -Yh +UD +vu GT -CD +vb OZ -CD +vb GT Pl Pl @@ -40886,34 +42121,34 @@ Yi Yi Yi Yi -Vx +Ac Sq -Rj +Bh ZS OK PN -Vx -Vx -Vx +Ac +Ac +Ac ha Yw Yw Yw qc -Vx -Vx -Vx -cb +Ac +Ac +Ac +Hp sU sU -Vx +mH wh sU sU sU sU RH -Vx +mH Yi Yi qQ @@ -41038,39 +42273,39 @@ bz "} (184,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +um +um +um +bq +bq +bq +bq +um +um +um GT -uX -vP -Yh +Sr +UD +vu GT OZ -CD +vb OZ GT -mT -mT -Ka +LH +LH +Iw eF qQ qQ @@ -41080,34 +42315,34 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +Ac +Ac +Ac +Ac By IE -QI +Tc YE -QI +Tc YE -QI +Tc IE By -Vx +Ac Yp uP Dk -Vx +mH ag pi PJ uL cN Fo -Vx +mH Yi Yi qQ @@ -41232,27 +42467,27 @@ bz "} (185,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT -mT -mT -mT -Ac -sB -sB -yJ -mT +um +um +mG +So +So +So +So +cm vg -mT +um eF ym ym @@ -41274,34 +42509,34 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +Ac +Ac +Ac +Ac +Ac +Ac IE -Vx +Ac IE -Vx +Ac IE -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +mH +mH +mH +mH +mH +mH +mH +mH +mH +mH +mH Yi Yi qQ @@ -41426,39 +42661,39 @@ bz "} (186,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT -mT +um vg -mT -lI -Zn -Zn -mH -mT +Gd +So +So +So +So +cm vg -mT +um GT zi cY -XF +IX GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -41476,13 +42711,13 @@ Yi Yi Yi Yi -Vx +Ac By -Vx +Ac By -Vx +Ac By -Vx +Ac Yi Yi Yi @@ -41620,39 +42855,39 @@ bz "} (187,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT -mT +um vg -mT -lI -Zn -Zn -mH -mT +Gd +So +So +So +So +cm vg -mT +um GT cY yd cY GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -41670,13 +42905,13 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +Ac +Ac +Ac +Ac Yi Yi Yi @@ -41814,7 +43049,7 @@ bz "} (188,1,1) = {" wg -hI +GH GV GV GV @@ -41825,28 +43060,28 @@ NT NT FA GT -mT +um vg -mT -gM -Dm -Dm -Jb -mT -mT -mT +Gd +So +So +So +So +Fd +um +um GT cY eB cY GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -42008,39 +43243,39 @@ bz "} (189,1,1) = {" wg -Bb -Bb +WO +WO aB -Bb -Bb -Bb -Bb +WO +WO +WO +WO aN -Bb -Bb +WO +WO GT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +um +um +um +ei +ei +ei +ei +um +um +um GT cY Cd cY GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -42204,37 +43439,37 @@ bz wg JH JH -mT +xZ JH JH JH JH -mT +xZ JH JH GT -mT -mT -mT +um +um +um vg vg vg vg -mT -mT +um +um Ka GT cY cY cY GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -42396,39 +43631,39 @@ bz "} (191,1,1) = {" wg -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ GT -mT -mT -mT -mT -mT -mT -mT -mT -mT +um +um +um +um +um +um +um +um +um Ka GT cY cY -tw +Wg GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ diff --git a/maps/tether/levels/plains.dmm b/maps/tether/levels/plains.dmm index 3996faa553..5d5905c37c 100644 --- a/maps/tether/levels/plains.dmm +++ b/maps/tether/levels/plains.dmm @@ -62,10 +62,6 @@ /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/exploration_shed) -"p" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/outpost/exploration_shed) "r" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, @@ -93,6 +89,7 @@ /area/tether/outpost/exploration_shed) "B" = ( /obj/effect/floor_decal/rust, +/obj/effect/step_trigger/teleporter/from_plains, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/exploration_shed) "D" = ( @@ -111,11 +108,8 @@ /area/tether/outpost/exploration_shed) "G" = ( /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /obj/structure/cable/green{ icon_state = "0-2" @@ -22851,11 +22845,11 @@ u b "} (118,1,1) = {" +B O -p E -p -p +O +O F t d @@ -23046,10 +23040,10 @@ b "} (119,1,1) = {" B -p -p -p -p +O +O +O +O Y t d @@ -23240,12 +23234,12 @@ b "} (120,1,1) = {" B -p -p -p -p +O +O +O +O j -p +O d d d @@ -23434,12 +23428,12 @@ b "} (121,1,1) = {" B -p -p -p -p +O +O +O +O k -p +O d d w @@ -23628,9 +23622,9 @@ b "} (122,1,1) = {" B -p -p -p +O +O +O M F l @@ -23822,12 +23816,12 @@ b "} (123,1,1) = {" B -p -p -p -p +O +O +O +O j -p +O d w w @@ -24016,12 +24010,12 @@ b "} (124,1,1) = {" B -p -p -p -p +O +O +O +O k -p +O d d w @@ -24210,10 +24204,10 @@ b "} (125,1,1) = {" B -p -p -p -p +O +O +O +O Y t d @@ -24404,7 +24398,7 @@ b "} (126,1,1) = {" B -p +O m G o diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm index 1f67f7e03f..581d985cda 100644 --- a/maps/tether/levels/station1.dmm +++ b/maps/tether/levels/station1.dmm @@ -124,11 +124,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -177,7 +173,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "aq" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "ar" = ( /obj/machinery/computer/teleporter{ @@ -207,12 +203,9 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "au" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/equipment) "av" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, @@ -263,15 +256,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "aB" = ( @@ -353,7 +346,7 @@ /area/security/customs) "aI" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint/science) "aJ" = ( /obj/machinery/light/small{ @@ -377,6 +370,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; id_tag = "engine_electrical_maintenance"; @@ -384,11 +380,10 @@ name = "Electrical Maintenance"; req_access = list(10) }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "aL" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/cryo) "aM" = ( /obj/structure/bed/chair{ @@ -410,7 +405,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled, @@ -431,7 +426,9 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -449,13 +446,8 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "aS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted/exploration, +/area/tether/exploration/staircase) "aT" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, @@ -582,7 +574,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "bf" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/substation/spacecommand) "bg" = ( /obj/machinery/light/small, @@ -666,10 +658,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "bo" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -732,6 +721,9 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"bu" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/station/stairs_one) "bv" = ( /obj/structure/table/steel, /obj/random/action_figure, @@ -761,13 +753,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "EngineEmitterPortWest2"; - name = "Engine Room Blast Doors"; - pixel_x = 25; - req_one_access = list(11,24) - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -824,24 +809,20 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "bC" = ( -/obj/structure/window/reinforced{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/door/window/northright{ - dir = 2; - name = "Atmospherics Hardsuits"; - req_access = list(24) +/obj/machinery/light/small{ + dir = 1 }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/atmos, -/turf/simulated/floor/tiled, -/area/engineering/engine_eva) +/turf/simulated/floor, +/area/constructionsite) "bD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -884,7 +865,9 @@ dir = 1; pixel_y = 32 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "bI" = ( @@ -895,10 +878,6 @@ dir = 8 }, /obj/structure/table/standard, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, /obj/machinery/light{ dir = 8 }, @@ -978,21 +957,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "bW" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/machinery/door/window/northright{ - name = "Engineering Hardsuits"; - req_access = list(11) - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/engineering, +/obj/machinery/suit_storage_unit/engineering, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "bX" = ( @@ -1118,6 +1083,7 @@ /obj/structure/table/reinforced, /obj/item/suit_cooling_unit, /obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "cj" = ( @@ -1148,19 +1114,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "cn" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/southleft{ - name = "Jetpack Storage"; - req_access = list(); - req_one_access = list(11,24) - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/item/tank/jetpack/carbondioxide, +/obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "co" = ( @@ -1182,14 +1136,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Engine Access"; req_one_access = list(11) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_airlock) "ct" = ( @@ -1239,7 +1195,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "cx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/workshop) "cy" = ( /obj/machinery/light, @@ -1291,10 +1247,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -1326,22 +1279,21 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "cE" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" - }, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "secondary_bridge"; + name = "Secondary Bridge" + }, /turf/simulated/floor/plating, /area/bridge/secondary) "cF" = ( @@ -1454,13 +1406,15 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "cP" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; id_tag = "engine_airlock_interior"; name = "Engine Airlock Interior"; req_access = list(11) }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/engine_airlock) "cR" = ( @@ -1543,18 +1497,16 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "cZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; + dir = 2; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/blueshield) "da" = ( @@ -1643,7 +1595,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/civilian) "dg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1775,7 +1727,6 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "dr" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -1783,14 +1734,11 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "ds" = ( @@ -1849,16 +1797,10 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/structure/table/rack/shelf, /obj/machinery/holoposter{ pixel_x = 30 }, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, -/obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "dx" = ( @@ -1926,8 +1868,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "dF" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/shield_gen/external, @@ -1983,11 +1924,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -2023,19 +1960,18 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "dO" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "dP" = ( @@ -2094,14 +2030,14 @@ "dV" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/holoposter{ + pixel_y = -30 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, -/obj/machinery/holoposter{ - pixel_y = -30 +/obj/structure/cable/pink{ + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) @@ -2112,9 +2048,8 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "dX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/crew) "dY" = ( @@ -2134,8 +2069,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 1 }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 28 }, /obj/structure/cable/green{ @@ -2162,15 +2096,15 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "ed" = ( @@ -2440,7 +2374,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/airlock_sensor{ - command = "cycle_interior"; + command = "cycle_int"; dir = 8; id_tag = "gravity_isensor"; master_tag = "gravity_airlock"; @@ -2508,11 +2442,7 @@ /area/engineering/hallway) "eL" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Hard Storage"; - req_access = list(11); - req_one_access = list() - }, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/storage) "eM" = ( @@ -2572,9 +2502,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) "eR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/gravity_lobby) "eS" = ( @@ -2662,11 +2591,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "fa" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/hallway/station/docks) "fb" = ( @@ -2734,11 +2659,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "fh" = ( @@ -2763,19 +2684,21 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "fi" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1379; - id_tag = "engine_airlock_exterior"; - name = "Engine Airlock Exterior"; - req_access = list(11) - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "engine_airlock_exterior"; + name = "Engine Airlock Exterior"; + req_access = list(11) + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_airlock) "fk" = ( @@ -2792,11 +2715,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Hard Storage"; - req_access = list(11); - req_one_access = list() - }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/storage) "fm" = ( @@ -2854,7 +2772,9 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "fv" = ( @@ -2885,7 +2805,7 @@ /turf/simulated/floor/tiled, /area/storage/tools) "fz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/atrium) "fA" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -2979,11 +2899,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "fJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /obj/machinery/air_alarm{ dir = 1; @@ -3014,7 +2930,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "fL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/crew) "fM" = ( /obj/structure/cable{ @@ -3068,8 +2984,7 @@ /turf/simulated/floor/wood, /area/hallway/station/atrium) "fR" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/air_alarm{ @@ -3101,10 +3016,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/staircase) "fU" = ( -/obj/machinery/camera/network/tether{ - dir = 4 - }, -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/hallway/station/docks) "fV" = ( /obj/effect/floor_decal/borderfloor, @@ -3134,6 +3046,12 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) +"fY" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "fZ" = ( /obj/machinery/computer/station_alert/all{ dir = 4 @@ -3187,20 +3105,15 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/hallway) "gf" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA" +/obj/machinery/holoposter{ + pixel_y = -30 }, -/turf/simulated/wall/r_wall, -/area/engineering/engine_room) +/turf/simulated/floor, +/area/constructionsite) "gg" = ( /obj/machinery/computer/supplycomp, /turf/simulated/floor/tiled/dark, @@ -3267,15 +3180,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "gp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_monitoring) "gq" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -3320,7 +3226,7 @@ /turf/simulated/floor, /area/constructionsite) "gu" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) "gv" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -3365,11 +3271,8 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -3399,19 +3302,18 @@ /area/bridge/meeting_room) "gG" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-8" + }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "gI" = ( @@ -3502,7 +3404,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "gS" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/blueshield) "gT" = ( /obj/structure/disposalpipe/segment{ @@ -3516,9 +3418,6 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "gU" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/machinery/door/airlock/multi_tile/glass{ @@ -3526,6 +3425,9 @@ name = "Equipment Prep"; req_one_access = list(19,43,67) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "gV" = ( @@ -3563,10 +3465,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 5 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/security/customs) "gZ" = ( @@ -3621,12 +3520,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "hf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/tether/exploration/staircase) "hg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3640,7 +3535,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/door/firedoor{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -3666,9 +3561,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) "hj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engineering_monitoring) "hk" = ( @@ -3753,10 +3647,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -3766,9 +3657,8 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "hr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "hs" = ( @@ -3834,7 +3724,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "hA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/station/spacecommandmaint) "hB" = ( /obj/structure/disposalpipe/trunk{ @@ -3852,7 +3742,6 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "hC" = ( -/obj/machinery/light/small, /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/atmospherics/portables_connector/fuel{ @@ -3938,14 +3827,10 @@ /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable/green{ +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "hM" = ( @@ -4024,24 +3909,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/constructionsite) -"hU" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/machinery/door/window/northleft{ - name = "Engineering Hardsuits"; - req_access = list(11) - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/engineering, -/turf/simulated/floor/tiled, -/area/engineering/engine_eva) "hV" = ( /obj/structure/cable{ icon_state = "1-4" @@ -4069,7 +3936,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "hY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload_foyer) "hZ" = ( /obj/structure/toilet{ @@ -4144,11 +4011,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "if" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4164,10 +4027,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/engineering/break_room) "ih" = ( @@ -4196,11 +4056,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/camera/network/tether{ dir = 1 }, @@ -4280,20 +4136,16 @@ /turf/simulated/floor/wood, /area/hallway/station/atrium) "ir" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled/white, /area/tether/exploration/showers) "is" = ( @@ -4342,12 +4194,11 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "iy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/customs) "iz" = ( @@ -4372,7 +4223,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "iD" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_cyborg_station) "iE" = ( /obj/machinery/light{ @@ -4453,25 +4304,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"iN" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "ce_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "ce_office" - }, -/turf/simulated/floor, -/area/crew_quarters/heads/chief) "iO" = ( /turf/simulated/floor/wood/broken, /area/maintenance/abandonedlibraryconference) @@ -4548,18 +4380,17 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/window/southright{ - name = "Jetpack Storage"; - req_one_access = list(11,24) - }, /obj/structure/table/rack{ dir = 8; layer = 2.6 }, -/obj/item/tank/jetpack/carbondioxide, /obj/machinery/status_display{ pixel_y = 32 }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/hardsuit/industrial, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "iY" = ( @@ -4612,12 +4443,11 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "jf" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/abandonedlibrary) "jg" = ( /obj/machinery/light, /obj/machinery/newscaster{ - layer = 3.3; pixel_y = -32 }, /obj/effect/floor_decal/borderfloor, @@ -4709,11 +4539,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/random/tech_supply, /obj/random/tech_supply, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -4730,15 +4556,6 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "jr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -4746,6 +4563,8 @@ name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "js" = ( @@ -4797,7 +4616,6 @@ /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/medivac/general) "jv" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4807,6 +4625,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/engineering{ name = "Gravity Generator"; req_access = list(11) @@ -4878,39 +4699,13 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"jC" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/security/checkpoint/science) "jD" = ( /obj/machinery/floodlight, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) "jE" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/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) +/turf/simulated/wall/prepainted/engineering, +/area/engineering/gravity_lobby) "jF" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/cable{ @@ -5080,15 +4875,12 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "jW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/prepainted/command, +/area/bridge/secondary) "jX" = ( /obj/machinery/door/airlock/multi_tile/metal{ - name = "Cryogenic Storage"; - dir = 8 + dir = 8; + name = "Cryogenic Storage" }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5130,16 +4922,15 @@ /area/storage/emergency_storage/emergency4) "ka" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kb" = ( @@ -5192,9 +4983,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -5256,7 +5045,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /obj/machinery/door/airlock/glass/engineering{ name = "Break Room"; req_access = list(10) @@ -5264,7 +5055,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/break_room) "kl" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, /turf/simulated/floor/tiled, @@ -5358,11 +5149,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "kw" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5429,13 +5216,12 @@ /turf/simulated/wall/rshull, /area/shuttle/securiship/cockpit) "kE" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/security/customs) "kF" = ( @@ -5505,16 +5291,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/blueshield) "kL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/engineering_monitoring) -"kM" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock19"; - name = "Engineering Washroom Toilet 1" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/engi_wash) "kN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5568,9 +5346,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/customs) "kR" = ( @@ -5580,19 +5356,8 @@ /turf/simulated/floor/airless, /area/engineering/atmos/backup) "kS" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/engineering/foyer) +/turf/simulated/wall/prepainted/command, +/area/bridge/meeting_room) "kT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5616,15 +5381,13 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/metal/mait{ - name = "Maintenance Access"; - dir = 4 + dir = 4; + name = "Maintenance Access" }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "kX" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "kY" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -5677,9 +5440,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloor{ @@ -5709,18 +5470,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "le" = ( @@ -5927,7 +5688,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "lB" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/station/spacecommandmaint) "lC" = ( /obj/structure/cable{ @@ -5948,18 +5709,16 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "lE" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) "lF" = ( /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -6062,6 +5821,7 @@ pixel_x = 4; pixel_y = -28 }, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lR" = ( @@ -6207,7 +5967,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "md" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/engineering) "mf" = ( /obj/landmark{ @@ -6257,8 +6017,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/medivac/general) "ml" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -6314,7 +6073,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "mt" = ( /obj/effect/floor_decal/borderfloor{ @@ -6484,7 +6243,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "mI" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/gravity_gen) "mJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6551,11 +6310,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "mQ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6622,7 +6377,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "mY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/customs) "mZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -6719,9 +6474,6 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) "nk" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -6732,6 +6484,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "nl" = ( @@ -6763,21 +6518,16 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_one) "nn" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/tether/exploration/showers) "no" = ( @@ -6880,11 +6630,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/random/junk, /obj/random/tool, /obj/random/maintenance/clean, @@ -6981,11 +6727,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) @@ -7048,12 +6790,11 @@ name = "Holdings and Transit"; req_one_access = list(38,63) }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/customs) "nR" = ( @@ -7086,7 +6827,7 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/backup) "nT" = ( /obj/structure/sign/securearea{ @@ -7094,7 +6835,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/engine_smes) "nU" = ( /obj/machinery/power/breakerbox/activated{ @@ -7159,7 +6900,7 @@ /area/tether/exploration/showers) "oc" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d1a1"; name = "interior access button"; @@ -7197,7 +6938,7 @@ /area/ai_upload) "of" = ( /obj/structure/sign/securearea, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload_foyer) "og" = ( /obj/machinery/disposal, @@ -7209,7 +6950,7 @@ /area/engineering/break_room) "oh" = ( /obj/machinery/status_display, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/abandonedlibraryconference) "oi" = ( /obj/machinery/computer/ship/helm{ @@ -7381,14 +7122,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "ox" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/prepainted/engineering, +/area/engineering/engine_airlock) "oy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -7406,18 +7141,17 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, /obj/machinery/light{ dir = 1 }, /obj/machinery/holoplant, +/obj/machinery/power/apc/east_mount{ + req_access = list(); + req_one_access = list(11,67) + }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "oA" = ( @@ -7714,15 +7448,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/engineering) -"pf" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/gravity_gen) "pg" = ( /obj/structure/table/woodentable, /obj/machinery/door/blast/shutters{ @@ -7747,12 +7472,7 @@ /turf/simulated/wall/rshull, /area/shuttle/medivac/general) "pj" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/security/customs) "pk" = ( @@ -7763,12 +7483,11 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "pl" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "pm" = ( @@ -7942,7 +7661,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "pF" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/engine_monitoring) "pG" = ( /obj/machinery/door/firedoor{ @@ -7974,15 +7693,15 @@ /area/bridge/meeting_room) "pK" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "pL" = ( @@ -8003,15 +7722,8 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "pM" = ( -/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/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/hallway) "pN" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; @@ -8196,7 +7908,7 @@ /area/hallway/station/atrium) "qa" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d1a1"; name = "exterior access button"; @@ -8270,13 +7982,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/structure/table/rack/shelf, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, -/obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "qm" = ( @@ -8376,11 +8082,8 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "qv" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/prepainted, +/area/maintenance/abandonedlibraryconference) "qw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8406,7 +8109,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "qx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/gravity_lobby) "qy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -8513,20 +8216,19 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "qL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint/science) "qM" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "qN" = ( @@ -8557,12 +8259,12 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "qQ" = ( @@ -8582,7 +8284,7 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "qT" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/toilet) "qU" = ( /obj/machinery/power/terminal{ @@ -8755,13 +8457,13 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/pink{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "rm" = ( @@ -8863,24 +8565,21 @@ /obj/structure/table/reinforced, /obj/item/folder/white, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 28 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) "ry" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; + dir = 2; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/meeting_room) "rz" = ( @@ -8964,16 +8663,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "rI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineEmitterPortWest2"; - layer = 3.3; - name = "Engine Gas Storage" - }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/backup) "rJ" = ( @@ -9049,10 +8738,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -9212,7 +8898,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "sg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/backup) "sh" = ( /obj/random/trash_pile, @@ -9244,7 +8930,7 @@ /area/engineering/hallway) "sj" = ( /obj/machinery/status_display, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/abandonedlibrary) "sk" = ( /obj/machinery/recharge_station, @@ -9317,7 +9003,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_lobby) "sp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/hallway) "sq" = ( /turf/simulated/floor/tiled, @@ -9341,9 +9027,8 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "st" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/engine_airlock) "sv" = ( @@ -9410,7 +9095,7 @@ /turf/simulated/floor, /area/maintenance/substation/spacecommand) "sA" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/showers) "sB" = ( /obj/machinery/computer/station_alert, @@ -9434,16 +9119,15 @@ req_one_access = list(19,43,67) }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/tether/exploration/showers) "sE" = ( @@ -9486,7 +9170,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock{ name = "Unisex Showers" }, @@ -9669,20 +9355,15 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "te" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 2; + dir = 4; icon_state = "pdoor0"; id = "securiship blast"; name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/general) "tf" = ( @@ -9713,14 +9394,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ name = "SMES Access"; req_access = list(11) }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "ti" = ( @@ -9816,6 +9499,9 @@ "ts" = ( /turf/simulated/floor/wood/broken, /area/maintenance/station/eng_lower) +"tt" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "tu" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -9919,17 +9605,14 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "tG" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/machinery/camera/network/tether{ dir = 9 }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "tH" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -9950,12 +9633,9 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) "tL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/break_room) "tM" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/railing{ dir = 8 }, @@ -9965,6 +9645,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "tN" = ( @@ -9999,6 +9682,9 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; id_tag = "engine_electrical_maintenance"; @@ -10006,7 +9692,6 @@ name = "Electrical Maintenance"; req_access = list(10) }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "tR" = ( @@ -10086,15 +9771,8 @@ /turf/simulated/wall, /area/tether/station/stairs_one) "ua" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/prepainted/exploration, +/area/maintenance/substation/exploration) "ub" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 @@ -10167,21 +9845,13 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "uk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/hallway/station/docks) "ul" = ( @@ -10192,7 +9862,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "um" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/medical, /area/hallway/secondary/escape/medical_escape_pod_hallway) "un" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, @@ -10236,19 +9906,14 @@ /turf/simulated/wall/rshull, /area/shuttle/securiship/general) "ut" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/staircase) "uu" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock20"; - name = "Engineering Washroom Toilet 2" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/engi_wash) +/obj/machinery/light/small, +/turf/simulated/floor, +/area/constructionsite) "uv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10416,7 +10081,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "uO" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/station/abandonedholodeck) "uP" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -10492,7 +10157,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "uT" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/exploration, /area/maintenance/substation/exploration) "uU" = ( /obj/structure/table/reinforced, @@ -10654,6 +10319,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"vk" = ( +/turf/simulated/wall/prepainted/command, +/area/maintenance/substation/spacecommand) "vl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10726,7 +10394,7 @@ /turf/simulated/floor/wood, /area/hallway/station/atrium) "vr" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_airlock) "vs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -10739,25 +10407,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "vu" = ( -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ +/obj/machinery/atmospherics/pipe/zpipe/up/supply, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, +/obj/structure/cable/pink{ icon_state = "16-0" }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "vw" = ( @@ -10781,7 +10445,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "vx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engineering_airlock) "vz" = ( /obj/structure/bed/chair/comfy/beige{ @@ -10820,11 +10484,11 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/gravity_lobby) "vE" = ( /obj/structure/sign/department/engine, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) "vF" = ( /turf/simulated/floor/tiled/eris/dark/violetcorener, @@ -10855,15 +10519,15 @@ /turf/simulated/floor/tiled, /area/security/customs) "vI" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "vJ" = ( @@ -10891,7 +10555,7 @@ /area/storage/emergency_storage/emergency4) "vO" = ( /obj/machinery/status_display, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/break_room) "vP" = ( /obj/structure/toilet{ @@ -10929,7 +10593,6 @@ dir = 8 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_y = -32 }, /obj/machinery/light, @@ -10998,13 +10661,11 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "wa" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock21"; - name = "Engineering Washroom Toilet 3" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/engi_wash) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/constructionsite) "wb" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 @@ -11045,8 +10706,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -11058,7 +10718,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -11269,7 +10929,7 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "wy" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/secondary/hallway) "wz" = ( /obj/structure/window/reinforced, @@ -11282,10 +10942,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -11304,9 +10961,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/hallway/station/docks) "wD" = ( @@ -11338,7 +10993,6 @@ /area/tether/exploration/hallway) "wK" = ( /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/eris/techmaint_panels, @@ -11347,10 +11001,8 @@ /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "wM" = ( -/obj/spawner/window/low_wall/reinforced/full, -/obj/machinery/door/firedoor{ - dir = 1 - }, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/shield_gen) "wN" = ( @@ -11360,8 +11012,7 @@ /obj/fiftyspawner/steel, /obj/fiftyspawner/steel, /obj/fiftyspawner/steel, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -11391,10 +11042,10 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "wR" = ( -/obj/structure/cable/green{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/cable/pink{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "wS" = ( @@ -11460,25 +11111,18 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "wZ" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/machinery/power/sensor{ name = "Powernet Sensor - Exploration Subgrid"; name_tag = "Exploration Subgrid" @@ -11486,11 +11130,17 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, +/obj/structure/cable/pink, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "xa" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -11502,13 +11152,13 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "xc" = ( @@ -11542,12 +11192,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/secondary) "xf" = ( -/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; @@ -11556,6 +11200,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/general) "xg" = ( @@ -11563,7 +11208,7 @@ /turf/simulated/wall/rshull, /area/shuttle/medivac/engines) "xh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/workshop) "xi" = ( /obj/structure/cable/cyan{ @@ -11671,7 +11316,10 @@ dir = 4 }, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -11712,9 +11360,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "xy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_eva) "xz" = ( @@ -11796,11 +11443,7 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "xF" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11856,11 +11499,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "xN" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/hallway/secondary/escape/medical_escape_pod_hallway) +/turf/simulated/wall/r_wall/prepainted, +/area/maintenance/station/eng_lower) "xP" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; @@ -11885,11 +11525,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) @@ -11934,8 +11570,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12036,7 +11671,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "yg" = ( @@ -12111,7 +11748,7 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) "yn" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/heads/chief) "yo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12199,7 +11836,7 @@ /turf/simulated/floor, /area/constructionsite) "yv" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_eva) "yw" = ( /turf/simulated/floor/tiled, @@ -12217,7 +11854,7 @@ dir = 9 }, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -12245,7 +11882,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_starboard_airlock"; name = "interior access button"; @@ -12317,14 +11954,14 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "yF" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/door/airlock/engineering{ name = "Exploration Substation"; req_one_access = list(11,24,43) }, /obj/machinery/door/firedoor/glass, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "yG" = ( @@ -12339,7 +11976,7 @@ /area/maintenance/abandonedlibrary) "yH" = ( /obj/machinery/holoposter, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/constructionsite) "yI" = ( /obj/machinery/power/breakerbox/activated{ @@ -12405,7 +12042,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "yO" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_smes) "yP" = ( /obj/structure/cable{ @@ -12461,12 +12098,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "yT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/hallway/secondary/escape/medical_escape_pod_hallway) "yV" = ( @@ -12551,11 +12184,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "zd" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -12584,7 +12213,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "zh" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/abandonedlibraryconference) "zi" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, @@ -12606,9 +12235,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "zl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/workshop) "zm" = ( @@ -12654,8 +12282,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -12681,9 +12308,6 @@ "zs" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/purple/bordercorner, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -12693,6 +12317,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "zt" = ( @@ -12804,7 +12431,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "zF" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -12812,16 +12438,13 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "zG" = ( -/turf/simulated/wall/r_wall, -/area/storage/emergency_storage/emergency4) +/turf/simulated/wall/r_wall/prepainted/security, +/area/vacant/vacant_restaurant_lower) "zH" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -12863,8 +12486,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/landmark/spawnpoint/latejoin/station/cyborg, @@ -12893,14 +12515,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/secondary) "zM" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/station/eng_lower) "zN" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor, /area/maintenance/substation/engineering) "zO" = ( @@ -12960,20 +12579,12 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "zW" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineEmitterPortWest2"; - layer = 3.3; - name = "Engine Gas Storage" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/atmos/backup) +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/constructionsite) "zX" = ( /obj/effect/floor_decal/rust, -/turf/simulated/floor, +/turf/simulated/wall/prepainted, /area/constructionsite) "zY" = ( /obj/structure/cryofeed{ @@ -12989,9 +12600,6 @@ /area/crew_quarters/sleep/cryo) "zZ" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -13002,6 +12610,9 @@ name = "Contraband and Security holdings"; req_one_access = list(44) }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "Aa" = ( @@ -13076,10 +12687,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/air_alarm{ dir = 8; @@ -13183,20 +12791,13 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) "Ar" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -13238,12 +12839,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "Aw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engineering_airlock) "Ax" = ( @@ -13257,9 +12854,7 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) "Az" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/hallway/station/docks) "AA" = ( @@ -13273,10 +12868,7 @@ /area/maintenance/station/spacecommandmaint) "AC" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/vehicle_old/train/trolley, /turf/simulated/floor/tiled/monotile, /area/engineering/hallway) @@ -13291,24 +12883,21 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) "AE" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 }, -/obj/machinery/door/window/northleft{ - dir = 2; - name = "Atmospherics Hardsuits"; - req_access = list(24) +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "ce_office"; + name = "CE Polarized" }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/atmos, -/turf/simulated/floor/tiled, -/area/engineering/engine_eva) +/obj/effect/paint_stripe/sun, +/turf/simulated/floor, +/area/crew_quarters/heads/chief) "AF" = ( /obj/structure/closet/crate, /obj/random/junk, @@ -13323,15 +12912,14 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "AH" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume/aux, /obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light/small{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/shuttle/securiship/general) "AI" = ( @@ -13349,21 +12937,23 @@ /turf/simulated/floor/tiled, /area/engineering/engine_eva) "AJ" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; id_tag = "gravity_outer"; req_access = list(11) }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "AL" = ( @@ -13580,11 +13170,8 @@ /turf/simulated/floor, /area/constructionsite) "Bh" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -13622,11 +13209,11 @@ /turf/simulated/floor, /area/engineering/storage) "Bl" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Bm" = ( @@ -13683,7 +13270,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Bs" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/tools) "Bt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13796,6 +13383,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/constructionsite) "BG" = ( @@ -13828,7 +13416,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /obj/machinery/door/airlock/glass/engineering{ name = "Break Room"; req_access = list(10) @@ -13837,11 +13427,7 @@ /area/engineering/break_room) "BL" = ( /obj/structure/bed/chair, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13852,17 +13438,20 @@ /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) "BN" = ( -/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0 }, -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/engineering/engineering_airlock) "BO" = ( @@ -13909,6 +13498,9 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "BS" = ( @@ -14020,7 +13612,7 @@ /area/hallway/station/atrium) "BZ" = ( /obj/structure/sign/department/eng, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/foyer) "Ca" = ( /obj/effect/floor_decal/borderfloor{ @@ -14036,7 +13628,7 @@ dir = 8 }, /obj/machinery/airlock_sensor{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 4; id_tag = "gravity_esensor"; master_tag = "gravity_airlock"; @@ -14178,11 +13770,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/staircase) "Cn" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14331,11 +13919,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -14362,41 +13946,39 @@ /turf/simulated/floor/wood, /area/maintenance/abandonedlibrary) "CG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "CH" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" +/obj/structure/cable/green{ + icon_state = "0-2" }, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "secondary_bridge"; + name = "Secondary Bridge" }, /turf/simulated/floor/plating, /area/bridge/secondary) @@ -14406,8 +13988,8 @@ /area/maintenance/abandonedlibrary) "CK" = ( /obj/machinery/door/airlock/multi_tile/metal/mait{ - req_one_access = list(5,67); - dir = 4 + dir = 4; + req_one_access = list(5,67) }, /obj/machinery/door/firedoor/glass, /obj/structure/cable{ @@ -14431,14 +14013,10 @@ "CN" = ( /obj/structure/table/rack, /obj/item/stack/material/cardboard, -/obj/structure/cable/green{ +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/pink{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "CO" = ( @@ -14472,7 +14050,7 @@ /turf/simulated/floor/tiled, /area/security/customs) "CT" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/customs) "CU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -14538,16 +14116,15 @@ /area/bridge/secondary) "Dd" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "De" = ( @@ -14562,6 +14139,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/constructionsite) "Df" = ( @@ -14572,15 +14150,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "Dh" = ( @@ -14596,7 +14174,6 @@ /obj/landmark/spawnpoint/job/chief_engineer, /obj/machinery/button/windowtint{ id = "ce_office"; - layer = 3.3; pixel_x = 26; pixel_y = 29 }, @@ -14633,7 +14210,7 @@ /area/ai_upload) "Dj" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2a1"; name = "exterior access button"; @@ -14664,7 +14241,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_monitoring) "Do" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -14792,15 +14369,14 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Dz" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/security/customs) "DA" = ( @@ -14814,11 +14390,7 @@ /turf/simulated/floor/tiled, /area/security/customs) "DB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/maintenance/station/eng_lower) "DC" = ( @@ -14856,12 +14428,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "DF" = ( @@ -14874,39 +14446,35 @@ /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/medivac/general) "DG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/meeting_room) "DH" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" - }, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "secondary_bridge"; + name = "Secondary Bridge" + }, /turf/simulated/floor/plating, /area/bridge/secondary) "DI" = ( /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28; req_access = list(); req_one_access = list(11,67) }, @@ -14929,20 +14497,16 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "DK" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /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, +/turf/simulated/floor/plating, /area/shuttle/medivac/cockpit) "DM" = ( /obj/machinery/door/window/brigdoor/eastleft{ @@ -15003,11 +14567,7 @@ /turf/simulated/floor/wood/broken, /area/maintenance/abandonedlibraryconference) "DR" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -15144,6 +14704,10 @@ /obj/structure/bed/chair/office/light{ dir = 8 }, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "Ed" = ( @@ -15192,7 +14756,7 @@ /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "Eg" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/exploration, /area/tether/exploration/hallway) "Eh" = ( /obj/structure/bed/chair/comfy/brown{ @@ -15211,12 +14775,8 @@ /turf/simulated/floor/wood, /area/tether/exploration/crew) "Ek" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/engineering/engine_eva) "El" = ( /obj/machinery/computer/aiupload, /obj/structure/window/reinforced{ @@ -15308,7 +14868,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "Eu" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_server_room) "Ev" = ( /obj/structure/cable{ @@ -15407,7 +14967,7 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) "EF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/vacant/vacant_restaurant_lower) "EG" = ( /obj/effect/floor_decal/borderfloor{ @@ -15480,12 +15040,11 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "EK" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "EL" = ( @@ -15498,7 +15057,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "EM" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/abandonedlibrary) "EN" = ( /mob/living/simple_mob/animal/passive/bird/parrot/polly, @@ -15511,9 +15070,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/machinery/holoposter{ dir = 8; pixel_x = 30 @@ -15533,12 +15090,6 @@ /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "ER" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -15547,6 +15098,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/cockpit) "ES" = ( @@ -15584,11 +15136,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -15614,15 +15162,18 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ +/obj/machinery/power/apc/east_mount, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/structure/table/rack/shelf, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Fa" = ( @@ -15717,17 +15268,20 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/constructionsite) "Fn" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ name = "SMES Access"; req_access = list(11) }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "Fo" = ( @@ -15793,9 +15347,8 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "Fv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/foyer) "Fw" = ( @@ -16260,9 +15813,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "Gm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/break_room) "Gn" = ( @@ -16270,18 +15822,10 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "Go" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted, +/area/crew_quarters/toilet) "Gp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/foyer) "Gq" = ( /obj/machinery/light, @@ -16291,7 +15835,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "Gr" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/abandonedlibraryconference) "Gs" = ( /obj/structure/cable/green{ @@ -16403,10 +15947,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/customs) @@ -16442,7 +15983,7 @@ /area/tether/exploration/equipment) "GH" = ( /obj/structure/sign/department/eng, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/hallway/station/atrium) "GI" = ( /obj/effect/floor_decal/borderfloor{ @@ -16568,21 +16109,13 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "GW" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /turf/simulated/floor/plating, /area/hallway/station/docks) "GX" = ( @@ -16600,6 +16133,9 @@ dir = 8 }, /obj/structure/bed/chair/office/light, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "GZ" = ( @@ -16648,14 +16184,12 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "Hd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/window/low_wall/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) "He" = ( @@ -16714,11 +16248,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -16750,11 +16281,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_gen) "Hl" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -16825,9 +16352,6 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "Ht" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -16836,14 +16360,12 @@ name = "Engineering Lockdown"; opacity = 0 }, +/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/engineering/foyer) "Hu" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/polarized/full{ - id = "library_study" - }, +/obj/spawner/window/low_wall/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "Hv" = ( @@ -16911,16 +16433,15 @@ /area/crew_quarters/sleep/engi_wash) "HE" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "HF" = ( @@ -16949,7 +16470,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) "HI" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central1, @@ -17032,8 +16553,11 @@ /obj/machinery/light/flamp/noshade, /turf/simulated/floor/grass, /area/hallway/station/atrium) +"HS" = ( +/turf/simulated/open, +/area/tether/elevator/two) "HV" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) "HW" = ( /obj/structure/cable{ @@ -17147,16 +16671,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "Ij" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted, +/area/tether/station/stairs_one) "Ik" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 5 @@ -17209,11 +16725,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -17303,6 +16815,9 @@ }, /turf/simulated/floor/tiled, /area/bridge/secondary) +"Iy" = ( +/turf/simulated/wall/prepainted/engineering, +/area/engineering/engine_smes) "Iz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/holopad, @@ -17416,14 +16931,10 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "IH" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/secondary/teleporter) "II" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood/broken, /area/maintenance/abandonedlibraryconference) "IJ" = ( @@ -17445,14 +16956,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "IL" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -17462,6 +16965,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/engineering/engineering_airlock) "IM" = ( @@ -17520,15 +17037,15 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "IQ" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "IR" = ( @@ -17580,14 +17097,8 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) -"IU" = ( -/obj/effect/debris/cleanable/blood/oil/streak{ - amount = 0 - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/workshop) "IW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/civilian) "IX" = ( /obj/structure/cable/green{ @@ -17605,12 +17116,8 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "IY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/hallway) "IZ" = ( @@ -17655,14 +17162,13 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) "Jg" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/security/customs) "Jh" = ( @@ -17697,10 +17203,7 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "Jk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -17924,15 +17427,15 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "JH" = ( @@ -17992,9 +17495,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "JN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/hallway/station/atrium) "JO" = ( @@ -18052,11 +17553,7 @@ /turf/simulated/floor/tiled, /area/security/customs) "JR" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -18088,7 +17585,7 @@ /area/crew_quarters/heads/chief) "JV" = ( /obj/structure/sign/warning/secure_area, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/customs) "JW" = ( /obj/structure/cable/green{ @@ -18156,29 +17653,15 @@ /turf/simulated/floor, /area/engineering/storage) "Kc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/staircase) "Kd" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted, +/area/vacant/vacant_restaurant_lower) "Ke" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -18200,9 +17683,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Kf" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/air_alarm{ dir = 1; pixel_y = -22 @@ -18210,6 +17690,9 @@ /obj/machinery/camera/network/tether{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "Kg" = ( @@ -18249,12 +17732,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "Ki" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/hallway/station/docks) "Kj" = ( @@ -18275,11 +17753,8 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "Km" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/random/cutout, -/turf/simulated/floor, -/area/constructionsite) +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/tether/exploration/showers) "Kn" = ( /obj/structure/window/reinforced{ dir = 4 @@ -18321,6 +17796,9 @@ "Kr" = ( /turf/simulated/floor/tiled, /area/tether/station/stairs_one) +"Ks" = ( +/turf/simulated/wall/r_wall/prepainted/medical, +/area/crew_quarters/sleep/cryo) "Kt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18635,12 +18113,10 @@ /area/maintenance/substation/civilian) "KT" = ( /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/random/tech_supply, @@ -18690,21 +18166,6 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"KZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/hallway) "La" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -18716,11 +18177,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "Lc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -18739,13 +18196,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/structure/table/rack/shelf, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, -/obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Lg" = ( @@ -18846,9 +18297,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Lq" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/full/firelocks, /turf/simulated/floor/plating, /area/security/checkpoint/science) "Lr" = ( @@ -18874,7 +18324,7 @@ /turf/simulated/floor, /area/engineering/storage) "Lt" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/sleep/cryo) "Lu" = ( /obj/effect/floor_decal/techfloor/orange{ @@ -18946,7 +18396,7 @@ /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "LC" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/constructionsite) "LD" = ( /obj/machinery/light{ @@ -18966,7 +18416,6 @@ /area/engineering/hallway) "LG" = ( /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, @@ -18977,7 +18426,7 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/engine_monitoring) "LJ" = ( /obj/effect/floor_decal/borderfloor/corner, @@ -19066,16 +18515,9 @@ /obj/random/cutout, /turf/simulated/floor, /area/constructionsite) -"LS" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) +"LU" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "LV" = ( /obj/machinery/sleeper{ dir = 4 @@ -19174,11 +18616,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/carpet, /area/engineering/foyer) "Mf" = ( @@ -19236,7 +18674,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/turf/simulated/floor, +/turf/simulated/wall/prepainted, /area/constructionsite) "Mn" = ( /obj/structure/bed/chair/office/dark, @@ -19283,21 +18721,12 @@ /turf/simulated/floor/tiled, /area/security/customs) "Mr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -19305,6 +18734,8 @@ name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "Ms" = ( @@ -19340,9 +18771,6 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "Mv" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/effect/floor_decal/rust, /obj/random/junk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19351,6 +18779,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/cable/pink{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "Mw" = ( @@ -19370,20 +18801,17 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "My" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "Mz" = ( -/obj/structure/grille, /obj/structure/cable/green, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "ce_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "ce_office"; + name = "CE Polarized" }, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/crew_quarters/heads/chief) "MA" = ( @@ -19445,16 +18873,10 @@ /turf/simulated/floor/tiled, /area/engineering/foyer) "MF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted, +/area/vacant/vacant_restaurant_lower) "MG" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) @@ -19469,8 +18891,7 @@ /turf/simulated/floor/tiled, /area/security/checkpoint/science) "MJ" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor, @@ -19555,20 +18976,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/ai_upload_foyer) "MT" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) "MV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/turf/simulated/floor/plating, /area/tether/exploration/hallway) "MW" = ( /obj/structure/table/reinforced, @@ -19582,18 +19001,12 @@ /obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "MY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/exploration/hallway) +/turf/simulated/wall/prepainted/engineering, +/area/maintenance/station/eng_lower) "MZ" = ( /obj/random/junk, /obj/effect/debris/cleanable/cobweb, @@ -19664,11 +19077,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor, /area/maintenance/substation/civilian) @@ -19718,11 +19127,22 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/debris/cleanable/blood/oil/streak{ - amount = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/engineering/workshop) +/area/engineering/hallway) "No" = ( /obj/machinery/vending/coffee{ dir = 8 @@ -19969,11 +19389,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -20053,12 +19469,12 @@ "NZ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/holoposter{ pixel_y = -30 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "Oa" = ( @@ -20095,10 +19511,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "Of" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/constructionsite) "Og" = ( @@ -20121,19 +19534,11 @@ "Oi" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, /obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "Oj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) "Ok" = ( @@ -20160,7 +19565,6 @@ }, /obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, -/obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical/emt, /obj/item/clothing/head/helmet/space/void/medical/emt, @@ -20170,9 +19574,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hallway/station/docks) "Oo" = ( @@ -20225,7 +19627,7 @@ dir = 4; pixel_y = 8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/stairs_one) "Ov" = ( /obj/machinery/sleep_console{ @@ -20240,11 +19642,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/medivac/general) "Ow" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -20264,11 +19662,7 @@ /obj/machinery/atmospherics/component/binary/pump{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "OA" = ( @@ -20284,9 +19678,7 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "OD" = ( @@ -20309,10 +19701,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ req_access = list(); req_one_access = list(11,67) }, @@ -20536,9 +19925,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, @@ -20577,10 +19964,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -20632,11 +20016,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20766,21 +20146,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"Pt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/hallway) "Pu" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20954,7 +20319,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "PI" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/shaft) "PJ" = ( /obj/structure/cable/green{ @@ -21052,29 +20417,26 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "PU" = ( -/turf/simulated/wall, -/area/engineering/break_room) +/turf/simulated/wall/prepainted, +/area/hallway/station/docks) "PV" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/security/customs) "PW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/secondary) "PX" = ( /obj/landmark/spawnpoint/job/assistant, @@ -21152,11 +20514,8 @@ /area/bridge/secondary/hallway) "Qj" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -21165,8 +20524,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "Qk" = ( -/turf/simulated/wall/r_wall, -/area/hallway/station/atrium) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/maintenance/station/eng_lower) "Ql" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -21180,10 +20539,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/camera/network/tether{ dir = 8 @@ -21351,7 +20707,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "Qy" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/storage) "Qz" = ( /obj/structure/table/woodentable, @@ -21432,7 +20788,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "QI" = ( @@ -21479,7 +20837,6 @@ }, /obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, -/obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical/emt, /obj/item/clothing/head/helmet/space/void/medical/emt, @@ -21499,12 +20856,11 @@ /area/ai_upload) "QR" = ( /obj/machinery/door/airlock/glass_external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/map_helper/airlock/door/int_door, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/general) "QS" = ( @@ -21637,14 +20993,8 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/staircase) "Rh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/foyer) "Ri" = ( /obj/structure/table/glass, /obj/random/medical, @@ -21672,8 +21022,8 @@ /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) "Rm" = ( -/turf/simulated/wall, -/area/crew_quarters/sleep/engi_wash) +/turf/simulated/wall/r_wall/prepainted, +/area/constructionsite) "Rn" = ( /obj/machinery/door/window/westleft{ dir = 4; @@ -21718,7 +21068,7 @@ /area/engineering/hallway) "Rr" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_starboard_airlock"; name = "exterior access button"; @@ -21729,15 +21079,8 @@ /turf/simulated/floor/airless, /area/space) "Rs" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/backup) -"Rt" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/hallway/station/atrium) "Ru" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -21806,11 +21149,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/reagent_dispensers/water_cooler/full{ dir = 8 }, @@ -21918,11 +21257,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/random/tech_supply, /obj/random/tech_supply, /obj/structure/cable/green{ @@ -22080,28 +21415,18 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "Sg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/crew_quarters/sleep/engi_wash) "Sh" = ( /obj/effect/floor_decal/techfloor, /obj/structure/window/reinforced{ @@ -22267,15 +21592,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/carpet, /area/engineering/foyer) "Sy" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2a1"; name = "interior access button"; @@ -22487,8 +21809,7 @@ /turf/space, /area/space) "SU" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -22703,7 +22024,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -22736,15 +22057,15 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "Tp" = ( @@ -22884,6 +22205,12 @@ /obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +"Tz" = ( +/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/full/firelocks, +/obj/machinery/suit_storage_unit/medic, +/turf/simulated/floor/plating, +/area/security/checkpoint/science) "TA" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -22926,11 +22253,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/engineering/hallway) "TD" = ( @@ -23034,9 +22357,7 @@ /area/hallway/station/docks) "TO" = ( /obj/structure/sign/deck1, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "TP" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -23080,6 +22401,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled, /area/engineering/hallway) "TS" = ( @@ -23117,11 +22439,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -23134,19 +22452,15 @@ /turf/simulated/floor/tiled, /area/security/customs) "TY" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /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, +/turf/simulated/floor/plating, /area/shuttle/medivac/general) "TZ" = ( /obj/machinery/tele_projector, @@ -23261,10 +22575,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) "Ul" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/table/reinforced, /obj/machinery/microwave, @@ -23296,10 +22607,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -23334,11 +22642,13 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "Uu" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock{ - id_tag = "bathroomlock7"; - name = "Restroom" + id_tag = "bathroomlock19"; + name = "Engineering Washroom Toilet 1" }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "Uv" = ( @@ -23532,11 +22842,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer's Office" }, @@ -23624,7 +22930,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/hallway) "UT" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload) "UU" = ( /obj/effect/floor_decal/industrial/warning{ @@ -23661,20 +22967,19 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "UX" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/emergency_storage/emergency4) "UY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23894,14 +23199,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) "Vw" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/structure/cable, /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Exploration"; output_attempt = 0 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "Vx" = ( @@ -23929,17 +23234,14 @@ /obj/item/pen{ pixel_y = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "VB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/engineering/engine_gas) "VD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -23999,15 +23301,37 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "VK" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineVent"; - name = "Reactor Vent" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/engineering/engine_room) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "VL" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, @@ -24049,7 +23373,7 @@ /area/crew_quarters/sleep/engi_wash) "VR" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d1a2"; name = "interior access button"; @@ -24060,9 +23384,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "VS" = ( @@ -24087,9 +23408,6 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "VW" = ( -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -24098,14 +23416,15 @@ name = "Engineering Lockdown"; opacity = 0 }, +/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor/plating, /area/engineering/foyer) "VX" = ( /turf/simulated/floor, /area/engineering/engine_gas) "VY" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -24141,7 +23460,7 @@ /area/hallway/station/atrium) "Wa" = ( /obj/structure/sign/deck1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/stairs_one) "Wb" = ( /obj/effect/floor_decal/borderfloor{ @@ -24215,7 +23534,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/maintenance/substation/exploration) "Wj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -24230,16 +23549,15 @@ req_one_access = list(19,43,67) }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "Wl" = ( @@ -24289,15 +23607,9 @@ /turf/simulated/floor, /area/constructionsite) "Wq" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1379; - id_tag = "gravity_inner"; - req_access = list(11) - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -24307,6 +23619,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_inner"; + req_access = list(11) + }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "Wr" = ( @@ -24331,7 +23651,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 8 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled, @@ -24525,10 +23845,7 @@ /area/bridge/secondary) "WO" = ( /obj/structure/flora/pottedplant, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/hallway/station/docks) "WP" = ( @@ -24581,6 +23898,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, +/obj/machinery/light/small, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "WW" = ( @@ -24756,7 +24074,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "Xp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/crew_quarters/sleep/engi_wash) "Xr" = ( /obj/effect/floor_decal/borderfloor{ @@ -24969,11 +24287,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25019,7 +24333,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -25027,13 +24340,16 @@ name = "Engineering Lockdown"; opacity = 0 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/engineering{ name = "Gravity Generator"; req_access = list(11) }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "XO" = ( @@ -25225,8 +24541,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -25234,7 +24549,6 @@ "Yk" = ( /obj/machinery/airlock_sensor/airlock_exterior{ id_tag = "eng_al_ext_snsr"; - layer = 3.3; master_tag = "engine_room_airlock"; pixel_x = -22; req_access = list(10) @@ -25325,13 +24639,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) "Yv" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ +/obj/structure/flora/pottedplant/dead, +/obj/structure/cable/pink{ icon_state = "1-8" }, -/obj/structure/flora/pottedplant/dead, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "Yw" = ( @@ -25454,25 +24768,20 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "YK" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "YL" = ( @@ -25549,23 +24858,22 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "YV" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -25645,7 +24953,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/glass/engineering{ name = "Engine Monitoring Room"; req_access = list(11) @@ -25828,6 +25138,9 @@ }, /turf/simulated/floor, /area/constructionsite) +"Zv" = ( +/turf/simulated/open, +/area/tether/elevator) "Zw" = ( /turf/simulated/mineral/vacuum, /area/mine/explored/upper_level) @@ -25854,11 +25167,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30; req_access = list(); req_one_access = list(11,67) }, @@ -25947,32 +25257,26 @@ /turf/simulated/floor/wood, /area/tether/exploration/crew) "ZI" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" - }, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "secondary_bridge"; + name = "Secondary Bridge" + }, /turf/simulated/floor/plating, /area/bridge/secondary) "ZK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted, +/area/maintenance/abandonedlibrary) "ZL" = ( /obj/structure/table/rack{ dir = 8; @@ -25996,10 +25300,8 @@ /turf/simulated/floor, /area/hallway/station/docks) "ZN" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ alarms_hidden = 1; - name = "south bump"; - pixel_y = -28; req_access = list(); req_one_access = list(11,67) }, @@ -26030,15 +25332,14 @@ /area/storage/tools) "ZP" = ( /obj/structure/sign/department/ai, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload_foyer) "ZQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "ZR" = ( @@ -26115,10094 +25416,17272 @@ /area/space) (1,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (2,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (3,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (4,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (5,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (6,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (7,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (8,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (9,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (10,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (11,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (12,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (13,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (14,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (15,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (16,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (17,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (18,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (19,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (20,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (21,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (22,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (23,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (24,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (25,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (26,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (27,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (28,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (29,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (30,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (31,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (32,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (33,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (34,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (35,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (36,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (37,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (38,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (39,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (40,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (41,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (42,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (43,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(44,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(44,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (45,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (46,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (47,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(48,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(48,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (49,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (50,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (51,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(52,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(52,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(53,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(54,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(55,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(56,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(57,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(58,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(59,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(60,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(61,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(62,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(63,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(64,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(65,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(66,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(67,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(68,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(69,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(70,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +cR +kD +kD +kD +Mb +te +te +Mb +Mb +xo +xo +xo +xo +xo +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(71,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +MB +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +kD +kD +dx +DI +lo +YY +ZR +vF +zy +xo +Tj +xc +Ct +Vq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(72,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +CV +CV +CV +fP +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ER +bO +Du +xi +bG +bG +qD +YQ +vA +xo +gC +It +IC +Vq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(73,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ER +Eq +Bb +MQ +Il +Iv +NT +Il +Il +ji +Tu +rv +eM +xo +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(74,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Mb +Sn +Qs +OE +hK +do +bG +rS +LG +wK +MT +bM +Wu +xo +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(75,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Mb +Mb +Mb +Mb +Mb +Rz +bG +ux +SV +xo +Jf +jm +IC +Vq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(76,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +UK +us +yZ +AH +QR +lE +LG +TM +OW +xo +vB +vB +Is +Vq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(77,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Mh +Mb +cX +NE +Mb +xf +xf +Mb +xf +xo +xo +xo +xo +xo +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(78,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +mY +mY +nH +HO +mY +pj +pj +mY +pj +pj +JV +mY +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(79,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZV +CV +ZV +ZV +ZV +ZV +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +mY +Na +kc +yK +CT +CS +dY +CT +dU +Zq +Mq +lZ +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(80,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +CV +ZZ +ZZ +ZZ +ZZ +CV +CV +CV +CV +CV +CV +CV +CV +CV +CV +CV +ZV +ZV +ZV +CV +ZZ +ZZ +mY +uL +VN +Ui +CT +ac +NY +CT +aW +RR +Mn +lg +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(81,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +aq +aq +aq +aq +aq +gu +gu +gu +gu +gu +gu +gu +ZZ +ZZ +ZZ +ZZ +CV +ZZ +ZZ +ZZ +ZZ +CV +Rr +vx +vx +vx +vx +Aw +Aw +vx +vx +CV +ZZ +ZZ +ZZ +CV +ZZ +ZZ +mY +mY +sb +aH +CT +DM +kQ +CT +cc +Zc +Kn +bF +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(82,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +aq +aq +aq +aq +Sb +Sb +Sb +Sb +Sb +VX +gu +VX +VX +VX +VX +gu +CV +CV +CV +kR +CV +CV +CV +CV +CV +CV +PO +KN +rG +CU +FO +DV +Rp +aJ +vx +CV +ZZ +ZZ +ZZ +CV +ZZ +ZZ +ZZ +mY +Jd +lF +kE +PV +Dz +nQ +iy +Jg +uV +Og +mY +Lh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(83,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +sQ +sQ +sQ +Sb +Sb +Sb +Sb +Sb +Sb +VX +gu +VX +VX +VX +VX +VB +sg +zF +zF +dr +sg +zF +zF +zF +sg +CV +PO +KN +Uv +xP +es +yA +dh +Af +vx +CV +ZZ +ZZ +ZZ +CV +zu +ZZ +ZZ +mY +gY +oO +eX +TX +ii +CT +Ql +eo +JQ +Zt +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(84,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +GA +GA +sQ +FJ +Sb +Sb +Sb +Sb +Sb +VX +VX +VX +VX +VX +VX +nS +Qn +kU +vo +FU +zB +Bc +Bc +FH +sg +sg +Ek +yv +yv +yv +yv +BN +IL +yn +yn +AE +AE +AE +yn +yn +yn +yn +yn +zG +EF +EF +EF +EF +CT +CT +CT +CT +Hx +CT +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(85,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +sQ +sQ +sQ +Sb +Sb +Sb +Sb +Sb +Sb +VX +VX +VX +VX +VX +VX +rI +yS +LN +na +qb +KV +Cy +Ww +Av +pw +Rs +cn +lz +Xt +bW +yv +Kx +Tq +yn +OX +wX +JT +rT +ZX +yn +jh +kg +yn +ZY +ZY +ZY +ZY +MF +Zw +Zw +CT +GC +DA +Tn +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(86,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +aq +aq +Sb +Sb +Sb +aq +Sb +Sb +Sb +Sb +Sb +VX +gu +VX +VX +VX +VX +rI +bx +mm +aa +et +Qu +Av +QM +Ik +Hh +Rs +cn +mN +mN +bW +xy +Cs +en +Mz +IA +yw +VD +ES +Pz +zD +QW +cd +yn +ZY +ZY +ZY +ZY +MF +Zw +Zw +CT +Ea +de +gy +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(87,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +VX +gu +gu +gu +gu +gu +sg +Rs +cV +gv +gx +zi +RN +Ml +un +xx +Rs +cn +mN +mN +bW +xy +jb +Kh +Mz +Lj +JM +Dh +JM +NC +yn +Sc +Pr +yn +ZY +ZY +RC +ZY +MF +Zw +Zw +CT +Ly +Jw +mO +mY +Zw +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +uk +qa +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(88,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +Zw +Zw +Rs +Kg +YZ +YW +FT +wQ +lA +vC +eW +Rs +iX +VT +Wj +bW +xy +SC +gr +Mz +kz +HJ +Ko +Qv +PD +yn +yn +yn +yn +ZY +ZY +tw +RC +MF +Kd +Kd +CT +vH +RS +CT +mY +Zw +ZZ +ZZ +ZZ +zu +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +Ki +SJ +Ki +zu +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(89,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +Zw +Zw +Rs +CC +Ud +Cu +sI +Oz +pr +Im +or +Rs +OM +gj +mE +ug +xy +RU +Xl +Mz +ow +rC +gW +JM +FP +zQ +yn +Nx +MF +ZY +ZY +ZY +RC +MF +iv +iv +PU +ne +Xw +Ii +fU +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +fU +Ki +Ki +jQ +Ki +jo +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} -(53,1,1) = {" +(90,1,1) = {" ZZ ZZ ZZ @@ -36231,6 +42710,84 @@ ZZ ZZ ZZ ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +Zw +Zw +Rs +fd +Zh +wA +cx +cx +cx +cx +cx +cx +DR +JA +Hr +AI +DS +XH +Gs +ex +di +uS +AZ +aV +rf +yn +yn +MF +MF +MF +ng +FM +MF +MF +ng +ng +PU +YT +HX +EL +mo +HP +ve +ve +ve +ri +WZ +VR +xn +uZ +ve +ve +pd +Bi +ef +ve +WZ +oc +Ak +ml +Ki ZZ ZZ ZZ @@ -36317,6 +42874,174 @@ ZZ ZZ ZZ ZZ +"} +(91,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +mr +Zw +PI +PI +Rs +Rs +bX +ZQ +cx +lN +xF +sW +dK +xh +MW +mN +mN +Yc +xy +Gu +xA +Mz +yw +lt +yw +TT +GK +yn +WB +ng +ng +ng +ng +ng +Xn +eF +ng +ng +PU +ia +WC +Bj +nO +gc +FC +FC +Fr +cT +Fr +wC +FC +FC +FC +FC +Re +WY +xU +MO +MO +iQ +ve +ve +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -36343,60 +43068,115 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(54,1,1) = {" +(92,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +PI +Au +IZ +HV +UE +Ve +xh +Vs +co +Dr +wN +xh +ci +mN +mN +VL +xy +jb +wg +yn +dE +mQ +UM +hs +EN +yn +ng +ng +ng +ng +jN +rh +Os +ng +ng +ng +Az +TE +Da +Yd +mo +Cn +ve +ve +ve +HY +ve +ve +ve +QE +ve +ve +tA +ve +On +ve +ve +ve +ve +gL +Ki +ZZ ZZ ZZ ZZ @@ -36482,6 +43262,8 @@ ZZ ZZ ZZ ZZ +"} +(93,1,1) = {" ZZ ZZ ZZ @@ -36510,6 +43292,84 @@ ZZ ZZ ZZ ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +PI +mw +km +HV +UC +vw +xh +iF +co +Dr +bw +xh +eh +hR +hR +WI +xy +jb +zq +yn +yn +yn +yn +yn +yn +yn +ng +ng +ng +ng +rh +rh +ng +yk +rh +rh +Az +Ot +Bn +cb +fU +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +fU +Ki +Ki +Ki +Ki +jo +Ki ZZ ZZ ZZ @@ -36537,60 +43397,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(55,1,1) = {" ZZ ZZ ZZ @@ -36650,6 +43456,8 @@ ZZ ZZ ZZ ZZ +"} +(94,1,1) = {" ZZ ZZ ZZ @@ -36678,10 +43486,69 @@ ZZ ZZ ZZ ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +PI +wV +Ax +nK +ds +oP +xh +QL +co +Dr +pt +xh +zl +Hv +Hv +zl +xh +bH +Nn +hj +NR +if +WQ +FD +KT +kL +XO +ng +ng +ng +rh +rh +Aj +ng +rh +ng +Az +Ot +Bn +Nw +fU ZZ ZZ ZZ ZZ +KD ZZ ZZ ZZ @@ -36695,6 +43562,7 @@ ZZ ZZ ZZ ZZ +KD ZZ ZZ ZZ @@ -36731,60 +43599,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(56,1,1) = {" ZZ ZZ ZZ @@ -36836,6 +43650,8 @@ ZZ ZZ ZZ ZZ +"} +(95,1,1) = {" ZZ ZZ ZZ @@ -36864,6 +43680,64 @@ ZZ ZZ ZZ ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +PI +IZ +Cx +HV +rO +pL +zl +gI +co +Dr +Se +zR +lT +rc +rc +lj +zl +jb +VK +hj +gh +dW +oy +gk +Tc +kL +zf +wk +ng +ng +ng +ng +ng +ng +ng +ng +PU +YR +Bn +Ry +Ki ZZ ZZ ZZ @@ -36925,60 +43799,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(57,1,1) = {" ZZ ZZ ZZ @@ -37024,6 +43844,8 @@ ZZ ZZ ZZ ZZ +"} +(96,1,1) = {" ZZ ZZ ZZ @@ -37052,6 +43874,64 @@ ZZ ZZ ZZ ZZ +yO +yO +yO +tQ +aK +Dn +jr +jr +Mr +jr +jr +gp +vr +cP +vr +vr +Zw +HV +HV +HV +HH +yf +yx +zl +RG +Hg +Dr +XU +Dr +pk +Dr +CP +lj +zl +kt +si +OY +PJ +Al +QI +gk +xK +kL +GQ +tr +ng +Aj +ng +li +ng +ng +ng +GS +ud +ve +Bn +Ry +Ki ZZ ZZ ZZ @@ -37119,60 +43999,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(58,1,1) = {" ZZ ZZ ZZ @@ -37212,6 +44038,8 @@ ZZ ZZ ZZ ZZ +"} +(97,1,1) = {" ZZ ZZ ZZ @@ -37240,6 +44068,64 @@ ZZ ZZ ZZ ZZ +yO +od +re +Vf +Pi +pF +pH +qY +jU +uI +je +gp +uF +PR +KO +vr +Zw +HV +Pg +eK +Wn +fb +rX +bd +Wr +EE +Wt +Wt +gs +Wt +Wt +xR +aP +fO +IM +uR +hj +Gn +iV +Fe +Tl +hP +kL +ng +vU +GS +ng +ng +ng +gP +xJ +ng +ng +YX +ve +Bn +Ry +Ki ZZ ZZ ZZ @@ -37313,60 +44199,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(59,1,1) = {" ZZ ZZ ZZ @@ -37400,6 +44232,8 @@ ZZ ZZ ZZ ZZ +"} +(98,1,1) = {" ZZ ZZ ZZ @@ -37428,6 +44262,78 @@ ZZ ZZ ZZ ZZ +yO +AW +jV +lG +OI +pF +pE +fk +dg +fk +is +gp +UU +rp +cg +vr +Zw +HV +HI +gd +mt +Yh +MA +Bw +kH +yB +Wt +nI +tK +Wt +Wt +nb +nj +Qd +Ce +dq +hj +PG +iu +FQ +zP +tg +kL +ng +iU +rh +QT +ng +ng +ng +ng +ng +ng +PU +WO +Bn +ic +fU +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -37507,60 +44413,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(60,1,1) = {" ZZ ZZ ZZ @@ -37574,6 +44426,8 @@ ZZ ZZ ZZ ZZ +"} +(99,1,1) = {" ZZ ZZ ZZ @@ -37602,6 +44456,65 @@ ZZ ZZ ZZ ZZ +yO +eE +jV +UB +kv +wO +Dk +Eb +DU +Eb +jy +gp +st +fi +st +vr +Zw +HV +Kq +ML +fe +Eo +DY +zl +Qw +uc +Qw +xz +Dr +Dr +GV +Fb +BC +zl +UO +FY +kL +hj +hj +kO +hj +hj +kL +JN +WK +JN +Ij +Ij +Ij +Ij +Ij +Ij +Ij +Ij +IN +Da +LL +fU +Lh ZZ ZZ ZZ @@ -37701,66 +44614,14 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(61,1,1) = {" ZZ ZZ ZZ ZZ ZZ ZZ +"} +(100,1,1) = {" ZZ ZZ ZZ @@ -37789,6 +44650,64 @@ ZZ ZZ ZZ ZZ +yO +lL +DJ +Fc +Gl +pF +fK +qy +uJ +Qf +jg +pF +gR +rV +Yk +ox +Zw +HV +to +ML +fe +mZ +Cj +zl +nr +mn +sl +rE +WJ +Uf +vX +Dr +BC +zl +SC +Iw +Fv +sB +ij +cr +nP +Ga +Gp +Bp +PH +TD +qA +nm +Ck +dj +nh +Qa +RP +Ij +aT +Bn +Ry +Ki ZZ ZZ ZZ @@ -37895,60 +44814,19 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(62,1,1) = {" +(101,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -37966,11 +44844,78 @@ ZZ ZZ ZZ ZZ +yO +xl +ET +fx +oK +pF +bY +Eb +ss +UY +Ua +uh +TL +sN +hH +ox +Zw +HV +AC +ML +fe +Eo +rP +xh +zl +zl +xh +ky +zl +fO +xh +zl +zl +xh +fu +xs +Fv +bs +DZ +uU +Rn +wU +BZ +Br +TQ +Kw +VM +Wd +Kr +Ij +RQ +ev +EX +Ij +Nc +LQ +hX +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ ZZ +Nh ZZ ZZ ZZ @@ -38063,6 +45008,8 @@ ZZ ZZ ZZ ZZ +"} +(102,1,1) = {" ZZ ZZ ZZ @@ -38085,64 +45032,70 @@ ZZ ZZ ZZ ZZ +fP ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(63,1,1) = {" +Zw +yO +oC +ag +hV +vt +pF +Qm +cS +pu +ib +Ul +pF +ZS +Cv +fJ +ox +Zw +HV +oW +ML +fe +Eo +jY +Yt +Yt +Yt +nN +sY +jM +sY +WP +EB +EB +EB +kt +eT +Fv +Dp +wf +Xg +Qh +Tf +VW +EG +TQ +Ah +Ou +yD +aw +Wa +Ij +Ij +Ij +Ij +TJ +Bn +XM +Ki ZZ ZZ ZZ @@ -38249,6 +45202,8 @@ ZZ ZZ ZZ ZZ +"} +(103,1,1) = {" ZZ ZZ ZZ @@ -38271,10 +45226,70 @@ ZZ ZZ ZZ ZZ +CV ZZ ZZ ZZ ZZ +Zw +yO +Iy +nT +Fn +th +LH +hr +hr +Ze +hr +hr +LH +ox +cs +ox +ox +HV +vE +Pu +Tw +fe +Eo +ph +iC +iC +oT +BQ +fe +tS +YL +fB +ct +fB +rD +bL +qw +kB +lw +KP +xw +lW +Mp +YG +GL +HB +IO +Ij +CD +Zn +Kr +qq +bu +FV +Ij +JS +Bn +hd +fU ZZ ZZ ZZ @@ -38283,60 +45298,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(64,1,1) = {" ZZ ZZ ZZ @@ -38435,6 +45396,8 @@ ZZ ZZ ZZ ZZ +"} +(104,1,1) = {" ZZ ZZ ZZ @@ -38457,10 +45420,70 @@ ZZ ZZ ZZ ZZ +CV ZZ ZZ ZZ ZZ +Zw +pM +jB +Gg +TK +wt +rJ +rJ +rJ +BT +rJ +rJ +XA +rJ +uP +rJ +Zj +rJ +TR +bn +WA +LF +yr +eq +nD +XX +Tp +XX +XX +jK +sr +rB +rB +rB +rB +rB +sw +oD +Zm +Vi +PE +ME +oH +Ib +Lp +gn +VZ +Ij +eO +Ow +Kr +qq +bu +FV +Ij +Ot +Bn +ic +fU ZZ ZZ ZZ @@ -38477,60 +45500,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(65,1,1) = {" ZZ ZZ ZZ @@ -38621,6 +45590,8 @@ ZZ ZZ ZZ ZZ +"} +(105,1,1) = {" ZZ ZZ ZZ @@ -38643,9 +45614,71 @@ ZZ ZZ ZZ ZZ +CV ZZ ZZ ZZ +Zw +Zw +pM +Pm +Fk +Tr +ub +np +KJ +np +JY +TW +lO +jL +TW +SW +AO +TW +TW +kd +EC +MP +nR +SH +mu +rq +ln +jS +Qr +Rq +YI +dL +bk +Pn +TC +io +ra +mP +Fv +XR +zH +oQ +gQ +sa +VW +Xx +cf +yP +Ij +Ij +Ij +Ij +tZ +Ij +Ij +Ij +DT +Bn +Ry +Ki +ZZ ZZ ZZ ZZ @@ -38671,61 +45704,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(66,1,1) = {" ZZ +Nh ZZ ZZ ZZ @@ -38756,7 +45736,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -38805,6 +45784,11 @@ ZZ ZZ ZZ ZZ +"} +(106,1,1) = {" +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -38823,6 +45807,71 @@ ZZ ZZ ZZ ZZ +ce +qx +qx +qx +qx +qx +qx +qx +jE +jv +jE +jE +md +xu +md +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +QG +DE +vO +Gm +Gm +BK +Gm +kk +Gm +Gm +tL +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Rh +Sx +Yy +KW +nP +nP +Ht +HN +cf +wd +Bs +WX +ZO +rn +NS +gB +EH +Bs +Ot +Bn +Ry +Ki ZZ ZZ ZZ @@ -38865,60 +45914,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(67,1,1) = {" ZZ ZZ ZZ @@ -38983,6 +45978,10 @@ ZZ ZZ ZZ ZZ +"} +(107,1,1) = {" +ZZ +ZZ ZZ ZZ ZZ @@ -39003,6 +46002,73 @@ ZZ ZZ ZZ ZZ +qx +LO +FZ +FZ +FZ +EV +Yj +DD +mc +Xa +jE +am +NM +zN +Qy +Qb +gX +WW +NQ +pc +FX +JJ +dF +Qy +SZ +ax +Gm +Nv +GU +ae +Ne +wx +HQ +og +tL +BX +Xp +it +Xp +Jr +Xp +tj +Rh +ru +Yy +wz +Zg +Zg +Ht +HN +cf +uf +Bs +RT +AX +aN +PX +PX +EH +Bs +BL +QN +Ry +Ki +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -39013,6 +46079,9 @@ ZZ ZZ ZZ ZZ +GW +Dj +Ki ZZ ZZ ZZ @@ -39059,60 +46128,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(68,1,1) = {" ZZ ZZ ZZ @@ -39157,6 +46172,10 @@ ZZ ZZ ZZ ZZ +"} +(108,1,1) = {" +ZZ +ZZ ZZ ZZ ZZ @@ -39177,6 +46196,70 @@ ZZ ZZ ZZ ZZ +qx +hW +vs +Lb +Lb +Kz +KE +KE +Wv +Uw +jE +Er +Ur +sL +Qy +Qb +pa +WW +NQ +pY +En +En +Kp +Qy +Yz +ax +Gm +td +gJ +XZ +VG +gJ +Fj +cW +tL +Uu +Xp +Uu +Xp +Uu +Xp +Uu +Rh +JF +Me +Lr +Rh +Rh +Gp +bh +cf +QA +Bs +fy +sd +zC +hO +YA +jp +Bs +XV +Ys +hX +fU ZZ ZZ ZZ @@ -39185,13 +46268,19 @@ ZZ ZZ ZZ ZZ +zu ZZ ZZ ZZ ZZ +Ki +pN +Ki ZZ +Nh ZZ ZZ +zu ZZ ZZ ZZ @@ -39253,60 +46342,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(69,1,1) = {" ZZ ZZ ZZ @@ -39331,6 +46366,8 @@ ZZ ZZ ZZ ZZ +"} +(109,1,1) = {" ZZ ZZ ZZ @@ -39353,6 +46390,95 @@ ZZ ZZ ZZ ZZ +qx +qo +dR +XE +QU +zt +eG +yi +vn +hb +jE +pe +NW +nt +Qy +Dv +Dv +Dv +Dv +Ju +Dv +Dv +Dv +eL +la +ax +Gm +SD +CO +FB +up +Yl +kC +kC +gK +bA +mX +Fg +wG +sP +at +at +Sg +Gp +Gp +Gp +Gp +Zw +fz +Dw +cf +Tt +PU +PU +PU +yL +JH +PU +PU +PU +Ro +Bn +cb +fU +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +Ki +bE +Ki +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +Ki ZZ ZZ ZZ @@ -39380,7 +46506,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -39435,6 +46560,8 @@ ZZ ZZ ZZ ZZ +"} +(110,1,1) = {" ZZ ZZ ZZ @@ -39447,60 +46574,114 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(70,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +qx +Zx +RZ +vD +eR +Wq +eR +qx +vY +cy +qx +md +ke +md +Qy +Ep +Dv +Dv +Dv +tC +eA +eA +jq +fl +Ug +sM +tL +ig +CO +pQ +OG +vz +Fj +vi +tL +kw +LX +YJ +vQ +HD +AN +Xo +Sg +Zw +Zw +Zw +Zw +Zw +fz +Wo +IK +py +lv +UH +oo +vh +cj +SX +wn +DP +ve +Bn +XD +mo +Bh +ve +ve +ve +ve +Cw +ve +ve +LD +ve +ve +ve +ve +yj +Sy +xn +LD +ve +ve +pd +Bi +ve +ve +ve +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -39573,21 +46754,9 @@ ZZ ZZ ZZ ZZ +"} +(111,1,1) = {" ZZ -cR -kD -kD -kD -Mb -te -te -Mb -Mb -xo -xo -xo -xo -xo ZZ ZZ ZZ @@ -39609,6 +46778,95 @@ ZZ ZZ ZZ ZZ +mI +mI +mI +qx +JD +bp +Nl +qx +mI +mI +mI +bQ +qm +sh +Qy +YC +JP +Uc +mM +rA +oV +bN +Jk +Qy +Yi +eZ +Gm +Fj +gJ +uv +sG +gJ +Fj +Db +tL +Xp +sH +Xp +Xp +Xp +Xp +Xp +Xp +zM +zM +zM +zM +zM +GH +fm +mv +tz +RW +Ng +vd +ks +sO +RJ +RJ +dM +RJ +jJ +aD +db +yN +FC +rL +FK +FK +tF +Mo +FC +pG +FC +FC +FC +FC +TN +qn +cv +Oo +cv +cv +rH +Ye +ve +SM +ve +Ki ZZ ZZ ZZ @@ -39641,60 +46899,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(71,1,1) = {" ZZ ZZ ZZ @@ -39743,13 +46947,13 @@ ZZ ZZ ZZ ZZ -MB ZZ +"} +(112,1,1) = {" ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -39768,20 +46972,95 @@ ZZ ZZ ZZ ZZ -kD -kD -dx -DI -lo -YY -ZR -vF -zy -xo -Tj -xc -Ct -Vq +mI +Hk +Li +qx +PK +so +Sv +qx +Je +Qt +mI +ya +qm +bQ +Qy +FG +NU +Xu +Ls +Bk +oV +Kb +wu +Qy +ge +ax +Gm +Fj +Fj +jd +Fj +Fj +Fj +Fq +tL +PP +Be +kY +Xp +cL +sh +Qx +wc +Iq +gT +sm +Yp +wc +fz +PB +iH +Vl +EO +VJ +Jy +IR +FN +VJ +MK +Pb +ve +Bn +Ms +EU +QE +ve +fa +Ti +zT +QP +ve +ve +tG +ve +ve +Ti +fa +LM +ve +ve +tG +ve +ve +tA +ve +ve +ve +ve +Ki ZZ ZZ ZZ @@ -39835,60 +47114,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(72,1,1) = {" ZZ ZZ ZZ @@ -39917,6 +47142,8 @@ ZZ ZZ ZZ ZZ +"} +(113,1,1) = {" ZZ ZZ ZZ @@ -39938,11 +47165,99 @@ ZZ ZZ ZZ ZZ -ZV -CV -CV -CV -fP +ZZ +mI +bT +wT +qx +qx +AJ +qx +vD +bT +wT +mI +bQ +qm +bQ +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Ia +Xj +Gm +Pd +No +Hl +ww +hv +Mu +HL +tL +eu +VO +Do +Xp +zd +ej +Vc +Ig +RH +er +uY +VV +VF +fz +In +cf +XB +fz +PU +PU +PU +ZM +PU +PU +PU +PU +Xf +kW +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +fU +Ki +Ki +Ki +Ki +Ki +Ki +Ki +Ki +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -39962,20 +47277,6 @@ ZZ ZZ ZZ ZZ -ER -bO -Du -xi -bG -bG -qD -YQ -vA -xo -gC -It -IC -Vq ZZ ZZ ZZ @@ -40029,66 +47330,14 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(73,1,1) = {" ZZ ZZ ZZ ZZ ZZ ZZ +"} +(114,1,1) = {" ZZ ZZ ZZ @@ -40111,6 +47360,87 @@ ZZ ZZ ZZ ZZ +mI +ea +cz +xX +js +nl +Ca +hy +nw +tP +mI +bQ +qm +bQ +bQ +Ag +bQ +pb +sh +ZL +Fx +Ad +Bu +MY +HV +XN +tL +tL +tL +tL +tL +tL +tL +tL +tL +Xp +Xp +Xp +Xp +UI +Us +Sz +aG +GO +xY +Xm +tR +il +Fi +eJ +XL +BS +fz +qk +lH +NG +wF +pW +RE +wm +LC +PZ +vf +sv +lf +lf +lf +lf +lf +lf +lf +lf +lf +lf +sC +Qg +LC +Qg +MJ +BP +Of ZZ ZZ ZZ @@ -40132,7 +47462,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40156,20 +47485,6 @@ ZZ ZZ ZZ ZZ -ER -Eq -Bb -MQ -Il -Iv -NT -Il -Il -ji -Tu -rv -eM -xo ZZ ZZ ZZ @@ -40215,6 +47530,8 @@ ZZ ZZ ZZ ZZ +"} +(115,1,1) = {" ZZ ZZ ZZ @@ -40223,60 +47540,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(74,1,1) = {" ZZ ZZ ZZ @@ -40291,6 +47554,87 @@ ZZ ZZ ZZ ZZ +mI +wW +yq +yq +yq +Nz +yq +yq +yq +NV +mI +bQ +Wy +ej +dl +Ox +dl +sx +Xs +dl +dl +dl +dl +wB +Oa +JI +Jl +gb +Bv +gb +nY +gb +gb +FW +gb +gb +gb +gb +HW +Pv +qs +Ev +oS +Yx +bR +kT +XS +UL +fz +pZ +dN +eB +fz +Nt +ht +oI +JB +ot +ot +GR +LC +Qg +Ap +Qg +Qg +Qg +fv +Qg +Qg +LC +LC +LC +LC +LC +ZW +GZ +BF +tV +tl +yu +Of ZZ ZZ ZZ @@ -40326,7 +47670,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40350,20 +47693,6 @@ ZZ ZZ ZZ ZZ -Mb -Sn -Qs -OE -hK -do -bG -rS -LG -wK -MT -bM -Wu -xo ZZ ZZ ZZ @@ -40395,6 +47724,8 @@ ZZ ZZ ZZ ZZ +"} +(116,1,1) = {" ZZ ZZ ZZ @@ -40416,61 +47747,89 @@ ZZ ZZ ZZ ZZ +ce +mI +Zp +gV +Uk +Uk +wq +qQ +qQ +SO +rR +mI +zM +zM +zM +zM +jF +zM +zM +zM +zM +zM +zM +zM +zM +Zk +Md +zM +Rx +Ag +bQ +Fx +sh +cm +zM +iz +IW +IW +df +Tb +IW +kX +kX +kX +kX +kX +kX +fz +fz +fz +aQ +dB +hg +SK +SK +SK +SK +SK +SK +SK +LC +LC +LC +Ap +aF +Qg +Qg +Ji +fv +Qg +LC +Jh +fv +Qg +LC +rF +Qg +Mm +Qg +UR +AF +Of ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(75,1,1) = {" ZZ ZZ ZZ @@ -40520,7 +47879,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40544,20 +47902,6 @@ ZZ ZZ ZZ ZZ -Mb -Mb -Mb -Mb -Mb -Rz -bG -ux -SV -xo -Jf -jm -IC -Vq ZZ ZZ ZZ @@ -40574,6 +47918,8 @@ ZZ ZZ ZZ ZZ +"} +(117,1,1) = {" ZZ ZZ ZZ @@ -40596,6 +47942,87 @@ ZZ ZZ ZZ ZZ +mI +We +SY +Ss +UD +Ss +oL +Ss +ys +cH +mI +Zw +Zw +Vp +zM +qm +bQ +zM +Zw +Zw +Vp +Vp +Zw +zM +Jm +zM +zM +zM +zM +zM +zM +zM +zM +zM +Ag +df +Ni +qU +Sa +IW +kX +Zv +Zv +Zv +Zv +kX +fz +ek +Ic +fA +QD +lC +wM +Ar +pm +hi +xa +nf +SK +Vj +MJ +LC +bC +Qg +Qg +Qg +Qg +Qg +fv +LC +Qg +Qg +Qg +LC +Ap +Qg +LC +mf +UR +Vj +Rm ZZ ZZ ZZ @@ -40611,60 +48038,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(76,1,1) = {" ZZ ZZ ZZ @@ -40714,7 +48087,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40738,22 +48110,10 @@ ZZ ZZ ZZ ZZ -UK -us -yZ -AH -QR -lE -LG -TM -OW -xo -vB -vB -Is -Vq ZZ ZZ +"} +(118,1,1) = {" ZZ ZZ ZZ @@ -40776,6 +48136,88 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +Fy +Px +Px +Px +Yu +dS +cH +mI +Zw +Zw +Vp +zM +qm +bQ +zM +Zw +Zw +zM +zM +zM +zM +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +zM +TA +Zf +KS +mj +yI +IW +kX +Zv +Zv +Zv +Zv +kX +fz +sT +Py +EJ +cf +yg +wM +xW +UP +tb +nc +Wc +SK +bS +Wp +LC +Si +Jh +Qg +Qg +fv +Wp +Qg +LC +Qg +Qg +Qg +LC +Ap +uu +LC +Wp +gt +Vj +Rm +Lh ZZ ZZ ZZ @@ -40805,60 +48247,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(77,1,1) = {" ZZ ZZ ZZ @@ -40908,7 +48296,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40919,6 +48306,8 @@ ZZ ZZ ZZ ZZ +"} +(119,1,1) = {" ZZ ZZ ZZ @@ -40932,20 +48321,6 @@ ZZ ZZ ZZ ZZ -Mh -Mb -cX -NE -Mb -xf -xf -Mb -xf -xo -xo -xo -xo -xo ZZ ZZ ZZ @@ -40955,6 +48330,87 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +bK +xp +xp +xp +Ff +dS +cH +mI +Zw +Zw +Vp +zM +qm +bQ +zM +zM +zM +zM +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +Jm +xB +IW +IW +IW +IW +IW +kX +Zv +Zv +Zv +Zv +kX +fz +Tg +Py +pn +cf +fM +dn +nZ +qH +yc +Vx +Jq +SK +UR +yH +LC +Ap +Qg +Qg +bJ +LC +yH +LC +LC +fv +fv +fv +LC +Ap +gf +LC +LC +LC +LC +Rm ZZ ZZ ZZ @@ -40999,60 +48455,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(78,1,1) = {" ZZ ZZ ZZ @@ -41098,11 +48500,12 @@ ZZ ZZ ZZ ZZ +"} +(120,1,1) = {" ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -41121,24 +48524,95 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +bK +xp +xp +Xe +Ff +dS +cH +mI +Zw +Zw +Vp +zM +qm +bQ +zM +zM +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +zM +zM +zM +zM +zM +xB +UX +jD +GX +ym +UX +kX +Zv +Zv +Zv +Zv +kX +fz +Cp +go +SR +cf +Uy +wM +Dx +PM +wo +yd +Jq +jt +KH +nC +De +af +Qg +Qg +Qg +LC +pA +Qg +Qg +Qg +LC +LC +LC +Ap +LC +LC +Qg +GD +Vj +Rm +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ ZZ -mY -mY -nH -HO -mY -pj -pj -mY -pj -pj -JV -mY -mY ZZ ZZ ZZ @@ -41149,7 +48623,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -41193,60 +48666,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(79,1,1) = {" ZZ ZZ ZZ @@ -41275,6 +48694,22 @@ ZZ ZZ ZZ ZZ +"} +(121,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -41283,6 +48718,93 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +bK +xp +xp +xp +Ff +dS +cH +mI +Zw +Zw +Vp +zM +qm +bQ +bQ +zM +bQ +bQ +bQ +bQ +zM +zM +zM +zM +zM +zM +zM +Vp +Vp +Zw +zM +xB +UX +nz +vM +jZ +UX +kX +kX +uW +uW +TO +kX +fz +fz +fz +hp +TH +EI +SK +LW +Cf +al +iG +Jq +SK +jj +Qg +LC +Ap +fv +Qg +Qg +LC +YM +Qg +Qg +Qg +LC +Qg +Qg +Ap +Qg +Mm +Qg +jj +AF +Of +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -41296,14 +48818,6 @@ ZZ ZZ ZZ ZZ -ZV -ZV -CV -ZV -ZV -ZV -ZV -ZV ZZ ZZ ZZ @@ -41320,19 +48834,6 @@ ZZ ZZ ZZ ZZ -mY -Na -kc -yK -CT -CS -dY -CT -dU -Zq -Mq -lZ -mY ZZ ZZ ZZ @@ -41387,60 +48888,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(80,1,1) = {" +(122,1,1) = {" ZZ ZZ ZZ @@ -41463,6 +48912,87 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +Lu +va +va +va +HC +dS +cH +mI +Zw +Zw +zM +zM +qm +bQ +bQ +bQ +bQ +bQ +bQ +zM +zM +Zw +Zw +Vp +Zw +Vp +Zw +Zw +Zw +Zw +zM +xB +UX +uH +QZ +Ay +UX +cM +OA +OA +OA +dz +lU +fh +Qp +wb +KQ +cf +mx +SK +SK +SK +SK +SK +SK +SK +Uj +fv +LC +Pc +Qg +fv +Qg +LC +Qg +aF +Qg +fv +LC +Qg +Qg +cI +tV +wa +tV +zz +mz +Of ZZ ZZ ZZ @@ -41492,41 +49022,12 @@ ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ ZZ -CV -CV -CV -CV -CV -CV -CV -CV -CV -CV -CV -ZV -ZV -ZV -CV ZZ ZZ -mY -uL -VN -Ui -CT -ac -NY -CT -aW -RR -Mn -lg -mY ZZ ZZ ZZ @@ -41581,87 +49082,14 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(81,1,1) = {" -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ +(123,1,1) = {" ZZ ZZ ZZ ZZ ZZ +Nh ZZ ZZ ZZ @@ -41669,58 +49097,100 @@ ZZ ZZ ZZ ZZ -aq -aq -aq -aq -aq -gf -gu -gu -gu -gu -gu -gu -gu ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ ZZ -CV -Rr -vx -vx -vx -vx -Aw -Aw -vx -vx -CV ZZ +mI +We +sZ +FF +FF +FF +FF +FF +Ll +cH +mI +Zw +zM +zM +bQ +qm +bQ +bQ +bQ +bQ +zM +zM +zM +Vp +UT +UT +UT +UT +UT +Eu +Eu +Eu +Eu +Eu +uw +UX +UX +AD +UX +UX +wl +ui +ui +ui +ui +ui +ui +ui +ui +CQ +cf +mx +LC +Qg +Qg +Qg +YM +Qg +Qg +fv +Qg +LC +Fm +LC +LC +LC +LC +LC +LC +zW +LC +LC +fv +Qg +Qg +Qg +zX +Wp +Qg +gt +Of ZZ ZZ -CV ZZ ZZ -mY -mY -sb -aH -CT -DM -kQ -CT -cc -Zc -Kn -bF -mY ZZ ZZ ZZ @@ -41775,60 +49245,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(82,1,1) = {" ZZ ZZ ZZ @@ -41859,63 +49275,14 @@ ZZ ZZ ZZ ZZ -gf -aq -aq -aq -aq -Sb -Sb -Sb -Sb -Sb -VX -gu -VX -VX -VX -VX -gu -CV -CV -CV -kR -CV -CV -CV -CV -CV -CV -PO -KN -rG -CU -FO -DV -Rp -aJ -vx -CV ZZ +"} +(124,1,1) = {" ZZ ZZ -CV ZZ ZZ ZZ -mY -Jd -lF -kE -PV -Dz -nQ -iy -Jg -uV -Og -mY -Lh ZZ ZZ ZZ @@ -41933,6 +49300,93 @@ ZZ ZZ ZZ ZZ +mI +Ku +zv +zv +zv +NJ +zv +zv +zv +Ph +mI +Vp +zM +bQ +tm +Nd +bQ +zM +zM +zM +zM +Zw +Zw +Zw +UT +bz +mD +nG +UT +Eu +pp +tI +Mi +Eu +Sw +zx +Nk +Sj +Ke +Ru +aB +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +ZE +TU +cN +LC +Vj +Vj +Vj +Vj +Vj +KA +AF +Wp +Bg +ll +Qg +Qg +fv +Qg +Jh +Qg +Qg +Qg +LC +Qg +Qg +Qg +Qg +LC +Rm +Rm +Rm +Rm +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -41969,60 +49423,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(83,1,1) = {" ZZ ZZ ZZ @@ -42053,62 +49453,11 @@ ZZ ZZ ZZ ZZ -aq -sQ -sQ -sQ -Sb -Sb -Sb -Sb -Sb -Sb -VX -gu -VX -VX -VX -VX -gu -sg -zF -zF -dr -sg -zF -zF -zF -sg -CV -PO -KN -Uv -xP -es -yA -dh -Af -vx -CV ZZ ZZ ZZ -CV -zu ZZ ZZ -mY -gY -oO -eX -TX -ii -CT -Ql -eo -JQ -Zt -mY ZZ ZZ ZZ @@ -42121,6 +49470,14 @@ ZZ ZZ ZZ ZZ +"} +(125,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -42137,6 +49494,89 @@ ZZ ZZ ZZ ZZ +mI +mI +mI +mI +mI +mI +Qk +Qk +Qk +Qk +Qk +zM +zM +bQ +qm +zM +zM +zM +UT +UT +UT +UT +UT +UT +UT +tW +oe +ew +UT +Eu +Gt +LA +eQ +Eu +Pq +dC +qF +Vu +Vu +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +ca +OR +lC +LC +LC +LC +LC +LC +LC +LC +LC +LC +wD +yo +Lo +fD +Vj +Vj +Vj +Vj +Vj +Wp +LC +kq +Vj +Vj +Qg +LR +Rm +Vp +Vp +Vp +CV +ZZ ZZ ZZ ZZ @@ -42163,60 +49603,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(84,1,1) = {" ZZ ZZ ZZ @@ -42233,7 +49619,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -42247,62 +49632,6 @@ ZZ ZZ ZZ ZZ -VK -GA -GA -sQ -FJ -Sb -Sb -Sb -Sb -Sb -VX -VX -VX -VX -VX -VX -nS -Qn -kU -vo -FU -zB -Bc -Bc -FH -sg -sg -yv -yv -yv -yv -yv -BN -IL -yn -yn -iN -iN -iN -yn -yn -yn -yn -yn -EF -EF -EF -EF -EF -CT -CT -CT -CT -Hx -CT -mY ZZ ZZ ZZ @@ -42335,6 +49664,8 @@ ZZ ZZ ZZ ZZ +"} +(126,1,1) = {" ZZ ZZ ZZ @@ -42357,64 +49688,87 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(85,1,1) = {" ZZ ZZ ZZ ZZ +DB +DB +zM +xL +BE +mq +iw +zM +zM +bQ +qm +zM +Zw +Zw +UT +sK +Rj +Rj +NK +UT +UT +UT +Za +UT +UT +Eu +xQ +Cz +Cc +Eu +JO +Ky +gq +Fo +az +az +ui +OA +OA +OA +dz +ui +Fo +Fo +Fo +Fo +IK +zr +hA +jG +CZ +kF +fF +OJ +OJ +OJ +hT +Zu +Qg +lB +rg +wy +IH +IH +IH +IH +IH +IH +IH +IH +IH +VU +gS +gS +Vp +Vp +Vp ZZ ZZ ZZ @@ -42441,62 +49795,6 @@ ZZ ZZ ZZ ZZ -aq -sQ -sQ -sQ -Sb -Sb -Sb -Sb -Sb -Sb -VX -VX -VX -VX -VX -VX -zW -yS -LN -na -qb -KV -Cy -Ww -Av -pw -Rs -AE -lz -Xt -hU -yv -Kx -Tq -yn -OX -wX -JT -rT -ZX -yn -jh -kg -yn -ZY -ZY -ZY -ZY -EF -Zw -Zw -CT -GC -DA -Tn -mY ZZ ZZ ZZ @@ -42517,7 +49815,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -42551,60 +49848,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(86,1,1) = {" ZZ ZZ ZZ @@ -42615,6 +49858,8 @@ ZZ ZZ ZZ ZZ +"} +(127,1,1) = {" ZZ ZZ ZZ @@ -42633,64 +49878,6 @@ ZZ ZZ ZZ ZZ -aq -aq -aq -Sb -Sb -Sb -aq -Sb -Sb -Sb -Sb -Sb -VX -gu -VX -VX -VX -VX -rI -bx -mm -aa -et -Qu -Av -QM -Ik -Hh -Rs -bC -mN -mN -bW -xy -Cs -en -Mz -IA -yw -VD -ES -Pz -zD -QW -cd -yn -ZY -ZY -ZY -ZY -EF -Zw -Zw -CT -Ea -de -gy -mY ZZ ZZ ZZ @@ -42698,6 +49885,84 @@ ZZ ZZ ZZ ZZ +DB +DB +bQ +jR +bQ +bQ +bQ +nd +mh +zM +bQ +qm +zM +Zw +Zw +UT +Zz +mU +mU +on +UT +fG +Dt +qJ +aZ +Gw +Eu +Eu +UV +Eu +Eu +FL +ui +Fo +Fo +Ld +UA +LU +LU +tt +tt +LU +LU +Fo +Qe +uy +Fo +SF +Bz +AA +lx +lx +lx +AM +RM +bf +bf +bf +bf +bf +bf +ly +TP +IH +YD +ay +Fw +ZD +OZ +hF +OZ +IH +mi +bg +gS +SS +Vp +Vp ZZ ZZ ZZ @@ -42745,60 +50010,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(87,1,1) = {" ZZ ZZ ZZ @@ -42827,65 +50038,6 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -VX -gu -gu -gu -gu -gu -sg -sg -cV -gv -gx -zi -RN -Ml -un -xx -Rs -cn -mN -mN -hU -xy -jb -Kh -Mz -Lj -JM -Dh -JM -NC -yn -Sc -Pr -yn -ZY -ZY -RC -ZY -EF -Zw -Zw -CT -Ly -Jw -mO -mY -Zw ZZ ZZ ZZ @@ -42900,9 +50052,8 @@ ZZ ZZ ZZ ZZ -uk -qa -pM +"} +(128,1,1) = {" ZZ ZZ ZZ @@ -42928,6 +50079,84 @@ ZZ ZZ ZZ ZZ +DB +zU +zU +bQ +bQ +bQ +bQ +bQ +bQ +zM +bQ +qm +zM +zM +Vp +UT +El +RX +Gw +YS +UT +fg +Td +Am +La +Di +hY +WF +tc +Gq +hY +Qo +oN +Fo +Fo +tx +tx +LU +HS +HS +HS +HS +LU +Fo +gZ +el +Fo +ui +Gf +hA +rM +cu +cu +Rl +BM +bf +sz +po +QX +QS +vk +BO +HG +ou +PA +CM +By +Iz +dJ +OZ +OZ +ed +mi +pq +cZ +Vp +Vp +Vp ZZ ZZ ZZ @@ -42939,60 +50168,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(88,1,1) = {" ZZ ZZ ZZ @@ -43021,83 +50196,18 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -Zw -Zw -sg -Kg -YZ -YW -FT -wQ -lA -vC -eW -Rs -iX -VT -Wj -bW -xy -SC -gr -Mz -kz -HJ -Ko -Qv -PD -yn -yn -yn -yn -ZY -ZY -tw -RC -EF -EF -EF -CT -vH -RS -mY -mY -Zw ZZ ZZ ZZ -zu ZZ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ ZZ -Ki -SJ -hf -zu ZZ ZZ ZZ @@ -43133,63 +50243,11 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(89,1,1) = {" ZZ ZZ ZZ +"} +(129,1,1) = {" ZZ ZZ ZZ @@ -43215,84 +50273,84 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -Zw +DB +bv +YH +bQ +bQ +ZA +bQ +bQ +bQ +Jm +bQ +qm +bQ +zM Zw -sg -CC -Ud -Cu -sI -Oz -pr -Im -or -Rs -OM -gj -mE -ug -xy -RU -Xl -Mz -ow -rC -gW -JM -FP -zQ -yn -Nx -EF -ZY -ZY -ZY -RC -EF -iv -iv -jo -ne -Xw -Ii -jo -jo -Sg -Sg -Sg -fU -Rh -Rh -Rh -jo -Sg -Sg -Sg -jo -jo -Sg -jW -jQ -jW -jo -pM +UT +mp +Zb +EA +zj +ez +Vt +cK +Lx +bq +Lg +hD +zE +CX +ku +MR +Wz +cf +Fo +mL +sR +mL +LU +HS +HS +HS +HS +LU +Fo +xT +el +Fo +ui +TB +hA +GJ +QY +jP +xD +Hb +kb +jx +Rv +ov +JR +Pw +qu +dd +IH +XI +mW +vV +vV +qe +Rf +Rf +IH +mi +mi +cZ +Vp +Vp +Vp ZZ ZZ ZZ @@ -43327,60 +50385,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(90,1,1) = {" ZZ ZZ ZZ @@ -43409,84 +50413,6 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -Zw -Zw -sg -fd -Zh -wA -xh -xh -xh -xh -xh -xh -DR -JA -Hr -AI -DS -XH -Gs -ex -di -uS -AZ -aV -rf -yn -yn -EF -EF -EF -ng -FM -EF -EF -ng -ng -jo -YT -HX -EL -mo -HP -ve -ve -ve -ri -WZ -VR -xn -uZ -ve -ve -pd -Bi -ef -ve -WZ -oc -Ak -ml -hf ZZ ZZ ZZ @@ -43514,6 +50440,8 @@ ZZ ZZ ZZ ZZ +"} +(130,1,1) = {" ZZ ZZ ZZ @@ -43521,60 +50449,102 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(91,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +DB +aM +aM +bQ +bQ +bQ +bQ +bQ +bQ +zM +bQ +Wy +hz +zM +Zw +UT +Fa +Uz +Gw +Pe +UT +my +At +uQ +cO +zO +of +Lc +tc +Wf +ZP +RV +cf +sR +Fo +Fo +Fo +LU +HS +HS +HS +HS +LU +Fo +Dq +Ub +Fo +ui +mJ +PW +PW +PW +PW +PW +PW +PW +jW +jW +jW +jW +jW +cB +bo +IH +mB +ar +TZ +yp +MD +Rf +Rf +IH +mi +kK +gS +Vp +Vp +Vp ZZ ZZ ZZ @@ -43603,84 +50573,6 @@ ZZ ZZ ZZ ZZ -gf -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -mr -Zw -PI -PI -sg -sg -bX -ZQ -xh -lN -xF -sW -dK -xh -MW -mN -mN -Yc -xy -Gu -xA -Mz -yw -lt -yw -TT -GK -yn -WB -ng -ng -ng -ng -ng -Xn -eF -ng -ng -jo -ia -WC -Bj -nO -gc -FC -FC -Fr -cT -Fr -wC -FC -FC -FC -FC -Re -WY -xU -MO -MO -iQ -ve -ve -hf ZZ ZZ ZZ @@ -43715,60 +50607,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(92,1,1) = {" ZZ ZZ ZZ @@ -43796,85 +50634,10 @@ ZZ ZZ ZZ ZZ +"} +(131,1,1) = {" +ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -PI -Au -IZ -HV -UE -Ve -xh -Vs -co -Dr -wN -xh -ci -mN -mN -VL -xy -jb -wg -yn -dE -mQ -UM -hs -EN -yn -ng -ng -ng -ng -jN -rh -Os -ng -ng -ng -Az -TE -Da -Yd -EU -Cn -ve -ve -ve -HY -ve -ve -ve -QE -ve -ve -tA -ve -On -ve -ve -ve -ve -gL -hf ZZ ZZ ZZ @@ -43898,6 +50661,90 @@ ZZ ZZ ZZ ZZ +DB +DB +bQ +xI +bQ +bQ +bQ +Ag +qK +zM +bQ +bQ +qm +zM +Zw +UT +Zz +mU +mU +ft +UT +yM +mU +qJ +An +Gw +iD +iD +Ci +iD +iD +pU +cf +uM +Fo +Fo +Fo +LU +HS +HS +HS +HS +LU +Fo +Ie +UA +Fo +SA +wj +KI +ko +IG +IG +IG +IG +Wb +VY +UQ +zp +OF +jW +Zl +Qi +DG +DG +DG +DG +DG +DG +DG +DG +DG +xk +DG +DG +DG +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -43909,60 +50756,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(93,1,1) = {" ZZ ZZ ZZ @@ -43991,84 +50784,6 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -PI -mw -km -HV -UC -vw -xh -iF -Nn -Dr -bw -xh -eh -hR -hR -WI -xy -jb -zq -yn -yn -yn -yn -yn -yn -yn -ng -ng -ng -ng -rh -rh -ng -yk -rh -rh -Az -Ot -Bn -cb -jo -jo -Rh -Rh -Rh -jo -Rh -Rh -Rh -jo -Rh -Rh -jW -jo -jo -Rh -Rh -Rh -Rh -jo -ua ZZ ZZ ZZ @@ -44103,60 +50818,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(94,1,1) = {" ZZ ZZ ZZ @@ -44167,6 +50828,8 @@ ZZ ZZ ZZ ZZ +"} +(132,1,1) = {" ZZ ZZ ZZ @@ -44185,69 +50848,100 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +DB +DB +xN +Ja +Wg +Wl +sy +xN +xN +xN +bQ +ga +zM Zw -PI -wV -Ax -nK -ds -oP -cx -QL -co -Dr -pt -cx -zl -Hv -Hv -zl -cx -bH -xs -hj -NR -if -WQ -FD -KT -kL -XO -ng -ng -ng -rh -rh -Aj -ng -rh -ng -Az -Ot -Bn -Nw -jo +UT +HZ +XW +XW +QQ +UT +UT +UT +Za +UT +UT +iD +Aq +pS +bZ +iD +pU +cf +Fo +Fo +Fo +Fo +LU +LU +LU +LU +LU +LU +Fo +tx +tx +rQ +VE +Em +PW +dc +TS +TS +TS +TS +Ix +TS +fq +Kl +WM +My +Zl +kJ +kS +gF +DX +Ns +mF +mF +tH +BU +YF +mF +mF +mF +ry +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ -KD ZZ ZZ ZZ @@ -44261,7 +50955,6 @@ ZZ ZZ ZZ ZZ -KD ZZ ZZ ZZ @@ -44297,60 +50990,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(95,1,1) = {" ZZ ZZ ZZ @@ -44379,68 +51018,12 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -PI -IZ -Cx -HV -rO -pL -zl -gI -co -Dr -Se -zR -lT -rc -rc -lj -zl -jb -eT -hj -gh -dW -oy -gk -Tc -kL -zf -wk -ng -ng -ng -ng -ng -ng -ng -ng -jo -YR -Bn -Ry -hf ZZ ZZ ZZ ZZ +"} +(133,1,1) = {" ZZ ZZ ZZ @@ -44469,6 +51052,81 @@ ZZ ZZ ZZ ZZ +xN +xN +xN +xN +xN +xN +Zw +xN +SB +ga +zM +zM +UT +UT +UT +UT +UT +UT +UT +ok +Fl +xZ +UT +iD +sF +tY +tX +iD +pU +cf +ui +ui +ui +ui +fY +ui +ui +ui +ui +fY +ui +ui +ui +ui +cf +he +AQ +hq +IP +IP +IP +aj +vm +yC +qC +iP +lR +My +Zl +bD +kS +BA +aR +Ns +mF +mF +mF +mF +Ra +JC +JC +Ra +ry +Vp +Vp ZZ ZZ ZZ @@ -44491,60 +51149,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(96,1,1) = {" ZZ ZZ ZZ @@ -44573,64 +51177,6 @@ ZZ ZZ ZZ ZZ -yO -yO -yO -tQ -aK -Dn -jr -jr -Mr -jr -jr -pF -vr -cP -vr -vr -Zw -HV -HV -HV -HH -yf -yx -zl -RG -Hg -Dr -XU -Dr -pk -Dr -CP -lj -zl -kt -si -OY -PJ -Al -QI -gk -xK -kL -GQ -tr -ng -Aj -ng -li -ng -ng -ng -GS -ud -ve -Bn -Ry -hf ZZ ZZ ZZ @@ -44670,6 +51216,9 @@ ZZ ZZ ZZ ZZ +"} +(134,1,1) = {" +ZZ ZZ ZZ ZZ @@ -44685,60 +51234,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(97,1,1) = {" ZZ ZZ ZZ @@ -44752,6 +51247,81 @@ ZZ ZZ ZZ ZZ +Vp +Vp +Zw +Zw +Zw +Zw +xN +SB +tk +zM +nX +Df +DW +Df +Df +Uh +Uh +UT +Fs +Kv +nE +UT +iD +WR +Vv +Fd +iD +Vn +cf +NI +NI +NI +NI +NI +hJ +hJ +ui +ui +ui +ui +ui +ui +ui +cf +vg +PW +jW +jW +jW +jW +jW +jW +aX +fq +KK +ZB +My +Hc +Jp +RD +YN +LY +bl +bl +wr +bl +oU +pJ +Ex +Xz +MM +ry +Vp +Vp +ZZ ZZ ZZ ZZ @@ -44767,64 +51337,6 @@ ZZ ZZ ZZ ZZ -yO -od -re -Vf -Pi -pF -pH -qY -jU -uI -je -pF -uF -PR -KO -vr -Zw -HV -Pg -eK -Wn -fb -rX -bd -Wr -EE -Wt -IU -gs -Wt -Wt -xR -aP -fO -IM -uR -hj -Gn -iV -Fe -Tl -hP -kL -ng -vU -GS -ng -ng -ng -gP -xJ -ng -ng -YX -ve -Bn -Ry -hf ZZ ZZ ZZ @@ -44879,60 +51391,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(98,1,1) = {" ZZ ZZ ZZ @@ -44952,6 +51410,8 @@ ZZ ZZ ZZ ZZ +"} +(135,1,1) = {" ZZ ZZ ZZ @@ -44961,64 +51421,6 @@ ZZ ZZ ZZ ZZ -yO -AW -jV -lG -OI -pF -pE -fk -dg -fk -is -pF -UU -rp -cg -vr -Zw -HV -HI -gd -mt -Yh -MA -Bw -kH -yB -Wt -nI -tK -Wt -Wt -nb -nj -Qd -Ce -dq -hj -PG -iu -FQ -zP -tg -kL -ng -iU -rh -QT -ng -ng -ng -ng -ng -ng -jo -WO -Bn -ic -jo ZZ ZZ ZZ @@ -45040,6 +51442,79 @@ ZZ ZZ ZZ ZZ +Vp +tE +tE +Zw +Zw +xN +Df +yl +Ba +bV +DO +hw +bm +kn +Dm +in +UT +UT +UT +UT +UT +iD +iD +iD +iD +iD +lm +cf +fQ +ho +ho +ho +ho +SE +PC +ui +Fo +HR +Fo +az +az +rQ +cf +WT +cE +BV +fZ +bb +OK +Po +jW +Jj +fq +BH +wh +My +Zl +sU +kS +Nm +Kt +mF +mF +Bt +Xv +Yf +ba +Xd +Vh +MM +ry +Vp +Vp ZZ ZZ ZZ @@ -45073,60 +51548,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(99,1,1) = {" ZZ ZZ ZZ @@ -45155,65 +51576,6 @@ ZZ ZZ ZZ ZZ -yO -eE -jV -UB -kv -wO -Dk -Eb -DU -Eb -jy -pF -st -fi -st -vr -Zw -HV -Kq -ML -fe -Eo -DY -zl -Qw -uc -Qw -xz -Dr -Dr -GV -Fb -BC -zl -UO -FY -kL -hj -hj -kO -hj -hj -kL -JN -WK -JN -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -IN -Da -LL -jo -Lh ZZ ZZ ZZ @@ -45242,6 +51604,8 @@ ZZ ZZ ZZ ZZ +"} +(136,1,1) = {" ZZ ZZ ZZ @@ -45267,65 +51631,84 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(100,1,1) = {" ZZ ZZ ZZ ZZ ZZ +Vp +tE +tE +Zw +Zw +xN +Df +bi +Sk +Df +Df +zM +tT +eC +Hp +Uh +au +fn +NF +mC +Op +Co +Ty +Gb +zK +au +Uq +cf +qt +hJ +hJ +hJ +hJ +SE +PC +ui +Fo +sR +Fo +ON +UA +Fo +cf +WT +DH +BW +Zo +iT +Zo +Yn +EK +br +fq +Oh +KR +My +Bf +Qi +kS +mF +Kt +mF +mF +qS +mF +Yf +Ra +PN +PN +Ra +ry +Vp +Vp ZZ ZZ ZZ @@ -45349,64 +51732,6 @@ ZZ ZZ ZZ ZZ -yO -lL -DJ -Fc -Gl -pF -fK -qy -uJ -Qf -jg -pF -gR -rV -Yk -vr -Zw -HV -to -ML -fe -mZ -Cj -zl -nr -mn -sl -rE -WJ -Uf -vX -Dr -BC -zl -SC -Iw -Fv -sB -ij -cr -nP -Ga -Gp -Bp -PH -TD -qA -nm -Ck -dj -nh -Qa -RP -tZ -aT -Bn -Ry -hf ZZ ZZ ZZ @@ -45461,60 +51786,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(101,1,1) = {" ZZ ZZ ZZ @@ -45527,6 +51798,8 @@ ZZ ZZ ZZ ZZ +"} +(137,1,1) = {" ZZ ZZ ZZ @@ -45543,64 +51816,6 @@ ZZ ZZ ZZ ZZ -yO -xl -ET -fx -oK -pF -bY -Eb -ss -UY -Ua -uh -TL -sN -hH -vr -Zw -HV -AC -ML -fe -Eo -rP -cx -zl -zl -cx -ky -zl -fO -cx -zl -zl -cx -fu -xs -Fv -bs -DZ -uU -Rn -wU -BZ -Br -TQ -Kw -VM -Wd -Kr -tZ -RQ -ev -EX -tZ -Nc -LQ -hX -hf ZZ ZZ ZZ @@ -45614,8 +51829,80 @@ ZZ ZZ ZZ ZZ -Nh ZZ +Vp +tE +tE +Zw +Zw +xN +Df +Vy +Df +Df +Rk +zM +HM +eC +ts +uN +au +iB +lq +lq +lq +CA +ZG +vZ +GG +au +SQ +cf +iJ +hk +iq +eb +hJ +SE +PC +ui +Fo +mL +Fo +Bx +oa +Fo +cf +qG +CH +Ft +Bd +xe +hu +zL +WN +mT +Dc +jz +tU +IB +Ue +Mx +kS +mF +Kt +mF +mF +xV +eS +Gy +WD +XT +YV +mG +ry +Vp +Vp ZZ ZZ ZZ @@ -45655,60 +51942,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(102,1,1) = {" ZZ ZZ ZZ @@ -45731,70 +51964,10 @@ ZZ ZZ ZZ ZZ -fP ZZ ZZ ZZ ZZ -Zw -yO -oC -ag -hV -vt -pF -Qm -cS -pu -ib -Ul -pF -ZS -Cv -fJ -vr -Zw -HV -oW -ML -fe -Eo -jY -Yt -Yt -Yt -nN -sY -jM -sY -WP -EB -EB -EB -kt -eT -Fv -Dp -wf -Xg -Qh -Tf -VW -EG -TQ -Ah -Ou -yD -aw -Wa -tZ -tZ -tZ -tZ -TJ -Bn -XM -hf ZZ ZZ ZZ @@ -45819,6 +51992,8 @@ ZZ ZZ ZZ ZZ +"} +(138,1,1) = {" ZZ ZZ ZZ @@ -45849,60 +52024,79 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(103,1,1) = {" +Vp +tE +tE +Zw +Zw +xN +xN +xN +xN +xN +xN +xN +lJ +Kk +Uh +eN +au +ql +dw +Le +rK +hl +Ac +QO +Om +au +Jv +KB +vq +le +pV +Tk +hJ +SE +PC +ui +sR +Hy +UA +gZ +el +Fo +cf +qG +DH +gg +Zo +ZC +Zo +lS +pl +Yb +cD +QF +hB +jW +zV +OP +kS +aC +xE +Od +JK +zh +zh +zh +zh +zh +zh +zh +DG +Vp +Vp ZZ ZZ ZZ @@ -45925,70 +52119,10 @@ ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ ZZ -Zw -yO -yO -nT -Fn -th -LH -hr -hr -Ze -hr -hr -LH -vr -cs -vr -vr -HV -vE -Pu -Tw -fe -Eo -ph -iC -iC -oT -BQ -fe -tS -YL -fB -ct -fB -rD -bL -qw -kB -lw -KP -xw -lW -Mp -YG -GL -HB -IO -tZ -CD -Zn -Kr -qq -tZ -FV -tZ -JS -Bn -hd -jo ZZ ZZ ZZ @@ -46043,60 +52177,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(104,1,1) = {" ZZ ZZ ZZ @@ -46106,6 +52186,10 @@ ZZ ZZ ZZ ZZ +"} +(139,1,1) = {" +ZZ +ZZ ZZ ZZ ZZ @@ -46119,70 +52203,10 @@ ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ ZZ -Zw -HV -jB -Gg -TK -wt -rJ -rJ -rJ -BT -rJ -rJ -XA -rJ -uP -rJ -Zj -rJ -TR -bn -WA -LF -yr -eq -nD -XX -Tp -XX -XX -jK -sr -rB -rB -rB -rB -rB -sw -oD -Zm -Vi -PE -ME -oH -Ib -Lp -gn -VZ -tZ -eO -Ow -Kr -qq -tZ -FV -tZ -Ot -Bn -ic -jo ZZ ZZ ZZ @@ -46194,6 +52218,84 @@ ZZ ZZ ZZ ZZ +Vp +tE +tE +tE +Zw +Zw +Zw +Zw +Zw +Zw +Zw +xN +eC +sA +sA +sA +sA +sA +sA +sA +ad +nv +dI +fs +OU +au +Vn +cf +Mg +hJ +hJ +hJ +hJ +Ka +PC +ui +Fo +Hy +UA +xT +el +Fo +cf +qG +ZI +gi +Bm +nx +YO +rx +PW +PW +PW +PW +PW +PW +wy +wy +zh +zh +zh +zh +zh +zh +St +zm +Yr +ey +zw +Gr +Vp +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -46237,60 +52339,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(105,1,1) = {" ZZ ZZ ZZ @@ -46313,70 +52361,9 @@ ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ -Zw -Zw -HV -Pm -Fk -Tr -ub -np -KJ -np -JY -TW -lO -jL -TW -SW -AO -TW -TW -kd -EC -MP -nR -SH -mu -rq -ln -jS -Qr -Rq -YI -dL -bk -Pn -TC -io -ra -mP -Fv -XR -zH -oQ -gQ -sa -kS -Xx -cf -yP -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -DT -Bn -Ry -hf ZZ ZZ ZZ @@ -46393,6 +52380,8 @@ ZZ ZZ ZZ ZZ +"} +(140,1,1) = {" ZZ ZZ ZZ @@ -46404,7 +52393,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -46426,65 +52414,91 @@ ZZ ZZ ZZ ZZ +tE +tE +tE +tE +tE +Zw +Zw +xN +xN +xN +eC +sA +NA +uo +uX +fw +ob +sA +ih +Gi +dI +CL +lQ +au +Fz +cf +pg +RY +RY +RY +RY +Ka +PC +ui +Fo +Hy +UA +LP +ik +Fo +cf +qG +PW +PW +PW +PW +PW +PW +EM +Xc +eY +qE +CE +nM +Gh +qz +Rw +wS +ja +no +qv +kA +zm +zm +kh +EW +Qc +Gr +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(106,1,1) = {" ZZ ZZ ZZ @@ -46506,71 +52520,6 @@ ZZ ZZ ZZ ZZ -ce -qx -qx -qx -qx -qx -qx -qx -qx -jv -qx -qx -md -xu -md -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -QG -DE -vO -Gm -Gm -BK -Gm -kk -Gm -Gm -PU -Rm -Rm -Rm -Rm -Rm -Rm -Rm -Gp -Sx -Yy -KW -nP -nP -Ht -HN -cf -wd -Bs -WX -ZO -rn -NS -gB -EH -Bs -Ot -Bn -Ry -hf ZZ ZZ ZZ @@ -46625,60 +52574,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(107,1,1) = {" +(141,1,1) = {" ZZ ZZ ZZ @@ -46701,70 +52598,86 @@ ZZ ZZ ZZ ZZ -qx -LO -FZ -FZ -FZ -EV -Yj -DD -mc -Xa -qx -am -NM -zN -Qy -Qb -gX -WW -NQ -pc -FX -JJ -dF -Qy -SZ -ax -Gm -Nv -GU -ae -Ne -wx -HQ -og -PU -BX -Rm -it -Rm -Jr -Rm -tj -Gp -ru -Yy -wz -Zg -Zg -Ht -HN -cf -uf -Bs -RT -AX -aN -PX -PX -EH -Bs -BL -QN -Ry -hf +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +tE +tE +tE +tE +tE +tE +tE +xN +PL +tq +Kk +sA +NA +NH +mA +ir +nn +sD +UW +dO +Bl +lq +Dy +au +IE +yy +fH +fH +fH +fH +fH +fH +hJ +ui +rQ +Fo +Fo +Fo +Fo +Fo +IK +xr +ND +fI +ZT +fI +NN +XG +fz +Hi +wL +Pk +Vg +qE +eY +vl +CJ +FS +ee +Eh +qv +Wh +iO +Np +nB +iY +zm +Oj +Vp +Vp ZZ ZZ ZZ @@ -46778,9 +52691,6 @@ ZZ ZZ ZZ ZZ -GW -Dj -gp ZZ ZZ ZZ @@ -46819,60 +52729,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(108,1,1) = {" ZZ ZZ ZZ @@ -46895,70 +52751,6 @@ ZZ ZZ ZZ ZZ -qx -hW -vs -Lb -Lb -Kz -KE -KE -Wv -Uw -qx -Er -Ur -sL -Qy -Qb -pa -WW -NQ -pY -En -En -Kp -Qy -Yz -ax -Gm -td -gJ -XZ -VG -gJ -Fj -cW -PU -kM -Rm -uu -Rm -wa -Rm -Uu -Gp -JF -Me -Lr -Gp -Gp -Gp -bh -cf -QA -Bs -fy -sd -zC -hO -YA -jp -Bs -XV -Ys -hX -jo ZZ ZZ ZZ @@ -46967,21 +52759,17 @@ ZZ ZZ ZZ ZZ -zu ZZ ZZ ZZ ZZ -ox -pN -Ek ZZ -Nh ZZ ZZ -zu ZZ ZZ +"} +(142,1,1) = {" ZZ ZZ ZZ @@ -47009,64 +52797,81 @@ ZZ ZZ ZZ ZZ +Nh ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(109,1,1) = {" +ZZ +tE +tE +tE +tE +ff +xN +xN +ie +eC +TG +sA +NA +Hz +sA +Km +Km +sA +OB +EY +xb +Ee +lV +au +by +SF +lM +rj +rj +rj +rj +Vd +rj +rj +rj +rj +rj +rj +rj +lM +BB +ha +bt +rj +oN +ui +Th +da +fz +wL +Xh +cU +Ts +wL +Xk +Cl +Xk +Xk +Xh +wL +jT +iO +iO +Io +im +ze +zm +Oj +Vp +Vp ZZ ZZ ZZ @@ -47089,95 +52894,6 @@ ZZ ZZ ZZ ZZ -qx -qo -dR -XE -QU -zt -eG -yi -vn -hb -qx -pe -NW -nt -Qy -Dv -Dv -Dv -Dv -Ju -Dv -Dv -Dv -eL -la -ax -Gm -SD -CO -FB -up -Yl -kC -kC -gK -bA -mX -Fg -wG -sP -at -at -Xp -Gp -Gp -Gp -Gp -Zw -Qk -Dw -cf -Tt -jo -jo -jo -yL -JH -jo -jo -jo -Ro -Bn -cb -jo -jo -Sg -Sg -Sg -jo -Sg -Sg -VB -jo -Sg -Sg -VB -jo -qv -bE -qv -jo -Sg -Sg -Sg -jo -Sg -Sg -VB -pM ZZ ZZ ZZ @@ -47207,60 +52923,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(110,1,1) = {" ZZ ZZ ZZ @@ -47283,95 +52945,6 @@ ZZ ZZ ZZ ZZ -qx -Zx -RZ -vD -eR -Wq -eR -qx -vY -cy -qx -md -ke -md -Qy -Ep -Dv -Dv -Dv -tC -eA -eA -jq -fl -Ug -sM -tL -ig -CO -pQ -OG -vz -Fj -vi -PU -kw -LX -YJ -vQ -HD -AN -Xo -Xp -Zw -Zw -Zw -Zw -Zw -Qk -Wo -IK -py -lv -UH -oo -vh -cj -SX -wn -DP -ve -Bn -XD -mo -Bh -ve -ve -ve -ve -Cw -ve -ve -LD -ve -ve -ve -ve -yj -Sy -xn -LD -ve -ve -pd -Bi -ve -ve -ve -hf ZZ ZZ ZZ @@ -47389,6 +52962,8 @@ ZZ ZZ ZZ ZZ +"} +(143,1,1) = {" ZZ ZZ ZZ @@ -47401,60 +52976,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(111,1,1) = {" ZZ ZZ ZZ @@ -47477,95 +52998,84 @@ ZZ ZZ ZZ ZZ -mI -mI -mI -qx -JD -bp -Nl -qx -mI -mI -mI -bQ -qm -sh -Qy -YC -JP -Uc -mM -rA -oV -bN -Jk -Qy -Yi -eZ -Gm -Fj -gJ -uv -sG -gJ -Fj -Db -PU -Rm -sH -Rm -Xp -Xp -Xp -Xp -Xp -zM -zM -zM -zM -zM -GH -fm -mv -tz -RW -Ng -vd -ks -sO -RJ -RJ -dM -RJ -jJ -aD -db -yN -FC -rL -FK -FK -tF -Mo -FC -pG -FC -FC -FC -FC -TN -qn -cv -Oo -cv -cv -rH -Ye -ve -SM -ve -hf +ZZ +tE +tE +Zw +xN +Ch +OO +eC +aS +sA +sA +Mw +sA +HF +HF +Mf +au +au +YU +gU +au +au +AV +JE +oF +ai +Te +OH +XC +uK +Lm +JE +Gx +FA +JE +Ip +JE +cw +BY +Ps +lb +Ed +Ge +Ta +Hf +Hq +Cd +cG +mV +bj +Qz +Vb +an +mV +mV +yb +bj +kp +Hd +Ha +XJ +Pp +Gc +gN +EW +Oj +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -47595,60 +53105,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(112,1,1) = {" ZZ ZZ ZZ @@ -47671,95 +53127,6 @@ ZZ ZZ ZZ ZZ -mI -Hk -Li -qx -PK -so -Sv -qx -Je -Qt -mI -ya -qm -bQ -Qy -FG -NU -Xu -Ls -Bk -oV -Kb -wu -Qy -ge -ax -Gm -Fj -Fj -jd -Fj -Fj -Fj -Fq -PU -PP -Be -kY -Xp -cL -sh -Qx -wc -Iq -gT -sm -Yp -wc -Qk -PB -iH -Vl -EO -VJ -Jy -IR -FN -VJ -MK -Pb -ve -Bn -Ms -EU -QE -ve -fa -Ti -zT -QP -ve -ve -tG -ve -ve -Ti -fa -LM -ve -ve -tG -ve -ve -tA -ve -ve -ve -ve -hf ZZ ZZ ZZ @@ -47789,60 +53156,21 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(113,1,1) = {" +(144,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -47865,95 +53193,75 @@ ZZ ZZ ZZ ZZ -mI -bT -wT -qx -qx -AJ -qx -vD -bT -wT -mI -bQ -qm -bQ -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Ia -Xj -Gm -Pd -No -Hl -ww -hv -Mu -HL -PU -eu -VO -Do -Xp -zd -ej -Vc -Ig -RH -er -uY -VV -VF -Qk -In -cf -XB -fz -jo -jo -jo -ZM -jo -jo -jo -jo -Xf -kW -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -Rh -Rh -Kd -Kd -Kd -Kd -Kd -ua +ZZ +tE +Zw +xN +lJ +AG +Kk +aS +AR +mH +vG +Rc +hx +hx +pO +fL +ma +ec +ro +Pl +fL +qL +qL +rW +qL +qL +qL +sp +dA +MV +MV +sp +sp +aL +aL +aL +aL +yh +jX +aL +ki +aL +Lw +Vo +ZF +Fp +Wm +jn +Xb +JX +jn +jn +Xk +jn +GP +jn +Wm +Up +rr +rm +WE +rZ +DC +EW +Oj +Vp +Vp +ZZ +ZZ ZZ ZZ ZZ @@ -47983,60 +53291,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(114,1,1) = {" ZZ ZZ ZZ @@ -48059,87 +53313,6 @@ ZZ ZZ ZZ ZZ -mI -ea -cz -xX -js -nl -Ca -hy -nw -tP -mI -bQ -qm -bQ -bQ -Ag -bQ -pb -sh -ZL -Fx -Ad -Bu -zM -HV -XN -tL -tL -tL -tL -tL -tL -tL -tL -tL -Xp -Xp -Xp -Xp -UI -Us -Sz -aG -GO -xY -Xm -tR -il -Fi -eJ -XL -BS -fz -qk -lH -NG -wF -pW -RE -wm -LC -PZ -vf -sv -lf -lf -lf -lf -lf -lf -lf -lf -lf -lf -sC -Qg -Qg -Qg -MJ -BP -Of ZZ ZZ ZZ @@ -48177,60 +53350,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(115,1,1) = {" +(145,1,1) = {" ZZ ZZ ZZ @@ -48253,87 +53374,6 @@ ZZ ZZ ZZ ZZ -mI -wW -yq -yq -yq -Nz -yq -yq -yq -NV -mI -bQ -Wy -ej -dl -Ox -dl -sx -Xs -dl -dl -dl -dl -wB -Oa -JI -Jl -gb -Bv -gb -nY -gb -gb -FW -gb -gb -gb -gb -HW -Pv -qs -Ev -oS -Yx -bR -kT -XS -UL -Qk -pZ -dN -eB -fz -Nt -ht -oI -JB -ot -ot -GR -LC -Qg -Ap -Qg -Qg -Qg -fv -Qg -Qg -Qg -Qg -Qg -Qg -Qg -ZW -GZ -BF -tV -tl -yu -Of ZZ ZZ ZZ @@ -48348,6 +53388,81 @@ ZZ ZZ ZZ ZZ +Zw +Zw +xN +eC +yY +hf +aS +yt +hx +hx +hx +hx +hx +RB +fL +Sf +ld +rd +sk +fL +qL +MH +sq +VS +oY +qL +Sr +Et +ID +ws +US +sp +zY +zY +zY +aL +uz +ni +aL +hN +aL +aE +ui +pR +fz +Mt +eY +wL +pT +wL +eY +HK +Lv +So +yQ +IF +qv +Zs +DQ +zm +Jz +iO +zm +Oj +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -48371,60 +53486,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(116,1,1) = {" ZZ ZZ ZZ @@ -48446,88 +53507,6 @@ ZZ ZZ ZZ ZZ -ce -mI -Zp -gV -Uk -Uk -wq -qQ -qQ -SO -rR -mI -ta -ta -ta -ta -jF -ta -ta -ta -ta -ta -ta -ta -ta -Zk -Md -zM -Rx -Ag -bQ -Fx -sh -cm -ta -iz -IW -IW -df -Tb -IW -kX -kX -kX -kX -kX -kX -Qk -Qk -Qk -aQ -dB -hg -SK -SK -SK -SK -SK -SK -SK -LC -LC -Qg -Ap -aF -Qg -Qg -Ji -fv -Qg -Qg -Jh -fv -Qg -Qg -rF -LR -Mm -Qg -UR -AF -Of ZZ ZZ ZZ @@ -48565,60 +53544,22 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(117,1,1) = {" +(146,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -48641,87 +53582,73 @@ ZZ ZZ ZZ ZZ -mI -We -SY -pf -UD -Ss -oL -pf -ys -cH -mI Zw Zw +xN +eC +SN +hf +yE +hx +hx +Rg +fT +yz +UG +nF +dX +XP +aA +NL +Ej +se +qL +gM +sq +tN +sq +Lq +uG +Et +xG +qg +kj +sp +cY +cY +cY +aL +NP +ni +aL +hN +aL +bc +ui +tn +fz +OV +tB +KG +eY +qE +Xk +Ef +wL +pC +wL +uq +oh +Sm +Mj +zm +Nf +iO +Qc +Gr Vp -ta -qm -bQ -ta -Zw -Zw Vp Vp -Zw -ta -Jm -ta -ta -ta -ta -ta -ta -ta -ta -ta -Ag -df -Ni -qU -Sa -IW -kX -uW -uW -uW -uW -kX -Qk -ek -Ic -fA -QD -lC -wM -Ar -pm -hi -xa -nf -SK -Vj -MJ -Qg -Ap -Qg -Qg -Qg -Qg -Qg -fv -Qg -Qg -Qg -Qg -LR -Ap -Qg -mf -Qg -UR -Vj -LC ZZ ZZ ZZ @@ -48759,60 +53686,74 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} -(118,1,1) = {" +(147,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -48835,88 +53776,73 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -Fy -Px -Px -Px -Yu -dS -cH -mI Zw Zw +xN +uB +fW +hf +yE +hx +hx +ur +Va +lY +kl +nk +To +wY +rl +Ab +ZH +oj +qL +Uo +qf +As +sq +Lq +GI +Et +xG +dQ +Bo +sp +jc +PQ +PQ +sf +Ir +nu +aL +hN +aL +vc +ui +eP +fz +qE +MG +eY +kr +fS +kf +Kj +ja +aU +ja +dG +qv +qv +oZ +zm +ti +II +lc +Gr +Vp +Vp Vp -ta -qm -bQ -ta -Zw -Zw -ta -ta -ta -ta -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -ta -TA -Zf -KS -mj -yI -IW -kX -uW -uW -uW -uW -kX -Qk -sT -Py -EJ -cf -yg -wM -xW -UP -tb -nc -Wc -SK -bS -Wp -Qg -Si -Jh -Qg -Qg -fv -Wp -Qg -Qg -Qg -LR -Qg -Qg -Ap -LR -Wp -Qg -gt -Vj -LC -Lh ZZ ZZ ZZ @@ -48953,60 +53879,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(119,1,1) = {" ZZ ZZ ZZ @@ -49029,87 +53901,6 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -bK -xp -xp -xp -Ff -dS -cH -mI -Zw -Zw -Vp -ta -qm -bQ -ta -ta -ta -ta -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -Jm -xB -IW -IW -IW -IW -IW -kX -uW -uW -uW -uW -kX -Qk -Tg -Py -pn -cf -fM -dn -nZ -qH -yc -Vx -Jq -SK -UR -yH -Qg -Ap -Qg -Qg -bJ -Qg -yH -Qg -LR -fv -fv -fv -LR -Ap -Qg -yH -YM -GD -Vj -LC ZZ ZZ ZZ @@ -49141,66 +53932,14 @@ ZZ ZZ ZZ ZZ +"} +(148,1,1) = {" ZZ ZZ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(120,1,1) = {" ZZ ZZ ZZ @@ -49223,87 +53962,103 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -bK -xp -xp -Xe -Ff -dS -cH -mI -Zw -Zw -Vp -ta -qm -bQ -ta -ta -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -ta -ta -ta -ta -ta -xB -UX -jD -GX -ym -zG -kX -uW -uW -uW -uW -kX -Qk -Cp -go -SR -cf -Uy -wM -Dx -PM -wo -yd -Jq -jt -KH -nC -De -af -Qg -Qg -Qg -Qg -pA -Qg -Qg -Qg -LR -Qg -Qg -Ap -LR -pA -Qg -jj -Vj -LC +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Zw +Zw +xN +eC +kx +hf +yE +hx +hx +sc +If +oJ +wR +LJ +dX +op +eD +nV +jO +vT +qL +CN +IQ +vL +sq +Lq +Mk +du +yW +dv +tv +sp +rb +qh +qh +iE +SI +Tv +aL +Nq +aL +iW +ui +eP +Go +Go +Go +Go +Go +Go +ZK +ZK +Hu +yG +Hu +sj +jf +Gr +Gr +Gr +Gr +Gr +Gr +Gr +Zw +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -49341,60 +54096,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(121,1,1) = {" ZZ ZZ ZZ @@ -49417,87 +54118,6 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -bK -xp -xp -xp -Ff -dS -cH -mI -Zw -Zw -Vp -ta -qm -bQ -bQ -ta -bQ -bQ -bQ -bQ -ta -ta -ta -ta -ta -ta -ta -Vp -Vp -Zw -ta -xB -UX -nz -vM -jZ -zG -kX -kX -uW -uW -TO -kX -Qk -Qk -Qk -hp -TH -EI -SK -LW -Cf -al -iG -Jq -SK -jj -Qg -Qg -Ap -fv -Qg -Qg -Qg -YM -Qg -Qg -Qg -Qg -Qg -LR -Ap -Qg -Mm -Qg -jj -AF -Of ZZ ZZ ZZ @@ -49506,6 +54126,8 @@ ZZ ZZ ZZ ZZ +"} +(149,1,1) = {" ZZ ZZ ZZ @@ -49535,60 +54157,86 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(122,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Zw +Zw +xN +tu +Df +hf +aS +OQ +hx +hx +hx +jk +zs +yJ +fL +Rd +MN +gD +Rb +Ew +qL +gl +aO +sq +sq +sJ +lh +Et +id +id +VI +sp +be +UF +UF +aL +Ob +zJ +aL +hN +aL +xM +ui +eP +Go +hZ +Go +vP +Go +oM +ZK +MZ +LB +NO +GN +Hn +jf +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -49611,87 +54259,6 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -Lu -va -va -va -HC -dS -cH -mI -Zw -Zw -ta -ta -qm -bQ -bQ -bQ -bQ -bQ -bQ -ta -ta -Zw -Zw -Vp -Zw -Vp -Zw -Zw -Zw -Zw -ta -xB -UX -uH -QZ -Ay -UX -cM -OA -OA -OA -dz -lU -fh -Qp -wb -KQ -cf -mx -SK -SK -SK -SK -SK -SK -SK -Uj -fv -Qg -Pc -Qg -fv -Qg -Qg -Qg -aF -Qg -fv -Qg -Qg -Qg -cI -Km -GZ -tV -zz -mz -Of ZZ ZZ ZZ @@ -49729,66 +54296,11 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(123,1,1) = {" ZZ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -49805,90 +54317,11 @@ ZZ ZZ ZZ ZZ -mI -We -sZ -FF -FF -FF -FF -FF -Ll -cH -mI -Zw -ta -ta -bQ -qm -bQ -bQ -bQ -bQ -ta -ta -ta -Vp -UT -UT -UT -UT -UT -Eu -Eu -Eu -Eu -Eu -uw -UX -UX -AD -UX -UX -wl -ui -ui -ui -ui -ui -ui -ui -ui -CQ -cf -mx -LC -Qg -Qg -Qg -YM -Qg -Qg -fv -Qg -Bg -Fm -Qg -Qg -fv -Qg -Qg -Qg -Qg -Qg -Qg -fv -Qg -Qg -Qg -zX -Wp -Qg -gt -Of ZZ ZZ ZZ +"} +(150,1,1) = {" ZZ ZZ ZZ @@ -49923,62 +54356,74 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(124,1,1) = {" ZZ ZZ +Zw +Zw +xN +Ma +Fu +kn +aS +oz +qP +Tm +we +Dg +dV +aS +fL +jA +Iu +RA +Oq +rz +qL +Jo +aO +dy +Gk +aI +kP +BD +pD +cA +Nr +sp +vj +vj +vj +aL +lk +lk +aL +hN +aL +OD +ui +kN +Go +ul +Go +ep +Go +fc +ZK +LB +wL +gE +wL +tf +jf +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw ZZ ZZ ZZ @@ -49999,87 +54444,6 @@ ZZ ZZ ZZ ZZ -mI -Ku -zv -zv -zv -NJ -zv -zv -zv -Ph -mI -Vp -ta -bQ -tm -Nd -bQ -ta -ta -ta -ta -Zw -Zw -Zw -UT -bz -mD -nG -UT -Eu -pp -tI -Mi -Eu -Sw -zx -Nk -Sj -Ke -Ru -aB -Cg -Cg -Cg -Cg -Cg -Cg -Cg -Cg -ZE -TU -cN -LC -Vj -Vj -Vj -Vj -Vj -KA -AF -Wp -Qg -ll -Qg -Qg -Qg -Qg -Jh -Qg -Qg -Qg -Qg -Qg -Qg -Qg -Qg -Qg -LC -LC -LC -LC ZZ ZZ ZZ @@ -50117,60 +54481,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(125,1,1) = {" ZZ ZZ ZZ @@ -50193,88 +54503,6 @@ ZZ ZZ ZZ ZZ -mI -mI -mI -mI -mI -mI -zM -zM -zM -zM -zM -ta -ta -bQ -qm -ta -ta -ta -UT -UT -UT -UT -UT -UT -UT -tW -oe -ew -UT -Eu -Gt -LA -eQ -Eu -Pq -dC -qF -Vu -Vu -nL -nL -nL -nL -nL -nL -nL -nL -nL -nL -ca -OR -lC -LC -LC -LC -LC -LC -LC -LC -LC -LC -wD -yo -Lo -fD -Vj -Vj -Vj -Vj -Vj -Wp -Vj -kq -Vj -Vj -Qg -Qg -LC -Vp -Vp -Vp -CV ZZ ZZ ZZ @@ -50286,6 +54514,8 @@ ZZ ZZ ZZ ZZ +"} +(151,1,1) = {" ZZ ZZ ZZ @@ -50311,60 +54541,83 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(126,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Zw +xN +ta +uT +yR +ua +ua +yF +ua +PS +zg +NZ +aS +fL +fL +fL +fL +fL +fL +qL +Tz +zZ +Lq +qL +qL +PT +Et +Oi +sp +za +sp +aL +aL +aL +aL +aL +aL +aL +hN +aL +aE +qW +mS +ED +GM +Qj +Ok +oG +SU +ZK +Sp +wL +iI +fR +jf +jf +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw ZZ ZZ ZZ @@ -50391,83 +54644,6 @@ ZZ ZZ ZZ ZZ -Go -ZK -ta -xL -BE -mq -iw -ta -ta -bQ -qm -ta -Zw -Zw -UT -sK -Rj -Rj -NK -UT -UT -UT -Za -UT -UT -Eu -xQ -Cz -Cc -Eu -JO -Ky -gq -Fo -az -az -Fo -rQ -ui -ui -rQ -Fo -Fo -Fo -Fo -Fo -IK -zr -hA -jG -CZ -kF -fF -OJ -OJ -OJ -hT -Zu -Qg -lB -rg -wy -IH -IH -IH -IH -IH -IH -IH -IH -IH -VU -gS -gS -Vp -Vp -Vp ZZ ZZ ZZ @@ -50505,60 +54681,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(127,1,1) = {" ZZ ZZ ZZ @@ -50584,86 +54706,10 @@ ZZ ZZ ZZ ZZ -Go -MF -bQ -jR -bQ -bQ -bQ -nd -mh -ta -bQ -qm -ta -Zw -Zw -UT -Zz -mU -mU -on -UT -fG -Dt -qJ -aZ -Gw -Eu -Eu -UV -Eu -Eu -FL -ui -Fo -Fo -Ld -UA -Fo -Fo -ui -ui -Fo -Hy -UA -Qe -uy -Fo -SF -Bz -AA -lx -lx -lx -AM -RM -bf -bf -bf -bf -bf -bf -ly -TP -IH -YD -ay -Fw -ZD -OZ -hF -OZ -IH -mi -bg -gS -SS -Vp -Vp ZZ ZZ +"} +(152,1,1) = {" ZZ ZZ ZZ @@ -50699,60 +54745,101 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(128,1,1) = {" +ZZ +ZZ +Zw +Zw +Zw +uT +dT +yV +hL +Kf +ua +Cm +zg +Ws +Xr +GY +bI +xm +vG +ut +LK +dv +lI +vI +wP +LK +dH +qO +Et +fV +sp +KL +sp +iK +oB +eV +BG +BG +BG +BG +IT +aL +aE +om +KY +Go +xj +kZ +uA +dP +Pf +jf +jf +jf +jf +jf +jf +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -50778,84 +54865,6 @@ ZZ ZZ ZZ ZZ -aS -zU -zU -bQ -bQ -bQ -bQ -bQ -bQ -ta -bQ -qm -ta -ta -Vp -UT -El -RX -Gw -YS -UT -fg -Td -Am -La -Di -hY -WF -tc -Gq -hY -Qo -oN -Fo -Fo -tx -tx -Fo -Fo -ui -ui -Fo -Hy -Ie -gZ -el -Fo -ui -Gf -hA -rM -cu -cu -Rl -BM -bf -sz -po -QX -QS -bf -BO -HG -ou -PA -CM -By -Iz -dJ -OZ -OZ -ed -mi -pq -cZ -Vp -Vp -Vp ZZ ZZ ZZ @@ -50893,60 +54902,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(129,1,1) = {" +(153,1,1) = {" ZZ ZZ ZZ @@ -50972,84 +54929,6 @@ ZZ ZZ ZZ ZZ -aS -bv -YH -bQ -bQ -ZA -bQ -bQ -bQ -Jm -bQ -qm -bQ -ta -Zw -UT -mp -Zb -EA -zj -ez -Vt -cK -Lx -bq -Lg -hD -zE -CX -ku -MR -Wz -cf -Fo -mL -sR -mL -sR -uM -ui -ui -sR -Hy -UA -xT -el -Fo -ui -TB -hA -GJ -QY -jP -xD -Hb -kb -jx -Rv -ov -JR -Pw -qu -dd -IH -XI -mW -vV -vV -qe -Rf -Rf -IH -mi -mi -cZ -Vp -Vp -Vp ZZ ZZ ZZ @@ -51062,6 +54941,74 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw +uT +nU +Vw +wZ +Yv +ua +IJ +Hs +pK +qM +Dd +qM +YK +qM +Wk +HE +HE +CG +gG +ka +HE +HE +HE +JG +VA +sp +KM +sp +Vm +AL +aL +Pa +Zr +ty +AU +Ym +aL +iM +vp +Sd +qT +qT +qT +qT +qT +qT +qT +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51087,60 +55034,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(130,1,1) = {" ZZ ZZ ZZ @@ -51166,84 +55059,6 @@ ZZ ZZ ZZ ZZ -aS -aM -aM -bQ -bQ -bQ -bQ -bQ -bQ -ta -bQ -Wy -hz -ta -Zw -UT -Fa -Uz -Gw -Pe -UT -my -At -uQ -cO -zO -of -Lc -tc -Wf -ZP -RV -cf -sR -NI -NI -NI -NI -NI -NI -hJ -hJ -mL -Fo -Dq -Ub -Fo -ui -mJ -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -cB -bo -IH -mB -ar -TZ -yp -MD -Rf -Rf -IH -mi -kK -gS -Vp -Vp -Vp ZZ ZZ ZZ @@ -51281,60 +55096,21 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(131,1,1) = {" +(154,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51360,84 +55136,123 @@ ZZ ZZ ZZ ZZ -Ij -MF -bQ -xI -bQ -bQ -bQ -Ag -qK -ta -bQ -bQ -qm -ta Zw -UT -Zz -mU -mU -ft -UT -yM -mU -qJ -An -Gw -iD -iD -Ci -iD -iD -pU -cf -uM -fQ -ho -ho -ho -ho -Ka -PC -hJ -sR -Fo -UA -UA -Fo -SA -wj -KI -ko -IG -IG -IG -IG -Wb -VY -UQ -zp -OF -PW -Zl -Qi -DG -DG -DG -DG -DG -DG -DG -DG -DG -xk -DG -DG -DG -Vp -Vp +Zw +uT +uT +uT +ua +tM +Wi +He +FI +sE +rs +qN +rs +Ez +Cr +ut +tO +dk +Ol +KC +YB +rN +vJ +UN +Ae +Ec +sp +wI +sp +ny +Pj +Lt +Lt +Lt +Lt +Lt +Ks +Ks +yT +IX +yT +um +ZZ +CW +CW +CW +AY +AY +CW +CW +CW +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51475,60 +55290,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(132,1,1) = {" +(155,1,1) = {" ZZ ZZ ZZ @@ -51555,83 +55318,6 @@ ZZ ZZ ZZ ZZ -Ij -DB -ta -Ja -Wg -Wl -sy -ta -ta -ta -bQ -ga -ta -Zw -UT -HZ -XW -XW -QQ -UT -UT -UT -Za -UT -UT -iD -Aq -pS -bZ -iD -pU -cf -ui -qt -hJ -hJ -hJ -hJ -Ka -PC -hJ -HR -Fo -tx -tx -rQ -VE -Em -PW -dc -TS -TS -TS -TS -Ix -TS -fq -Kl -WM -My -Zl -kJ -DG -gF -DX -Ns -mF -mF -tH -BU -YF -mF -mF -mF -ry -Vp -Vp ZZ ZZ ZZ @@ -51644,6 +55330,70 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw +Zw +uT +vu +Mv +uT +hf +hf +Kc +Kc +Kc +Kc +hf +hf +hf +Eg +Eg +IY +IY +IY +IY +Eg +Eg +Eg +Eg +Eg +Eg +Eg +uO +uO +uO +Zw +Zw +Zw +Zw +um +ao +Vk +fX +ue +um +ZZ +CW +lP +CW +xv +xg +CW +CB +CW +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51669,60 +55419,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(133,1,1) = {" ZZ ZZ ZZ @@ -51751,81 +55447,6 @@ ZZ ZZ ZZ ZZ -ta -ta -ta -ta -ta -ta -Zw -ta -SB -ga -ta -ta -UT -UT -UT -UT -UT -UT -UT -ok -Fl -xZ -UT -iD -sF -tY -tX -iD -pU -cf -ui -iJ -hk -iq -eb -hJ -SE -PC -hJ -ui -ui -ui -ui -ui -cf -he -AQ -hq -IP -IP -IP -aj -vm -yC -qC -iP -lR -My -Zl -bD -DG -BA -aR -Ns -mF -mF -mF -mF -Ra -JC -JC -Ra -ry -Vp -Vp ZZ ZZ ZZ @@ -51863,60 +55484,19 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(134,1,1) = {" +(156,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51946,85 +55526,63 @@ ZZ ZZ ZZ ZZ -Vp -Vp -Zw Zw Zw +uT +uT +uT +uT Zw -ta -SB -tk -ta -nX -Df -DW -Df -Df -Uh -Uh -UT -Fs -Kv -nE -UT -iD -WR -Vv -Fd -iD -Vn -KB -rj -vq -le -pV -Tk -hJ -SE -PC -hJ -ui -ui -ui -ui -ui -cf -vg -PW -PW -PW -PW -PW -PW -PW -aX -fq -KK -ZB -My -Hc -Jp -RD -YN -LY -bl -bl -wr -bl -oU -pJ -Ex -Xz -MM -ry -Vp -Vp +tE +tE +tE +tE +tE +ls +Zw +Zw +Zw +tE +tE +tE +tE +tE +tE +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +um +GF +Zd +dm +Ri +um ZZ +QV +av +Gd +EQ +Zy +Nb +hC +QV ZZ ZZ ZZ ZZ +Zw +Zw +Zw ZZ ZZ ZZ @@ -52057,60 +55615,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(135,1,1) = {" ZZ ZZ ZZ @@ -52141,79 +55645,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -Zw -Zw -ta -Df -yl -Ba -bV -DO -hw -bm -kn -Dm -in -UT -UT -UT -UT -UT -iD -iD -iD -iD -iD -lm -cf -ui -Mg -hJ -hJ -hJ -hJ -Ka -PC -hJ -HR -Fo -az -az -rQ -cf -WT -cE -BV -fZ -bb -OK -Po -PW -Jj -fq -BH -wh -My -Zl -sU -DG -Nm -Kt -mF -mF -Bt -Xv -Yf -ba -Xd -Vh -MM -ry -Vp -Vp ZZ ZZ ZZ @@ -52247,64 +55678,12 @@ ZZ ZZ ZZ ZZ +"} +(157,1,1) = {" ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(136,1,1) = {" ZZ ZZ ZZ @@ -52335,79 +55714,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -Zw -Zw -ta -Df -bi -Sk -Df -Df -ta -tT -eC -Hp -Uh -au -fn -NF -mC -Op -Co -Ty -Gb -zK -au -Uq -cf -uM -pg -RY -RY -RY -RY -Ka -PC -hJ -sR -Fo -ON -UA -Fo -cf -WT -DH -BW -Zo -iT -Zo -Yn -EK -br -fq -Oh -KR -My -Bf -Qi -DG -mF -Kt -mF -mF -qS -mF -Yf -Ra -PN -PN -Ra -ry -Vp -Vp ZZ ZZ ZZ @@ -52415,6 +55721,60 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ +ZZ +tE +tE +Zw +Zw +tE +tE +tE +tE +tE +tE +tE +Zw +Zw +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +um +nJ +JW +iS +Oe +um +ZZ +CW +BR +hM +as +Ai +Mc +WV +CW +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -52445,60 +55805,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(137,1,1) = {" ZZ ZZ ZZ @@ -52529,79 +55835,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -Zw -Zw -ta -Df -Vy -Df -Df -Rk -ta -HM -eC -ts -uN -au -iB -lq -lq -lq -CA -ZG -vZ -GG -au -SQ -cf -sR -fH -fH -fH -fH -fH -fH -hJ -hJ -mL -Fo -Bx -oa -Fo -cf -qG -CH -Ft -Bd -xe -hu -zL -WN -mT -Dc -jz -tU -IB -Ue -Mx -DG -mF -Kt -mF -mF -xV -eS -Gy -WD -XT -YV -mG -ry -Vp -Vp ZZ ZZ ZZ @@ -52639,60 +55872,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(138,1,1) = {" +(158,1,1) = {" ZZ ZZ ZZ @@ -52723,79 +55904,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -Zw -Zw -ta -ta -ta -ta -ta -ta -ta -lJ -Kk -Uh -eN -au -ql -dw -Le -rK -hl -Ac -QO -Om -au -Jv -cf -Fo -mL -sR -mL -sR -uM -ui -ui -sR -Hy -UA -gZ -el -Fo -cf -qG -DH -gg -Zo -ZC -Zo -lS -pl -Yb -cD -QF -hB -PW -zV -OP -DG -aC -xE -Od -JK -zh -zh -zh -zh -zh -zh -zh -DG -Vp -Vp ZZ ZZ ZZ @@ -52808,6 +55916,12 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw +Zw +Zw +Zw ZZ ZZ ZZ @@ -52815,6 +55929,13 @@ ZZ ZZ ZZ ZZ +tE +tE +tE +Zw +Zw +tE +tE ZZ ZZ ZZ @@ -52828,65 +55949,26 @@ ZZ ZZ ZZ ZZ +um +hG +ck +qX +ak +um +um +CW +CW +CW +tD +CK +CW +CW +CW ZZ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(139,1,1) = {" ZZ ZZ ZZ @@ -52917,79 +55999,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -tE -Zw -Zw -Zw -Zw -Zw -Zw -Zw -ta -eC -sA -sA -sA -sA -sA -sA -sA -ad -nv -dI -fs -OU -au -Vn -cf -Fo -Fo -az -az -Fo -Fo -ui -ui -Fo -Hy -UA -xT -el -Fo -cf -qG -ZI -gi -Bm -nx -YO -rx -PW -PW -PW -PW -PW -PW -wy -wy -zh -zh -zh -zh -zh -zh -St -zm -Yr -ey -zw -Gr -Vp -Vp -Vp ZZ ZZ ZZ @@ -53027,60 +56036,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(140,1,1) = {" ZZ ZZ ZZ @@ -53111,78 +56066,10 @@ ZZ ZZ ZZ ZZ +"} +(159,1,1) = {" ZZ ZZ -tE -tE -tE -tE -tE -Zw -Zw -ta -ta -ta -eC -sA -NA -uo -uX -fw -ob -sA -ih -Gi -dI -CL -lQ -au -Fz -cf -Fo -Fo -ON -UA -Fo -Fo -ui -ui -Fo -Hy -UA -LP -ik -Fo -cf -qG -PW -PW -PW -PW -PW -PW -EM -Xc -eY -qE -CE -nM -Gh -qz -Rw -wS -ja -no -Gr -kA -zm -zm -kh -EW -Qc -Gr -Vp -Vp ZZ ZZ ZZ @@ -53221,60 +56108,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(141,1,1) = {" ZZ ZZ ZZ @@ -53292,6 +56125,9 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw ZZ ZZ ZZ @@ -53307,76 +56143,22 @@ ZZ ZZ ZZ ZZ -tE -tE -tE -tE -tE -tE -tE -ta -PL -tq -Kk -sA -NA -NH -mA -ir -nn -sD -UW -dO -Bl -lq -Dy -au -IE -yy -Rt -Fo -tx -tx -Fo -rQ -ui -ui -rQ -Fo -Fo -Fo -Fo -Fo -IK -xr -ND -fI -ZT -fI -NN -XG -fz -Hi -wL -Pk -Vg -qE -eY -vl -CJ -FS -ee -Eh -Gr -Wh -iO -Np -nB -iY -zm -Oj -Vp -Vp +um +LV +ck +pP +Jn +WG +oA +xd +ju +cF +ab +hQ +DF +pB +OL +ZZ ZZ ZZ ZZ @@ -53415,60 +56197,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(142,1,1) = {" ZZ ZZ ZZ @@ -53496,81 +56224,11 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ ZZ ZZ -tE -tE -tE -tE -ff -ta -ta -ie -eC -TG -sA -NA -Hz -sA -sA -sA -sA -OB -EY -xb -Ee -lV -au -by -SF -LS -rj -rj -rj -rj -Vd -rj -rj -rj -rj -rj -rj -rj -lM -BB -ha -bt -rj -oN -ui -Th -da -fz -wL -Xh -cU -Ts -wL -Xk -Cl -Xk -Xk -Xh -wL -jT -iO -iO -Io -im -ze -zm -Oj -Vp -Vp ZZ ZZ ZZ @@ -53602,6 +56260,9 @@ ZZ ZZ ZZ ZZ +"} +(160,1,1) = {" +ZZ ZZ ZZ ZZ @@ -53609,60 +56270,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(143,1,1) = {" ZZ ZZ ZZ @@ -53698,73 +56305,6 @@ ZZ ZZ ZZ ZZ -tE -tE -Zw -ta -Ch -OO -eC -Mf -sA -sA -Mw -sA -HF -HF -Mf -au -au -YU -gU -au -au -AV -JE -oF -ai -Te -OH -XC -uK -Lm -JE -Gx -FA -JE -Ip -JE -cw -BY -Ps -lb -Ed -Ge -Ta -Hf -Hq -Cd -cG -mV -bj -Qz -Vb -an -mV -mV -yb -bj -kp -Hd -Ha -XJ -Pp -Gc -gN -EW -Oj -Vp -Vp ZZ ZZ ZZ @@ -53797,66 +56337,30 @@ ZZ ZZ ZZ ZZ +um +Jx +Sq +Vk +Vk +hh +sX +jI +Xy +oR +mk +oq +pz +Yq +pi +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(144,1,1) = {" ZZ ZZ ZZ @@ -53893,72 +56397,6 @@ ZZ ZZ ZZ ZZ -tE -Zw -ta -lJ -AG -Kk -Mf -AR -mH -vG -Rc -hx -hx -pO -fL -ma -ec -ro -Pl -fL -qL -qL -rW -qL -qL -qL -sp -dA -MV -MY -sp -sp -Lt -Lt -Lt -Lt -yh -jX -Lt -ki -aL -Lw -Vo -ZF -Fp -Wm -jn -Xb -JX -jn -jn -Xk -jn -GP -jn -Wm -Up -rr -rm -WE -rZ -DC -EW -Oj -Vp -Vp ZZ ZZ ZZ @@ -53997,60 +56435,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(145,1,1) = {" ZZ ZZ ZZ @@ -54070,6 +56454,8 @@ ZZ ZZ ZZ ZZ +"} +(161,1,1) = {" ZZ ZZ ZZ @@ -54087,72 +56473,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -eC -yY -Mf -Mf -yt -hx -hx -hx -hx -hx -RB -fL -Sf -ld -rd -sk -fL -qL -MH -sq -VS -oY -qL -Sr -Et -ID -ws -US -sp -zY -zY -zY -Lt -uz -ni -Lt -hN -aL -aE -ui -pR -fz -Mt -eY -wL -pT -wL -eY -HK -Lv -So -yQ -IF -Gr -Zs -DQ -zm -Jz -iO -zm -Oj -Vp -Vp ZZ ZZ ZZ @@ -54191,60 +56511,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(146,1,1) = {" ZZ ZZ ZZ @@ -54265,6 +56531,21 @@ ZZ ZZ ZZ ZZ +um +yT +yT +yT +yT +um +um +pi +pi +pi +eH +pX +OS +pi +pi ZZ ZZ ZZ @@ -54281,73 +56562,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -eC -SN -Mf -yE -hx -hx -Rg -fT -yz -UG -nF -dX -XP -aA -NL -Ej -se -qL -gM -sq -tN -sq -Lq -uG -Et -xG -qg -kj -sp -cY -cY -cY -Lt -NP -ni -Lt -hN -aL -bc -ui -tn -fz -OV -tB -KG -eY -qE -Xk -Ef -wL -pC -wL -uq -oh -Sm -Mj -zm -Nf -iO -Qc -Gr -Vp -Vp -Vp ZZ ZZ ZZ @@ -54385,60 +56599,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(147,1,1) = {" ZZ ZZ ZZ @@ -54475,73 +56635,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -uB -fW -Mf -yE -hx -hx -ur -Va -lY -kl -nk -To -wY -rl -Ab -ZH -oj -qL -Uo -qf -As -sq -Lq -GI -Et -xG -dQ -Bo -sp -jc -PQ -PQ -sf -Ir -nu -Lt -hN -aL -vc -ui -eP -fz -qE -MG -eY -kr -fS -kf -Kj -ja -aU -ja -dG -Gr -Gr -oZ -zm -ti -II -lc -Gr -Vp -Vp -Vp ZZ ZZ ZZ @@ -54555,6 +56648,8 @@ ZZ ZZ ZZ ZZ +"} +(162,1,1) = {" ZZ ZZ ZZ @@ -54579,60 +56674,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(148,1,1) = {" ZZ ZZ ZZ @@ -54669,73 +56710,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -eC -kx -Mf -yE -hx -hx -sc -If -oJ -wR -LJ -dX -op -eD -nV -jO -vT -qL -CN -IQ -vL -sq -Lq -Mk -du -yW -dv -tv -sp -rb -qh -qh -iE -SI -Tv -Lt -Nq -aL -iW -ui -eP -qT -qT -qT -qT -qT -qT -jf -jf -Hu -yG -Hu -sj -jf -Gr -Gr -Gr -Gr -Gr -Gr -Gr -Zw -Vp -Vp ZZ ZZ ZZ @@ -54751,6 +56725,28 @@ ZZ ZZ ZZ ZZ +KD +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +pi +Aa +qr +zI +ye +kG +ZN +pi +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -54773,60 +56769,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(149,1,1) = {" ZZ ZZ ZZ @@ -54863,73 +56805,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -tu -Df -Mf -Mf -OQ -hx -hx -hx -jk -zs -yJ -fL -Rd -MN -gD -Rb -Ew -qL -gl -jC -sq -sq -sJ -lh -Et -id -id -VI -sp -be -UF -UF -Lt -Ob -zJ -Lt -hN -aL -xM -ui -eP -qT -hZ -qT -vP -qT -oM -jf -MZ -LB -NO -GN -Hn -jf -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Vp -Vp ZZ ZZ ZZ @@ -54967,60 +56842,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(150,1,1) = {" +(163,1,1) = {" ZZ ZZ ZZ @@ -55057,72 +56880,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -Ma -Fu -kn -Mf -oz -qP -Tm -we -Dg -dV -Mf -fL -jA -Iu -RA -Oq -rz -qL -Jo -aO -dy -Gk -aI -kP -BD -pD -cA -Nr -sp -vj -vj -vj -Lt -lk -lk -Lt -hN -aL -OD -ui -kN -qT -ul -qT -ep -qT -fc -jf -LB -wL -gE -wL -tf -jf -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -55160,61 +56917,8 @@ ZZ ZZ ZZ ZZ +Nh ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(151,1,1) = {" ZZ ZZ ZZ @@ -55222,7 +56926,16 @@ ZZ ZZ ZZ ZZ +TY +aY +YP +xC +hE +XF +sV +TY ZZ +Ey ZZ ZZ ZZ @@ -55252,71 +56965,6 @@ ZZ ZZ ZZ ZZ -Zw -ta -ta -uT -yR -uT -uT -yF -uT -PS -zg -NZ -Mf -fL -fL -fL -fL -fL -fL -qL -Lq -zZ -Lq -qL -qL -PT -Pt -Oi -sp -za -sp -Lt -Lt -Lt -Lt -Lt -Lt -Lt -hN -aL -aE -qW -mS -ED -GM -Qj -Ok -oG -SU -jf -Sp -wL -iI -fR -jf -jf -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -55355,60 +57003,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(152,1,1) = {" ZZ ZZ ZZ @@ -55442,75 +57036,12 @@ ZZ ZZ ZZ ZZ +"} +(164,1,1) = {" ZZ ZZ ZZ ZZ -Zw -Zw -Zw -uT -dT -yV -hL -Kf -uT -Cm -zg -Ws -Xr -GY -bI -xm -vG -ut -LK -dv -lI -vI -wP -LK -dH -qO -KZ -fV -sp -KL -sp -iK -oB -eV -BG -BG -BG -BG -IT -aL -aE -om -KY -qT -xj -kZ -uA -dP -Pf -jf -jf -jf -jf -jf -jf -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -55549,60 +57080,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(153,1,1) = {" ZZ ZZ ZZ @@ -55640,71 +57117,21 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw -uT -nU -Vw -wZ -Yv -uT -IJ -Hs -pK -qM -Dd -qM -YK -qM -Wk -HE -HE -CG -gG -ka -HE -HE -HE -JG -VA -sp -KM -sp -Vm -AL -aL -Pa -Zr -ty -AU -Ym -aL -iM -vp -Sd -qT -qT -qT -qT -qT -qT -qT -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw +ZZ +ZZ +ZZ +TY +Ov +YP +jl +Xi +rw +yX +TY +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -55743,60 +57170,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(154,1,1) = {" ZZ ZZ ZZ @@ -55835,70 +57208,7 @@ ZZ ZZ ZZ ZZ -Zw -Zw -uT -uT -uT -uT -tM -Wi -He -FI -sE -rs -qN -rs -Ez -Cr -ut -tO -dk -Ol -KC -YB -rN -vJ -UN -Ae -Ec -sp -wI -sp -ny -Pj -aL -aL -aL -aL -aL -aL -aL -xN -IX -xN -um ZZ -CW -CW -CW -AY -AY -CW -CW -CW -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -55920,6 +57230,8 @@ ZZ ZZ ZZ ZZ +"} +(165,1,1) = {" ZZ ZZ ZZ @@ -55937,60 +57249,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(155,1,1) = {" ZZ ZZ ZZ @@ -56029,65 +57287,7 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw -Zw -uT -vu -Mv -uT -Mf -Mf -Kc -Kc -Kc -Kc -Mf -Mf -Mf -sp -sp -IY -IY -IY -IY -sp -sp -sp -sp -sp -Eg -Eg -uO -uO -uO -Zw -Zw -Zw -Zw -um -ao -Vk -fX -ue -um ZZ -CW -lP -CW -xv -xg -CW -CB -CW -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -56114,6 +57314,14 @@ ZZ ZZ ZZ ZZ +qi +KX +Yw +Gz +nA +UZ +mb +qi ZZ ZZ ZZ @@ -56131,60 +57339,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(156,1,1) = {" ZZ ZZ ZZ @@ -56196,6 +57350,7 @@ ZZ ZZ ZZ ZZ +ST ZZ ZZ ZZ @@ -56225,63 +57380,11 @@ ZZ ZZ ZZ ZZ -Zw -Zw -uT -uT -uT -uT -Zw -tE -tE -tE -tE -tE -ls -Zw -Zw -Zw -tE -tE -tE -tE -tE -tE -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -um -GF -Zd -dm -Ri -um ZZ -QV -av -Gd -EQ -Zy -Nb -hC -QV ZZ ZZ ZZ ZZ -Zw -Zw -Zw ZZ ZZ ZZ @@ -56321,64 +57424,12 @@ ZZ ZZ ZZ ZZ +"} +(166,1,1) = {" ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(157,1,1) = {" ZZ ZZ ZZ @@ -56420,30 +57471,10 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ ZZ -tE -tE -Zw -Zw -tE -tE -tE -tE -tE -tE -tE -Zw -Zw ZZ ZZ ZZ @@ -56454,21 +57485,7 @@ ZZ ZZ ZZ ZZ -um -nJ -JW -iS -Oe -um ZZ -CW -BR -hM -as -Ai -Mc -WV -CW ZZ ZZ ZZ @@ -56491,6 +57508,28 @@ ZZ ZZ ZZ ZZ +fp +fp +Hj +sn +DN +Tx +fp +pi +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -56519,60 +57558,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(158,1,1) = {" ZZ ZZ ZZ @@ -56615,12 +57600,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -56628,13 +57607,6 @@ ZZ ZZ ZZ ZZ -tE -tE -tE -Zw -Zw -tE -tE ZZ ZZ ZZ @@ -56646,23 +57618,10 @@ ZZ ZZ ZZ ZZ +"} +(167,1,1) = {" ZZ ZZ -um -hG -ck -qX -ak -um -um -CW -CW -CW -tD -CK -CW -CW -CW ZZ ZZ ZZ @@ -56713,60 +57672,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(159,1,1) = {" ZZ ZZ ZZ @@ -56797,6 +57702,14 @@ ZZ ZZ ZZ ZZ +dp +fp +gO +fE +IS +FR +NX +JZ ZZ ZZ ZZ @@ -56824,9 +57737,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw ZZ ZZ ZZ @@ -56842,21 +57752,6 @@ ZZ ZZ ZZ ZZ -um -LV -ck -pP -Jn -WG -oA -xd -ju -cF -ab -hQ -DF -pB -OL ZZ ZZ ZZ @@ -56907,60 +57802,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(160,1,1) = {" ZZ ZZ ZZ @@ -56971,6 +57812,8 @@ ZZ ZZ ZZ ZZ +"} +(168,1,1) = {" ZZ ZZ ZZ @@ -57036,21 +57879,6 @@ ZZ ZZ ZZ ZZ -um -Jx -Sq -Vk -Vk -hh -sX -jI -Xy -oR -mk -oq -pz -Yq -pi ZZ ZZ ZZ @@ -57069,6 +57897,12 @@ ZZ ZZ ZZ ZZ +fp +fp +oi +kI +fp +fp ZZ ZZ ZZ @@ -57101,60 +57935,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(161,1,1) = {" ZZ ZZ ZZ @@ -57226,25 +58006,12 @@ ZZ ZZ ZZ ZZ +"} +(169,1,1) = {" ZZ ZZ ZZ ZZ -um -yT -yT -yT -yT -um -um -pi -pi -pi -eH -pX -OS -pi -pi ZZ ZZ ZZ @@ -57295,60 +58062,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(162,1,1) = {" ZZ ZZ ZZ @@ -57379,6 +58092,14 @@ ZZ ZZ ZZ ZZ +fp +DK +DK +fp +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -57424,23 +58145,13 @@ ZZ ZZ ZZ ZZ -KD ZZ ZZ ZZ ZZ ZZ ZZ -pi -Aa -qr -zI -ye -kG -ZN -pi ZZ -Nh ZZ ZZ ZZ @@ -57489,60 +58200,9 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(163,1,1) = {" +(170,1,1) = {" +ZZ ZZ ZZ ZZ @@ -57616,7 +58276,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -57625,14 +58284,6 @@ ZZ ZZ ZZ ZZ -jE -aY -YP -xC -hE -XF -sV -TY ZZ ZZ ZZ @@ -57683,60 +58334,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(164,1,1) = {" ZZ ZZ ZZ @@ -57797,6 +58394,8 @@ ZZ ZZ ZZ ZZ +"} +(171,1,1) = {" ZZ ZZ ZZ @@ -57819,14 +58418,6 @@ ZZ ZZ ZZ ZZ -jE -Ov -YP -jl -Xi -rw -yX -TY ZZ ZZ ZZ @@ -57877,60 +58468,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(165,1,1) = {" ZZ ZZ ZZ @@ -58013,14 +58550,6 @@ ZZ ZZ ZZ ZZ -qi -KX -Yw -Gz -nA -UZ -mb -qi ZZ ZZ ZZ @@ -58049,7 +58578,6 @@ ZZ ZZ ZZ ZZ -ST ZZ ZZ ZZ @@ -58060,6 +58588,8 @@ ZZ ZZ ZZ ZZ +"} +(172,1,1) = {" ZZ ZZ ZZ @@ -58071,60 +58601,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(166,1,1) = {" ZZ ZZ ZZ @@ -58207,14 +58683,6 @@ ZZ ZZ ZZ ZZ -fp -fp -Hj -sn -DN -Tx -fp -pi ZZ ZZ ZZ @@ -58265,60 +58733,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(167,1,1) = {" ZZ ZZ ZZ @@ -58368,6 +58782,8 @@ ZZ ZZ ZZ ZZ +"} +(173,1,1) = {" ZZ ZZ ZZ @@ -58401,14 +58817,6 @@ ZZ ZZ ZZ ZZ -dp -fp -gO -fE -IS -FR -NX -JZ ZZ ZZ ZZ @@ -58459,60 +58867,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(168,1,1) = {" ZZ ZZ ZZ @@ -58596,12 +58950,39 @@ ZZ ZZ ZZ ZZ -fp -fp -oi -kI -fp -fp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(174,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -58653,60 +59034,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(169,1,1) = {" ZZ ZZ ZZ @@ -58791,10 +59118,6 @@ ZZ ZZ ZZ ZZ -fp -DK -DK -fp ZZ ZZ ZZ @@ -58847,60 +59170,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(170,1,1) = {" +(175,1,1) = {" ZZ ZZ ZZ @@ -59041,60 +59312,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(171,1,1) = {" ZZ ZZ ZZ @@ -59147,6 +59364,8 @@ ZZ ZZ ZZ ZZ +"} +(176,1,1) = {" ZZ ZZ ZZ @@ -59207,6 +59426,7 @@ ZZ ZZ ZZ ZZ +GE ZZ ZZ ZZ @@ -59235,60 +59455,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(172,1,1) = {" ZZ ZZ ZZ @@ -59392,6 +59558,23 @@ ZZ ZZ ZZ ZZ +"} +(177,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -59429,60 +59612,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(173,1,1) = {" ZZ ZZ ZZ @@ -59623,60 +59752,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(174,1,1) = {" +(178,1,1) = {" ZZ ZZ ZZ @@ -59817,60 +59894,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(175,1,1) = {" ZZ ZZ ZZ @@ -59923,6 +59946,8 @@ ZZ ZZ ZZ ZZ +"} +(179,1,1) = {" ZZ ZZ ZZ @@ -60011,60 +60036,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(176,1,1) = {" ZZ ZZ ZZ @@ -60125,7 +60096,6 @@ ZZ ZZ ZZ ZZ -GE ZZ ZZ ZZ @@ -60170,6 +60140,49 @@ ZZ ZZ ZZ ZZ +"} +(180,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -60205,60 +60218,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(177,1,1) = {" ZZ ZZ ZZ @@ -60375,6 +60334,36 @@ ZZ ZZ ZZ ZZ +"} +(181,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -60399,60 +60388,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(178,1,1) = {" ZZ ZZ ZZ @@ -60593,60 +60528,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(179,1,1) = {" +(182,1,1) = {" ZZ ZZ ZZ @@ -60787,60 +60670,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(180,1,1) = {" ZZ ZZ ZZ @@ -60893,6 +60722,28 @@ ZZ ZZ ZZ ZZ +"} +(183,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -60981,60 +60832,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(181,1,1) = {" ZZ ZZ ZZ @@ -61119,6 +60916,8 @@ ZZ ZZ ZZ ZZ +"} +(184,1,1) = {" ZZ ZZ ZZ @@ -61175,60 +60974,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(182,1,1) = {" ZZ ZZ ZZ @@ -61365,64 +61110,12 @@ ZZ ZZ ZZ ZZ +"} +(185,1,1) = {" ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(183,1,1) = {" ZZ ZZ ZZ @@ -61563,60 +61256,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(184,1,1) = {" ZZ ZZ ZZ @@ -61665,6 +61304,46 @@ ZZ ZZ ZZ ZZ +"} +(186,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -61757,60 +61436,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(185,1,1) = {" ZZ ZZ ZZ @@ -61873,6 +61498,8 @@ ZZ ZZ ZZ ZZ +"} +(187,1,1) = {" ZZ ZZ ZZ @@ -61951,60 +61578,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(186,1,1) = {" ZZ ZZ ZZ @@ -62119,6 +61692,34 @@ ZZ ZZ ZZ ZZ +"} +(188,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -62145,60 +61746,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(187,1,1) = {" ZZ ZZ ZZ @@ -62339,60 +61886,36 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(188,1,1) = {" +(189,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -62533,60 +62056,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(189,1,1) = {" ZZ ZZ ZZ @@ -62611,6 +62080,8 @@ ZZ ZZ ZZ ZZ +"} +(190,1,1) = {" ZZ ZZ ZZ @@ -62727,60 +62198,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(190,1,1) = {" ZZ ZZ ZZ @@ -62857,6 +62274,8 @@ ZZ ZZ ZZ ZZ +"} +(191,1,1) = {" ZZ ZZ ZZ @@ -62921,60 +62340,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(191,1,1) = {" ZZ ZZ ZZ @@ -63103,6 +62468,48 @@ ZZ ZZ ZZ ZZ +"} +(192,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -63115,60 +62522,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(192,1,1) = {" ZZ ZZ ZZ @@ -63309,56 +62662,4 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm index 103d823c66..dd080830c6 100644 --- a/maps/tether/levels/station2.dmm +++ b/maps/tether/levels/station2.dmm @@ -16,7 +16,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/office) "ad" = ( /obj/item/paper, @@ -107,7 +107,7 @@ "am" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/department/cargo, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "an" = ( /obj/machinery/door/airlock/maintenance/common, @@ -169,10 +169,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "as" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -271,7 +268,7 @@ /area/shuttle/excursion/cargo) "aB" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/warehouse) "aC" = ( /obj/structure/flora/pottedplant/fern, @@ -305,34 +302,26 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "aI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cockpit) +/turf/simulated/wall/prepainted/cargo, +/area/tether/exploration) "aJ" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "aK" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 + dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 6 }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -463,11 +452,7 @@ /area/quartermaster/belterdock) "aX" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -503,12 +488,8 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "bb" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration) "bc" = ( @@ -620,11 +601,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/spawner/window/low_wall/full/nogrille, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "bm" = ( @@ -640,8 +620,12 @@ /turf/simulated/open, /area/engineering/locker_room) "bo" = ( -/turf/simulated/wall, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "bp" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -651,19 +635,14 @@ "bq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "br" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/engineering/locker_room) "bs" = ( @@ -684,8 +663,6 @@ /turf/simulated/floor/tiled, /area/security/customs) "bu" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, @@ -695,6 +672,12 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "bv" = ( @@ -744,7 +727,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2r"; name = "interior access button"; @@ -776,8 +759,15 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "bB" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/quartermaster/foyer) +"bC" = ( +/obj/machinery/door/airlock/maintenance/cargo{ + name = "Magmatic Rift Leap Pad"; + req_one_access = list(1,5,31,38,47,48) + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "bD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -785,13 +775,30 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "bE" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "shopdressingroom" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "shopdressingroom"; + name = "Shop Dressing room" }, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/laundry) +"bF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/station/burial) "bG" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -898,7 +905,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/station/cargo) "bR" = ( /obj/effect/floor_decal/borderfloor{ @@ -922,6 +929,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) +"bS" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "bT" = ( /obj/structure/bed/chair{ dir = 4 @@ -1045,7 +1062,7 @@ dir = 8; icon_state = "propulsion_l" }, -/turf/simulated/shuttle/plating/airless/carry, +/turf/simulated/shuttle/plating/carry, /area/shuttle/mining_outpost/shuttle) "ch" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1063,7 +1080,7 @@ /area/maintenance/station/cargo) "cj" = ( /obj/machinery/status_display/supply_display, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "ck" = ( /obj/structure/bed/chair/sofa/brown/left{ @@ -1072,14 +1089,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "cl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/shuttle/wall/voidcraft/green, +/area/shuttle/belter) "cm" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -1103,8 +1114,14 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "cp" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/mining_outpost/shuttle) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "cq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1129,15 +1146,16 @@ /turf/simulated/floor/wood, /area/tether/station/visitorhallway/lounge) "cs" = ( -/obj/structure/grille, -/obj/structure/sign/securearea, -/obj/machinery/door/firedoor/border_only, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/ai_monitored/storage/eva) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/foyer) "ct" = ( /obj/map_helper/airlock/atmos/pump_out_external, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ @@ -1164,15 +1182,21 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "cw" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/turf/simulated/wall/prepainted/medical, +/area/ai_monitored/storage/eva) "cx" = ( -/turf/simulated/wall/r_wall, -/area/quartermaster/belterdock) +/obj/machinery/button/remote/blast_door{ + id = "belter_blast_left"; + name = "Shuttle Blast Doors"; + pixel_y = 25 + }, +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "belter_blast_left" + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "cy" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -1203,29 +1227,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/foyer) -"cB" = ( -/obj/machinery/computer/guestpass{ - pixel_y = 32 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "cC" = ( /turf/space, /area/mine/explored/upper_level) @@ -1277,9 +1278,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "cF" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Chapel Services"; + dir = 8; + name = "Chapel Services" + }, +/obj/machinery/door/firedoor{ dir = 8 }, /turf/simulated/floor/wood, @@ -1295,11 +1298,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "cH" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -1333,9 +1332,8 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cockpit) "cK" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock) "cL" = ( @@ -1371,7 +1369,7 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/mining_outpost/shuttle) "cQ" = ( /obj/effect/floor_decal/techfloor{ @@ -1432,18 +1430,11 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "cV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/office) "cW" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -1469,9 +1460,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "cY" = ( /obj/structure/catwalk, @@ -1480,6 +1470,12 @@ }, /turf/simulated/open, /area/engineering/foyer_mezzenine) +"cZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "da" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1670,9 +1666,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "du" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) @@ -1772,12 +1766,12 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "dG" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ name = "Evacuation Hallway" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hallway/station/port) "dH" = ( @@ -1788,14 +1782,18 @@ /turf/simulated/floor/wood, /area/hallway/station/port) "dJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/obj/machinery/air_alarm{ + breach_detection = 0; + dir = 8; + pixel_x = 25; + rcon_setting = 3; + report_danger_level = 0 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "dK" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -1833,13 +1831,14 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "dP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -1876,7 +1875,7 @@ /obj/machinery/door/airlock/glass_external, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eva_port_airlock"; name = "exterior access button"; @@ -1923,12 +1922,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "ea" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "eb" = ( @@ -1970,18 +1968,11 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/item/mining_scanner, /obj/machinery/air_alarm{ pixel_y = 22 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/shoes/magboots, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/clothing/accessory/holster/waist/kinetic_accelerator, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "ef" = ( @@ -1997,13 +1988,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "eh" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" - }, -/turf/simulated/floor, -/area/chapel/office) +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "ei" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -2021,14 +2008,23 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "ej" = ( -/obj/structure/shuttle/window, /obj/effect/shuttle_landmark{ base_area = /area/quartermaster/belterdock; - base_turf = /turf/simulated/floor/tiled/asteroid_steel/airless; + base_turf = /turf/simulated/floor/tiled/monotile; landmark_tag = "belter_station"; - name = "Tether Parking Spot" + name = "Belter Parking Spot" }, -/turf/simulated/floor/airless, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "belter_blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/full, +/turf/simulated/shuttle/floor/voidcraft/lythios43c, /area/shuttle/belter) "ek" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2067,10 +2063,7 @@ "en" = ( /obj/structure/closet/wardrobe/black, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/corner/lime{ dir = 10 }, @@ -2169,7 +2162,6 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "ex" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2183,6 +2175,12 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "ey" = ( @@ -2191,16 +2189,12 @@ /area/vacant/vacant_restaurant_upper) "ez" = ( /obj/structure/sign/deck2, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "eA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/machinery/suit_cycler/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/exploration/pilot_office) "eB" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2234,7 +2228,7 @@ /area/tether/station/visitorhallway/lounge) "eE" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) "eF" = ( /obj/structure/table/rack/steel, @@ -2301,12 +2295,11 @@ /turf/simulated/floor/wood, /area/tether/station/visitorhallway/office) "eJ" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "eK" = ( @@ -2361,9 +2354,12 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "eQ" = ( -/obj/machinery/camera/network/cargo, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/foyer) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/airless, +/area/quartermaster/belterdock) "eR" = ( /obj/structure/railing{ dir = 4 @@ -2442,18 +2438,23 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "eZ" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 8; - id_tag = "belter_docking"; - pixel_x = 26 +/obj/effect/catwalk_plated/dark, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/shuttle/floor/yellow/airless, +/turf/simulated/floor, /area/shuttle/belter) "fa" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "fb" = ( /obj/structure/cable{ @@ -2560,7 +2561,7 @@ /area/maintenance/station/eng_upper) "fi" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_cshutt"; name = "interior access button"; @@ -2571,6 +2572,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "fj" = ( @@ -2609,8 +2614,10 @@ /area/hallway/station/port) "fo" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor/plating, +/area/quartermaster/office) "fp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2664,7 +2671,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "fw" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/civilian, /area/chapel/main) "fx" = ( /obj/structure/table/glass, @@ -2685,12 +2692,21 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "fA" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" +/obj/machinery/button/remote/blast_door{ + id = "belter_blast_right"; + name = "Shuttle Blast Doors"; + pixel_y = 25 }, -/obj/structure/grille, -/turf/simulated/floor/tiled, -/area/quartermaster/qm) +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "belter_blast_right" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "fB" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -2706,34 +2722,15 @@ /area/tether/exploration/pilot_office) "fC" = ( /obj/structure/sign/department/chapel, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/hallway/station/port) -"fD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "fE" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/port) "fF" = ( -/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_one) +/turf/simulated/wall/prepainted/command, +/area/mine/explored/upper_level) "fG" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -2774,6 +2771,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"fJ" = ( +/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/office) "fK" = ( /obj/structure/table/woodentable, /obj/item/folder/yellow{ @@ -2822,13 +2824,8 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "fO" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "visitor_meeting" - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor, -/area/tether/station/visitorhallway/office) +/turf/simulated/wall/prepainted/civilian, +/area/tether/station/stairs_two) "fP" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -2862,21 +2859,14 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "fT" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "fU" = ( @@ -2946,7 +2936,7 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "gb" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) "gc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2958,14 +2948,9 @@ /turf/simulated/floor/airless, /area/space) "ge" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/machinery/suit_cycler/pilot, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "gf" = ( /obj/machinery/light, /turf/simulated/floor/tiled, @@ -3012,7 +2997,7 @@ }, /area/tether/exploration) "gl" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "gm" = ( /obj/structure/table/bench/standard, @@ -3030,19 +3015,20 @@ /turf/simulated/floor/tiled/white, /area/tether/station/visitorhallway/laundry) "gn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "go" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "qm_office"; + name = "QM Office" + }, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/tiled, /area/quartermaster/qm) "gp" = ( @@ -3078,12 +3064,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "gu" = ( @@ -3096,11 +3082,12 @@ /turf/simulated/floor, /area/storage/tech) "gv" = ( -/obj/structure/closet/crate, /obj/machinery/light{ dir = 4 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "gw" = ( /obj/structure/disposalpipe/segment, @@ -3134,7 +3121,7 @@ /area/tether/station/burial) "gA" = ( /obj/machinery/mineral/processing_unit_console, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/refinery) "gB" = ( /obj/effect/floor_decal/borderfloor{ @@ -3193,6 +3180,29 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +"gF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "gG" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3237,15 +3247,8 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/belterdock/refinery) "gK" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/quartermaster/foyer) +/turf/simulated/wall/prepainted/engineering, +/area/maintenance/station/eng_upper) "gL" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -3266,7 +3269,25 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/camera/network/mining{ + dir = 4 + }, +/obj/structure/closet/walllocker{ + dir = 8; + pixel_x = -28 + }, +/obj/item/clothing/head/helmet/space/void/mining, +/obj/item/clothing/suit/space/void/mining, +/obj/item/clothing/shoes/magboots, +/obj/item/pickaxe/silver, +/obj/item/pickaxe/silver, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "gN" = ( /turf/simulated/floor/bluegrid, @@ -3326,7 +3347,15 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 1 }, -/obj/machinery/suit_cycler/pilot, +/obj/structure/closet{ + name = "voidsuit accessories" + }, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/tether/exploration/pilot_office) "gT" = ( @@ -3391,10 +3420,12 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "hb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad" + }, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled, /area/quartermaster/office) "hc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3500,7 +3531,8 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/yellow, +/obj/structure/closet/emcloset, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "hl" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -3515,8 +3547,8 @@ /turf/simulated/open, /area/vacant/vacant_restaurant_upper) "hn" = ( -/turf/simulated/wall/r_wall, -/area/tether/station/visitorhallway/lounge) +/turf/simulated/wall/prepainted/engineering, +/area/ai_monitored/storage/eva) "ho" = ( /obj/structure/closet/emcloset, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3543,8 +3575,12 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "hq" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor/yellow, +/obj/machinery/door/airlock/voidcraft{ + frequency = 2020; + id_tag = "mining_docking"; + name = "mining outpost ferry hatch" + }, +/turf/simulated/shuttle/floor/voidcraft/dark, /area/shuttle/mining_outpost/shuttle) "hr" = ( /obj/machinery/conveyor{ @@ -3574,7 +3610,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "hu" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/engineering/shaft) "hv" = ( /obj/structure/cable/green{ @@ -3597,8 +3633,15 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/large_escape_pod1) "hy" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/qm) +"hz" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "hA" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -3767,8 +3810,10 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor/plating, +/area/quartermaster/office) "hO" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -3797,17 +3842,21 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "hR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "hS" = ( /turf/simulated/floor/tiled, /area/engineering/locker_room) +"hT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "hU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3821,8 +3870,9 @@ /turf/simulated/floor/tiled/techfloor, /area/hallway/station/port) "hW" = ( -/turf/simulated/wall, -/area/quartermaster/storage) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, +/area/tether/station/visitorhallway/lounge) "hX" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3985,9 +4035,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "in" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/hallway/station/port) "io" = ( @@ -4027,7 +4075,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "iq" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/chapel/office) "ir" = ( /obj/structure/disposalpipe/segment{ @@ -4063,6 +4111,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) +"iu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "iv" = ( /obj/machinery/light_switch{ name = "light switch "; @@ -4091,9 +4148,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor, /area/quartermaster/storage) "iy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4174,8 +4231,7 @@ /obj/machinery/light_switch{ pixel_y = -28 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -4193,8 +4249,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "iG" = ( -/turf/simulated/wall, -/area/gateway/prep_room) +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "iH" = ( /obj/structure/table/rack/steel, /obj/random/tech_supply/component, @@ -4286,11 +4346,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/storage/tech) @@ -4361,28 +4417,6 @@ }, /turf/space, /area/space) -"iW" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "iX" = ( /obj/machinery/light/spot{ dir = 8; @@ -4397,21 +4431,18 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "iZ" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor, /area/maintenance/station/cargo) "ja" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "qm_office"; + name = "QM Office" }, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/tiled, /area/quartermaster/qm) "jb" = ( @@ -4466,7 +4497,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "ji" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/pilot_office) "jj" = ( /obj/machinery/door/firedoor/glass, @@ -4540,7 +4571,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "jq" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/gateway) "jr" = ( /obj/machinery/door/airlock/maintenance/common, @@ -4760,10 +4791,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "jM" = ( @@ -4845,18 +4875,11 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/item/mining_scanner, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/shoes/magboots, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/clothing/accessory/holster/waist/kinetic_accelerator, /obj/machinery/light{ dir = 1 }, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "jV" = ( @@ -4876,6 +4899,22 @@ /obj/item/folder/red, /turf/simulated/floor/wood, /area/tether/station/visitorhallway/office) +"jY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/cargo) "jZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -4968,10 +5007,7 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "kh" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/quartermaster/foyer) "ki" = ( @@ -5032,13 +5068,17 @@ }, /obj/structure/closet/secure_closet/miner, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "ko" = ( /obj/machinery/camera/network/mining{ dir = 8 }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "kp" = ( /obj/machinery/light{ @@ -5076,7 +5116,7 @@ /area/hallway/station/port) "kt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/gear) "ku" = ( /obj/structure/disposalpipe/segment{ @@ -5099,7 +5139,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai) "kx" = ( /obj/machinery/light_switch{ @@ -5208,8 +5248,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -5277,22 +5316,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "kP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/monotile, +/area/maintenance/station/cargo) "kQ" = ( /obj/structure/closet/crate, /obj/random/maintenance/clean, @@ -5315,8 +5345,8 @@ /turf/simulated/floor/tiled, /area/security/customs) "kS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "kT" = ( @@ -5442,12 +5472,10 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "ld" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "le" = ( @@ -5485,8 +5513,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -5519,7 +5546,7 @@ /area/hallway/station/port) "li" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "lj" = ( /obj/effect/floor_decal/corner/lightgrey{ @@ -5529,11 +5556,7 @@ dir = 10 }, /obj/structure/table/wooden_reinforced, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/tiled, /area/hallway/station/port) @@ -5693,6 +5716,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "lC" = ( @@ -5705,21 +5731,18 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "lD" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) -"lE" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/turf/simulated/floor/plating, +/area/quartermaster/office) +"lE" = ( /obj/structure/cable/green{ icon_state = "0-4" }, @@ -5727,7 +5750,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "lF" = ( @@ -5771,11 +5795,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "lJ" = ( -/obj/structure/closet/emcloset, /obj/machinery/light{ dir = 4 }, -/turf/simulated/shuttle/floor/yellow, +/obj/structure/table/steel_reinforced, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "lK" = ( /obj/effect/floor_decal/borderfloor, @@ -5786,8 +5810,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -5838,11 +5861,11 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "lQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/polarized/full{ - id = "pilot_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "pilot_office"; + name = "Pilot's office" }, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/pilot_office) "lR" = ( @@ -5885,7 +5908,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "lV" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/station/cargo) "lW" = ( /obj/structure/table/reinforced, @@ -5923,6 +5946,9 @@ dir = 1 }, /obj/machinery/vending/coffee, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "ma" = ( @@ -5965,9 +5991,9 @@ /obj/structure/disposalpipe/sortjunction/untagged/flipped{ dir = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor, /area/quartermaster/storage) "mf" = ( /obj/machinery/atmospherics/portables_connector{ @@ -6032,8 +6058,8 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "ml" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "mm" = ( @@ -6058,6 +6084,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/window/reinforced/tinted, /turf/simulated/floor/tiled, /area/quartermaster/office) "mo" = ( @@ -6066,8 +6093,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -6165,11 +6191,7 @@ dir = 8 }, /obj/structure/flora/pottedplant/shoot, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light{ dir = 4 }, @@ -6333,14 +6355,14 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "mQ" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "mR" = ( @@ -6367,24 +6389,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) -"mV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "mW" = ( /obj/machinery/light{ dir = 1 @@ -6398,17 +6402,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "mY" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/vending/cola{ - dir = 1 +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor/plating, +/area/quartermaster/office) "mZ" = ( /obj/structure/lattice, /turf/simulated/mineral/floor/cave, @@ -6478,9 +6485,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_one) "nh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "ni" = ( @@ -6501,22 +6506,14 @@ /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "nk" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "nl" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6575,10 +6572,7 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "nr" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/maintenance/station/eng_upper) "ns" = ( @@ -6599,11 +6593,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) "nu" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/station/visitorhallway/office) "nv" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -6625,17 +6619,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) "nx" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "ny" = ( @@ -6677,6 +6671,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) +"nD" = ( +/obj/machinery/hyperpad/centre{ + map_pad_id = "lavaland_station"; + map_pad_link_id = "lavaland_away"; + newcolor = "#fcba03" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "nE" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 8 @@ -6696,7 +6698,6 @@ /area/tether/station/visitorhallway/office) "nG" = ( /obj/structure/disposalpipe/segment, -/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/quartermaster/office) "nH" = ( @@ -6738,7 +6739,13 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "nL" = ( /turf/simulated/open, @@ -6801,7 +6808,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "nS" = ( @@ -6818,11 +6828,9 @@ /area/tether/exploration/pathfinder_office) "nT" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "nU" = ( @@ -6831,10 +6839,7 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "nV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "nW" = ( @@ -7069,9 +7074,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "os" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor, /area/quartermaster/storage) "ot" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -7080,7 +7085,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "ou" = ( @@ -7102,20 +7106,6 @@ }, /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) -"ox" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -7145,8 +7135,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "oB" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/wood, @@ -7169,18 +7158,11 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "oE" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/tether/station/burial) +/obj/machinery/suit_storage_unit/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/exploration/pilot_office) "oF" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7221,22 +7203,6 @@ /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) -"oJ" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, -/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/structure/cable, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oK" = ( /obj/machinery/air_alarm{ dir = 4; @@ -7301,11 +7267,7 @@ /area/storage/tech) "oP" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -7366,10 +7328,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "oU" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -7490,6 +7449,7 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "pi" = ( +/obj/machinery/atmospherics/valve/digital, /turf/simulated/floor/airless, /area/quartermaster/belterdock) "pj" = ( @@ -7537,7 +7497,7 @@ /obj/machinery/camera/network/mining{ dir = 4 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "pp" = ( /obj/structure/cable{ @@ -7551,10 +7511,7 @@ dir = 4 }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/tether/station/visitorhallway/lounge) "pr" = ( @@ -7655,8 +7612,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "pD" = ( @@ -7667,8 +7624,10 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "pE" = ( -/turf/simulated/wall, -/area/tether/station/stairs_two) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/violet, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "pF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7683,17 +7642,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "pG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled, -/area/tether/station/visitorhallway/lounge) +/turf/simulated/wall/prepainted/command, +/area/ai_monitored/storage/eva) "pH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7798,11 +7748,15 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "pQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/cargo) "pR" = ( /obj/machinery/light, /obj/structure/bed/chair/shuttle{ @@ -7811,11 +7765,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) "pS" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -7851,14 +7801,15 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "pV" = ( -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/camera/network/cargo, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/foyer) "pW" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7873,11 +7824,12 @@ /obj/machinery/status_display{ pixel_y = 30 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -7906,11 +7858,7 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "pZ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -7923,32 +7871,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"qb" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/sign/poster/nanotrasen{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "qc" = ( /obj/machinery/newscaster{ pixel_x = 28 @@ -7995,7 +7924,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "qf" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/storage/tech) "qg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8030,10 +7959,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "qj" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/main) "qk" = ( @@ -8071,7 +7998,7 @@ /obj/machinery/computer/shuttle_control/surface_mining_outpost{ dir = 8 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/mining_outpost/shuttle) "qo" = ( /obj/structure/cable/cyan{ @@ -8095,9 +8022,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cargo) "qp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "qq" = ( @@ -8179,7 +8104,7 @@ /area/gateway/prep_room) "qy" = ( /obj/structure/sign/department/eng, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/foyer_mezzenine) "qz" = ( /turf/simulated/floor/wood, @@ -8195,7 +8120,7 @@ /area/tether/station/stairs_two) "qC" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2b"; name = "interior access button"; @@ -8274,15 +8199,12 @@ /turf/simulated/floor/carpet/oracarpet, /area/chapel/main) "qK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/floor/wood, +/area/tether/station/burial) "qL" = ( /obj/machinery/light/small{ dir = 1 @@ -8296,6 +8218,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "qN" = ( @@ -8312,7 +8237,7 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "qO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/engineering/foyer_mezzenine) "qP" = ( /obj/structure/cable/green{ @@ -8335,18 +8260,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/structure/disposalpipe/segment{ 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/hallway/station/starboard) "qS" = ( @@ -8571,11 +8487,11 @@ /area/hallway/station/port) "rn" = ( /obj/structure/sign/warning/secure_area, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/security/nuke_storage) "ro" = ( -/turf/simulated/wall, -/area/tether/station/burial) +/turf/simulated/floor/tiled/steel_grid, +/area/tether/exploration/pilot_office) "rp" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -8743,10 +8659,7 @@ dir = 1 }, /obj/structure/flora/pottedplant/tropical, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "rG" = ( @@ -8768,6 +8681,9 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 5 }, +/obj/machinery/camera/network/tether{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/station/port) "rH" = ( @@ -8902,15 +8818,14 @@ "rT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "shopdressingroom" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "shopdressingroom"; + name = "Shop Dressing room" }, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/laundry) "rU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/storage/tech) "rV" = ( /obj/machinery/holopad, @@ -8985,11 +8900,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "sc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock) "sd" = ( @@ -9075,19 +8987,37 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "sm" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/polarized/full{ - id = "shopdressingroom" +/obj/structure/sign/warning/secure_area, +/turf/simulated/wall/r_wall/prepainted/command, +/area/security/nuke_storage) +"sn" = ( +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/tether/station/visitorhallway/laundry) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "so" = ( -/turf/simulated/wall/r_wall, -/area/hallway/station/port) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "sp" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/spacedorm1) "sq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9099,12 +9029,16 @@ /turf/simulated/floor/wood, /area/tether/station/burial) "sr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals_central6, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -9116,9 +9050,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "st" = ( @@ -9239,11 +9171,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "sG" = ( -/obj/structure/table/rack, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/security, -/obj/item/clothing/head/helmet/space/void/security, +/obj/machinery/suit_storage_unit/security, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "sH" = ( @@ -9270,7 +9198,13 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "sK" = ( /obj/effect/floor_decal/borderfloor{ @@ -9289,8 +9223,8 @@ /area/hallway/station/port) "sL" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Stairwell"; - dir = 8 + dir = 8; + name = "Stairwell" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/firedoor/glass, @@ -9388,15 +9322,6 @@ }, /turf/simulated/floor, /area/maintenance/station/cargo) -"sT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "sU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9412,7 +9337,7 @@ /area/maintenance/station/eng_upper) "sW" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "sX" = ( /obj/item/stool, @@ -9525,11 +9450,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/bluegrid, /area/ai_core_foyer) "tg" = ( @@ -9566,29 +9487,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) -"tk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "tl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9636,10 +9534,7 @@ "tq" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) @@ -9679,7 +9574,18 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "tv" = ( -/turf/simulated/shuttle/wall, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "belter_blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/shuttle/floor/voidcraft/lythios43c, /area/shuttle/belter) "tw" = ( /obj/machinery/door/firedoor, @@ -9793,12 +9699,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "tI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/maintenance/station/cargo) "tJ" = ( @@ -9828,14 +9729,18 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"tL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"tL" = ( +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -9932,7 +9837,7 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "tW" = ( /obj/structure/disposalpipe/segment, @@ -9981,25 +9886,6 @@ /obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/tether/station/visitorhallway/lounge) -"ua" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -10018,13 +9904,15 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "ud" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" +/obj/effect/catwalk_plated/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor, -/area/chapel/office) +/area/shuttle/belter) "ue" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techmaint, @@ -10088,8 +9976,15 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "um" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "belter_blast_right" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "un" = ( /obj/structure/table/wooden_reinforced, @@ -10140,8 +10035,14 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "ut" = ( -/turf/simulated/wall, -/area/tether/station/dock_one) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "uu" = ( /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) @@ -10266,7 +10167,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "uD" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/quartermaster/foyer) "uE" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -10365,9 +10266,8 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock) "uL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/station/public_meeting_room) "uM" = ( @@ -10424,11 +10324,13 @@ pixel_x = -22 }, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "uR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/r_wall, -/area/quartermaster/belterdock) +/obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "uS" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 5 @@ -10477,9 +10379,7 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "uX" = ( -/turf/simulated/wall{ - can_open = 1 - }, +/turf/simulated/wall/prepainted, /area/maintenance/station/eng_upper) "uY" = ( /obj/machinery/light_switch{ @@ -10521,7 +10421,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "GateShut"; - layer = 3.3; name = "Gateway Shutter" }, /obj/machinery/door/firedoor/glass, @@ -10570,8 +10469,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/vending/fitness, @@ -10686,9 +10584,6 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "vs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -10697,6 +10592,8 @@ name = "Engineering Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/foyer_mezzenine) "vt" = ( @@ -10754,15 +10651,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = 28 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "vz" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 8 @@ -10774,7 +10664,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/structure/cable/green{ @@ -10814,9 +10703,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "vD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -10844,9 +10730,6 @@ /obj/machinery/disposal/deliveryChute{ dir = 4 }, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/quartermaster/office) "vG" = ( @@ -10947,10 +10830,7 @@ "vP" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -10960,13 +10840,8 @@ /turf/simulated/floor/tiled/techfloor, /area/hallway/station/port) "vR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "vS" = ( @@ -11064,11 +10939,7 @@ dir = 1 }, /obj/structure/cable/cyan, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light{ dir = 4 }, @@ -11124,10 +10995,10 @@ /obj/structure/bed/chair/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "wg" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_restaurant_upper) "wh" = ( /obj/structure/disposalpipe/tagger/partial{ @@ -11135,17 +11006,13 @@ sort_tag = "Sorting Office" }, /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "wi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "wj" = ( @@ -11224,12 +11091,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/quartermaster/storage) "wp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cockpit) +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/shuttle/floor/voidcraft/light, +/area/shuttle/mining_outpost/shuttle) "wq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11253,21 +11118,16 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "ws" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "wt" = ( @@ -11328,6 +11188,9 @@ dir = 8; pixel_x = 22 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/tether/station/burial) "wz" = ( @@ -11362,6 +11225,19 @@ /obj/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/storage) +"wC" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "wD" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -11388,14 +11264,10 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "wG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_core_foyer) "wH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11411,13 +11283,25 @@ /obj/machinery/computer/shuttle_control/tether_backup{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "wJ" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + id_tag = "belter_docking"; + pixel_x = 26 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "wK" = ( /obj/machinery/computer/supplycomp/control, @@ -11447,7 +11331,7 @@ /obj/structure/sign/directions/cargo{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/starboard) "wO" = ( /turf/simulated/floor/tiled/dark, @@ -11533,7 +11417,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "wX" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11611,7 +11495,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "xf" = ( /obj/machinery/light/small{ @@ -11644,18 +11528,14 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/gateway/prep_room) "xj" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "visitor_meeting" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "visitor_meeting"; + name = "Visitor Meeting Room" }, -/obj/structure/grille, /turf/simulated/floor, /area/tether/station/visitorhallway/office) "xk" = ( @@ -11689,8 +11569,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "xo" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -11699,7 +11578,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "xq" = ( /obj/structure/disposalpipe/segment{ @@ -11709,6 +11588,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "xr" = ( @@ -11752,8 +11634,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -11926,15 +11807,11 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "xM" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/sign/directions/cargo{ + dir = 4 }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/tether/station/burial) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "xN" = ( /obj/structure/bed/chair/sofa/brown/right{ dir = 8 @@ -11943,7 +11820,13 @@ /area/chapel/office) "xO" = ( /obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/button/remote/blast_door{ + id = "belter_blast"; + name = "Shuttle Blast Doors"; + pixel_x = -23; + pixel_y = -25 + }, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "xP" = ( /obj/random/junk, @@ -11958,13 +11841,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "xR" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/cable/green, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "xS" = ( @@ -12036,7 +11918,8 @@ "xX" = ( /obj/machinery/light, /obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/yellow, +/obj/structure/closet/emcloset, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "xY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -12139,7 +12022,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "yj" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "yk" = ( /obj/structure/flora/ausbushes/brflowers, @@ -12175,12 +12058,11 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(67) }, /obj/structure/cable/green, +/obj/machinery/suit_storage_unit/pathfinder, /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) "yp" = ( @@ -12344,7 +12226,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "yF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12359,11 +12241,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "yG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -12378,6 +12256,7 @@ icon_state = "4-8" }, /obj/machinery/camera/network/civilian, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "yI" = ( @@ -12413,6 +12292,9 @@ /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/machinery/vending/cola{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "yL" = ( @@ -12440,28 +12322,36 @@ /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) "yO" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "yP" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/pilot_office) +"yQ" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "yR" = ( /obj/machinery/media/jukebox, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/foyer) "yS" = ( -/turf/simulated/wall/r_wall, -/area/hallway/station/starboard) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "yT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12588,7 +12478,7 @@ /obj/structure/shuttle/engine/propulsion{ dir = 8 }, -/turf/simulated/shuttle/plating/airless/carry, +/turf/simulated/shuttle/plating/carry, /area/shuttle/mining_outpost/shuttle) "ze" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12600,6 +12490,13 @@ /obj/overmap/entity/visitable/sector/virgo3b, /turf/space, /area/space) +"zg" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/valve/digital/open, +/turf/simulated/floor/airless, +/area/quartermaster/belterdock) "zh" = ( /obj/machinery/light{ dir = 4 @@ -12643,7 +12540,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/dark, @@ -12700,16 +12596,15 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "zq" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "zr" = ( @@ -12825,11 +12720,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/bluegrid, /area/ai) "zF" = ( @@ -12838,7 +12729,7 @@ dir = 1; pixel_y = 24 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "zG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -13019,6 +12910,14 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/exploration) +"Ad" = ( +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "belter_blast_left" + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "Ae" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -13099,15 +12998,7 @@ layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/station/dock_one) "Am" = ( @@ -13148,6 +13039,12 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) +"As" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/airless, +/area/quartermaster/belterdock) "At" = ( /obj/item/paper_bin, /turf/simulated/floor, @@ -13181,17 +13078,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "Ax" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 4; + icon_state = "pipe-c" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -13225,11 +13120,11 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cargo) "AC" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "chapel"; + name = "Chaplain Office" }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/office) "AD" = ( @@ -13288,10 +13183,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/visitorhallway/lounge) "AL" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ alarms_hidden = 1; - name = "south bump"; - pixel_y = -28; req_access = list(); req_one_access = list(11,67) }, @@ -13373,8 +13266,7 @@ /area/ai_monitored/storage/eva) "AS" = ( /obj/structure/closet/emcloset, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -13389,10 +13281,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ req_access = list(); req_one_access = list(11,67) }, @@ -13403,13 +13292,6 @@ /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/dark, /area/tether/exploration/pilot_office) -"AU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) "AV" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -13647,15 +13529,13 @@ /turf/simulated/floor/tiled/dark, /area/tether/exploration) "Bs" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/dark, @@ -13668,12 +13548,18 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/station/visitorhallway/office) "Bu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/tether/station/visitorhallway/lounge) +/area/shuttle/excursion/general) "Bv" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -13756,11 +13642,11 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "BC" = ( -/obj/structure/closet/crate, /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "BD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13845,9 +13731,7 @@ /area/shuttle/excursion/general) "BK" = ( /obj/machinery/light, -/obj/machinery/suit_cycler/mining{ - req_access = null - }, +/obj/machinery/suit_cycler/exploration, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "BL" = ( @@ -13868,6 +13752,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"BM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "BN" = ( /obj/machinery/air_alarm{ dir = 4; @@ -13997,7 +13885,7 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "BZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/chapel/chapel_morgue) "Ca" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -14060,6 +13948,9 @@ dir = 4 }, /obj/machinery/holopad, +/obj/structure/window/reinforced/polarized/full{ + id = "qm_office" + }, /turf/simulated/floor/wood, /area/quartermaster/qm) "Cg" = ( @@ -14110,11 +14001,8 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "Cl" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/wall/prepainted/civilian, +/area/hallway/station/port) "Cm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -14175,6 +14063,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_one) "Ct" = ( @@ -14262,19 +14152,16 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "Cz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "CA" = ( /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "CB" = ( @@ -14408,7 +14295,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "CP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/station/public_meeting_room) "CQ" = ( /obj/structure/cable/green{ @@ -14452,18 +14339,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/pilot_office) "CU" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "CV" = ( @@ -14493,13 +14376,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "CX" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "CY" = ( @@ -14541,10 +14423,11 @@ /area/crew_quarters/sleep/spacedorm1) "Dc" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -14588,7 +14471,12 @@ /obj/machinery/computer/shuttle_control/belter{ dir = 1 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the belter shuttle systems, to help miners find where they left their shuttle."; + gps_tag = "BELTER"; + name = "belter beacon" + }, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "Dh" = ( /turf/simulated/floor/plating, @@ -14706,7 +14594,7 @@ /area/tether/exploration) "Du" = ( /obj/structure/sign/department/mail, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "Dv" = ( /obj/structure/cable/green{ @@ -14742,7 +14630,7 @@ dir = 1 }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "belter_access_airlock"; name = "exterior access button"; @@ -14750,10 +14638,16 @@ pixel_y = -25; req_one_access = list(48,65,66) }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "Dz" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "DA" = ( /obj/structure/bed/chair/bay/chair/padded/beige, @@ -14807,10 +14701,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) -"DG" = ( -/obj/item/radio/beacon, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "DH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14932,15 +14822,19 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) "DU" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/structure/sign/securearea{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "DV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14963,15 +14857,6 @@ /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) -"DX" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/tether/station/burial) "DY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14994,24 +14879,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) -"Ea" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Eb" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -15033,9 +14900,6 @@ dir = 8; id = "packageSort1" }, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, /obj/structure/plasticflaps, /turf/simulated/floor/tiled, /area/quartermaster/office) @@ -15065,14 +14929,12 @@ /turf/simulated/wall/rshull, /area/shuttle/excursion/cockpit) "Eh" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/dock_one) "Ei" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15090,10 +14952,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "Ek" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -15127,11 +14987,7 @@ "Eo" = ( /obj/structure/table/rack/shelf, /obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, /obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration/pathfinder, -/obj/item/clothing/head/helmet/space/void/exploration/pathfinder, /obj/item/binoculars, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -15156,11 +15012,7 @@ /turf/simulated/floor/bluegrid, /area/ai) "Er" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/chapel/main) "Es" = ( @@ -15215,8 +15067,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "Ew" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -15224,7 +15074,8 @@ icon_state = "0-2" }, /obj/structure/cable/green, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "Ex" = ( @@ -15251,14 +15102,14 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Ey" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -15270,7 +15121,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Funerary Services" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/tether/station/burial) "EA" = ( @@ -15348,7 +15199,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "EG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/customs) "EH" = ( /obj/machinery/mineral/equipment_vendor/survey, @@ -15384,11 +15235,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -15403,8 +15250,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -15413,12 +15259,6 @@ /turf/simulated/mineral/vacuum, /area/mine/explored/upper_level) "EN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -15431,6 +15271,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "EO" = ( @@ -15442,6 +15283,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"EP" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "EQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15466,7 +15319,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "ES" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -15523,14 +15376,8 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "EY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/turf/simulated/wall/prepainted, +/area/tether/station/stairs_two) "EZ" = ( /obj/machinery/camera/network/exploration{ dir = 9 @@ -15558,7 +15405,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "Fc" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/locker_room) "Fd" = ( /obj/structure/cable{ @@ -15618,7 +15465,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "Fi" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration) "Fj" = ( /obj/structure/railing{ @@ -15632,9 +15479,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) -"Fk" = ( -/turf/simulated/wall/r_wall, -/area/ai_monitored/storage/eva) "Fl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -15708,9 +15552,8 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "Fr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/customs) "Fs" = ( @@ -15720,9 +15563,6 @@ /turf/simulated/floor/airless, /area/maintenance/station/eng_upper) "Ft" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -15732,6 +15572,7 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "Fu" = ( @@ -15746,7 +15587,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Fv" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/port) "Fw" = ( /obj/item/storage/secure/safe{ @@ -15770,8 +15611,8 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "Fy" = ( -/turf/simulated/wall/r_wall, -/area/chapel/chapel_morgue) +/turf/simulated/wall/prepainted/security, +/area/ai_monitored/storage/eva) "Fz" = ( /obj/structure/disposalpipe/sortjunction/flipped{ dir = 1; @@ -15796,13 +15637,13 @@ /area/tether/station/stairs_two) "FC" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/sign/nanotrasen, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/structure/sign/nanotrasen, /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_one) "FD" = ( @@ -15816,6 +15657,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) +"FF" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "FG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15826,6 +15674,9 @@ /area/hallway/station/port) "FH" = ( /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "FI" = ( @@ -15901,7 +15752,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "FS" = ( /obj/structure/cable/green{ @@ -15948,14 +15799,7 @@ /turf/simulated/floor/tiled/neutral, /area/shuttle/excursion/general) "FX" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical, -/obj/item/clothing/head/helmet/space/void/medical, +/obj/machinery/suit_storage_unit/medic, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "FY" = ( @@ -15995,7 +15839,13 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "Ge" = ( /obj/effect/floor_decal/industrial/warning{ @@ -16013,7 +15863,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "Gg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/gateway/prep_room) "Gh" = ( /obj/structure/cable/green{ @@ -16034,17 +15884,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) -"Gj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Gk" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -16101,23 +15940,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) "Gq" = ( -/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/camera/network/tether{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "Gr" = ( /obj/machinery/air_alarm{ dir = 1; @@ -16127,7 +15962,7 @@ /turf/simulated/floor/tiled/neutral, /area/shuttle/excursion/general) "Gs" = ( -/obj/structure/shuttle/window, +/obj/spawner/window/reinforced/full/firelocks, /obj/effect/shuttle_landmark{ base_area = /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar; base_turf = /turf/simulated/floor/tiled; @@ -16166,8 +16001,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "Gw" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/techfloor, @@ -16179,12 +16013,9 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "Gy" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" - }, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /obj/structure/curtain/black, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/main) "Gz" = ( @@ -16205,7 +16036,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16215,6 +16045,13 @@ }, /area/gateway/prep_room) "GB" = ( +/obj/machinery/vending/wallmed1/public{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "GC" = ( @@ -16331,7 +16168,7 @@ /area/tether/exploration) "GN" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eva_port_airlock"; name = "interior access button"; @@ -16386,7 +16223,6 @@ /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "chapel_obs"; - layer = 3.3; name = "Chapel Observation Shutters"; pixel_x = -26; pixel_y = 25; @@ -16431,6 +16267,7 @@ departmentType = 2; pixel_y = 30 }, +/obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled, /area/quartermaster/office) "GV" = ( @@ -16491,6 +16328,42 @@ }, /turf/simulated/floor, /area/tether/station/burial) +"Hd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"He" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Hf" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16567,23 +16440,13 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "Hk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/window/reinforced{ - dir = 8 + dir = 8; + pixel_x = -4 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/machinery/suit_storage_unit/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/exploration/pilot_office) "Hl" = ( /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/bcarpet, @@ -16690,6 +16553,15 @@ }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +"Hx" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad"; + req_one_access = list(1,5,31,38,47,48) + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Hy" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/floor_decal/industrial/warning{ @@ -16699,11 +16571,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) "Hz" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -16724,12 +16592,11 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "HB" = ( -/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_one) +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "HC" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -16770,6 +16637,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/tether/station/burial) "HI" = ( @@ -16839,7 +16709,7 @@ /area/shuttle/large_escape_pod1) "HQ" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_cshutt"; name = "exterior access button"; @@ -16858,11 +16728,15 @@ }, /area/tether/exploration) "HS" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/area/quartermaster/office) "HT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16884,7 +16758,7 @@ /area/tether/station/visitorhallway/office) "HV" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2b"; name = "exterior access button"; @@ -16941,8 +16815,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -16989,7 +16862,7 @@ /area/tether/station/visitorhallway/lounge) "Ie" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "If" = ( /obj/machinery/conveyor{ @@ -17018,24 +16891,15 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "Ii" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "Ij" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cockpit) "Ik" = ( @@ -17052,10 +16916,10 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "Im" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/station/burial) "In" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/foyer_mezzenine) "Io" = ( /obj/machinery/air_alarm{ @@ -17077,16 +16941,34 @@ /area/tether/exploration) "Iq" = ( /obj/structure/closet/coffin, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "Ir" = ( /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"Is" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) +"It" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/camera/network/tether{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Iu" = ( /obj/structure/bed/chair/wood/wings{ dir = 1 @@ -17132,27 +17014,22 @@ /turf/simulated/floor, /area/hallway/station/starboard) "IA" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "IB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "IC" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/office) "ID" = ( /obj/machinery/button/remote/blast_door{ @@ -17187,21 +17064,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "IG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/airless, +/area/quartermaster/belterdock) "IH" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -17334,18 +17199,8 @@ /area/tether/exploration) "IV" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/camera/network/cargo{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "IW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -17368,10 +17223,10 @@ /turf/simulated/floor/tiled, /area/tether/station/public_meeting_room) "IY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/hallway/station/atrium) "IZ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/quartermaster/qm) "Ja" = ( /obj/structure/table/woodentable, @@ -17430,9 +17285,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "Ji" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "Jj" = ( /obj/structure/disposalpipe/segment{ @@ -17454,7 +17307,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "Jm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/lounge) "Jn" = ( /obj/structure/cable/cyan{ @@ -17548,11 +17401,7 @@ /turf/simulated/floor/wood, /area/hallway/station/port) "Jt" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -17634,7 +17483,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/gear) "JB" = ( /obj/effect/shuttle_landmark{ @@ -17669,7 +17518,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "JG" = ( /obj/structure/cable/green{ @@ -17738,7 +17587,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/machinery/door/firedoor/glass, @@ -17773,13 +17621,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "JQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/station/dock_one) "JR" = ( @@ -17883,6 +17725,7 @@ dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "Kb" = ( @@ -18021,10 +17864,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "Ko" = ( /turf/simulated/floor/airless, @@ -18055,8 +17896,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/station/visitorhallway/laundry) +"Ks" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "Kt" = ( -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/mining_outpost/shuttle) "Ku" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -18153,8 +18001,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -18236,6 +18083,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) "KM" = ( @@ -18259,6 +18110,12 @@ "KO" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/station/visitorhallway/lounge) +"KP" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "KQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -18314,7 +18171,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "KU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai) "KV" = ( /obj/machinery/air_alarm{ @@ -18341,7 +18198,7 @@ /obj/structure/sign/directions/cargo{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/hallway/station/port) "KZ" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -18361,16 +18218,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "Lc" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "Ld" = ( @@ -18472,7 +18325,7 @@ dir = 8; icon_state = "propulsion_r" }, -/turf/simulated/shuttle/plating/airless/carry, +/turf/simulated/shuttle/plating/carry, /area/shuttle/mining_outpost/shuttle) "Lm" = ( /obj/machinery/ai_slipper, @@ -18529,6 +18382,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"Lq" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "Lr" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18546,6 +18405,17 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/hallway/station/starboard) +"Ls" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Lt" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -18652,7 +18522,7 @@ dir = 4; pixel_y = -8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/stairs_two) "LD" = ( /obj/effect/floor_decal/steeldecal/steel_decals8, @@ -18862,7 +18732,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/station/visitorhallway/lounge) "LW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/pathfinder_office) "LX" = ( /obj/machinery/air_alarm{ @@ -18982,27 +18852,9 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "Mk" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) -"Ml" = ( -/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/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Mm" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/airless, @@ -19033,7 +18885,9 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "Mq" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted{ + can_open = 1 + }, /area/maintenance/station/eng_upper) "Mr" = ( /obj/structure/closet/emcloset, @@ -19262,7 +19116,7 @@ dir = 8; icon_state = "pipe-j2" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/warehouse) "MP" = ( /obj/effect/floor_decal/techfloor{ @@ -19303,15 +19157,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "MS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/catwalk_plated/dark, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/floor, +/area/shuttle/belter) "MT" = ( /obj/structure/cable{ icon_state = "2-4" @@ -19330,22 +19181,14 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "MV" = ( -/obj/structure/grille, -/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" }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "MW" = ( @@ -19399,31 +19242,15 @@ /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "Nc" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/tether/station/burial) "Nd" = ( -/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" +/obj/structure/bed/chair/shuttle{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "Ne" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/large, @@ -19442,22 +19269,13 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "Ng" = ( -/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, +/turf/simulated/wall/prepainted, /area/quartermaster/foyer) "Nh" = ( /obj/machinery/air_alarm{ @@ -19467,6 +19285,30 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"Ni" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Nj" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -19491,8 +19333,7 @@ dir = 8 }, /obj/structure/dispenser/oxygen, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -19545,7 +19386,7 @@ dir = 8 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "belter_access_airlock"; name = "interior access button"; @@ -19556,6 +19397,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -19601,7 +19448,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "Nu" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "Nv" = ( /obj/effect/floor_decal/corner/brown/border{ @@ -19619,14 +19466,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Nw" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/atmos, +/obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "Nx" = ( @@ -19681,7 +19521,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "NC" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/starboard) "ND" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -19707,15 +19547,9 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "NF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) +/obj/machinery/camera/network/cargo, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "NG" = ( /obj/machinery/conveyor{ dir = 4; @@ -19815,7 +19649,6 @@ /area/ai_core_foyer) "NP" = ( /obj/structure/shuttle/window, -/obj/structure/grille, /obj/effect/shuttle_landmark{ base_area = /area/hallway/secondary/escape/medical_escape_pod_hallway; base_turf = /turf/simulated/floor/plating; @@ -19905,14 +19738,12 @@ /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/machinery/suit_cycler/mining{ - req_access = null - }, +/obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "Oa" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2a"; name = "interior access button"; @@ -19991,18 +19822,15 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "Og" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/area/quartermaster/office) "Oh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20035,14 +19863,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "Ok" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cockpit) +/turf/simulated/wall/prepainted, +/area/security/nuke_storage) "Ol" = ( /obj/machinery/newscaster{ pixel_x = 28 @@ -20060,7 +19882,7 @@ /area/shuttle/excursion/general) "On" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2l"; name = "exterior access button"; @@ -20142,7 +19964,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/machinery/door/firedoor/glass, @@ -20211,7 +20032,7 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "OE" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/refinery) "OF" = ( /obj/effect/floor_decal/techfloor{ @@ -20265,7 +20086,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/station/visitorhallway/office) "OL" = ( -/turf/simulated/shuttle/floor/yellow/airless, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor, /area/shuttle/belter) "OM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20274,7 +20096,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "ON" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/maintenance/substation/cargo) "OO" = ( /obj/structure/table/standard, @@ -20339,19 +20161,13 @@ /turf/simulated/floor, /area/storage/tech) "OU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/laundry) "OV" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "OW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -20360,6 +20176,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "OX" = ( @@ -20370,8 +20187,17 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "OY" = ( -/turf/space, -/area/space) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "OZ" = ( /obj/structure/railing{ dir = 1 @@ -20428,11 +20254,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -20487,19 +20309,12 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/item/mining_scanner, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/shoes/magboots, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/clothing/accessory/holster/waist/kinetic_accelerator, /obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "Pm" = ( @@ -20556,7 +20371,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Pr" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/gear) "Ps" = ( /obj/structure/table/rack{ @@ -20629,10 +20444,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "Py" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/wood, /area/crew_quarters/sleep/spacedorm1) @@ -20731,17 +20543,11 @@ /turf/simulated/floor/bluegrid, /area/ai) "PJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/mine/explored/upper_level) "PK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "PL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20783,6 +20589,9 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/item/binoculars, +/obj/item/binoculars{ + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/belterdock) "PP" = ( @@ -20791,9 +20600,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/table/rack/shelf{ - name = "voidsuit shelving" - }, /obj/machinery/light{ dir = 1 }, @@ -20801,29 +20607,7 @@ dir = 8; pixel_x = -4 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, -/obj/item/clothing/suit/space/void/pilot{ - pixel_x = 3 - }, -/obj/item/clothing/suit/space/void/pilot{ - pixel_x = 3 - }, -/obj/item/clothing/suit/space/void/pilot{ - pixel_x = 3 - }, -/obj/item/clothing/head/helmet/space/void/pilot{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/clothing/head/helmet/space/void/pilot{ - pixel_x = -5 - }, -/obj/item/clothing/head/helmet/space/void/pilot{ - pixel_x = -5; - pixel_y = 5 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/tether/exploration/pilot_office) "PQ" = ( @@ -20859,11 +20643,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -20897,15 +20677,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "PX" = ( -/obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/structure/table/steel_reinforced, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "PY" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "pathfinder_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "pathfinder_office"; + name = "Pathfinder's Office" }, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/pathfinder_office) "PZ" = ( @@ -20916,17 +20696,38 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "Qa" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/foyer) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Qb" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"Qc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Qd" = ( /turf/simulated/wall, /area/chapel/main) @@ -20951,9 +20752,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/visitorhallway/lounge) -"Qh" = ( -/turf/simulated/wall, -/area/quartermaster/belterdock/gear) "Qi" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -21081,8 +20879,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -21160,17 +20957,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "QC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/tinted/full, /turf/simulated/floor, /area/chapel/main) "QD" = ( @@ -21195,10 +20982,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/steel_grid, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "QG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -21211,11 +20996,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "QI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -21227,7 +21008,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "QK" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/warehouse) "QL" = ( /obj/structure/disposalpipe/segment{ @@ -21308,11 +21089,11 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/floor/yellow/airless, +/turf/simulated/shuttle/floor/voidcraft/lythios43c, /area/shuttle/belter) "QT" = ( /obj/machinery/door/blast/regular, -/turf/simulated/wall, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "QU" = ( /obj/structure/musician/piano, @@ -21375,6 +21156,9 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Ra" = ( @@ -21435,7 +21219,7 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "Rg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/station/eng_upper) "Rh" = ( /obj/machinery/air_alarm{ @@ -21497,7 +21281,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "Rn" = ( /obj/machinery/status_display/supply_display, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) "Ro" = ( /obj/structure/table/steel, @@ -21523,7 +21307,7 @@ /area/maintenance/station/eng_upper) "Rr" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/station/public_meeting_room) "Rs" = ( /obj/structure/table/rack{ @@ -21736,12 +21520,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" - }, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "qm_office"; + name = "QM Office" + }, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) "RN" = ( @@ -21749,11 +21533,7 @@ /turf/simulated/floor/bluegrid, /area/ai_core_foyer) "RO" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -21875,11 +21655,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/internals, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "Sd" = ( @@ -21957,7 +21733,7 @@ /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "Sn" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/tether/station/dock_one) "So" = ( /obj/machinery/light/small{ @@ -22081,7 +21857,7 @@ /area/vacant/vacant_restaurant_upper) "SF" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2r"; name = "exterior access button"; @@ -22102,7 +21878,7 @@ /area/tether/station/public_meeting_room) "SH" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2a"; name = "exterior access button"; @@ -22161,14 +21937,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "SN" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "SO" = ( -/turf/simulated/shuttle/wall/hard_corner, +/turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/mining_outpost/shuttle) "SP" = ( /obj/machinery/door/airlock/maintenance/common, @@ -22274,8 +22049,8 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "Ta" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "Tb" = ( @@ -22315,6 +22090,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/window/reinforced/tinted, /turf/simulated/floor/tiled, /area/quartermaster/office) "Te" = ( @@ -22326,6 +22102,16 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"Tf" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Tg" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor{ @@ -22346,9 +22132,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "Ti" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor/plating, /area/hallway/station/port) "Tj" = ( @@ -22370,7 +22154,6 @@ /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "chapel_obs"; - layer = 3.3; name = "Chapel Observation Shutters"; pixel_x = -26; pixel_y = -25; @@ -22384,9 +22167,8 @@ /turf/simulated/floor/wood, /area/tether/station/burial) "Tm" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/tether/station/burial) "Tn" = ( @@ -22551,17 +22333,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "TA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/turf/simulated/open, +/area/tether/elevator) "TB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22571,7 +22353,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/lounge) "TC" = ( /obj/effect/floor_decal/borderfloor{ @@ -22589,14 +22371,17 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/structure/sign/securearea{ + pixel_y = -32 + }, /turf/simulated/floor/tiled, /area/hallway/station/port) "TD" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "qm_office"; + name = "QM Office" }, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) "TE" = ( @@ -22613,8 +22398,7 @@ "TG" = ( /obj/structure/closet/wardrobe/xenos, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/lime{ @@ -22673,7 +22457,7 @@ /obj/machinery/camera/network/mining{ dir = 1 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "TO" = ( /obj/item/radio{ @@ -22693,16 +22477,6 @@ dir = 1 }, /area/tether/exploration) -"TP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 - }, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "TQ" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -22712,6 +22486,10 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "TS" = ( @@ -22725,14 +22503,29 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "TU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "TV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -22798,18 +22591,6 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 6 }, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/structure/closet{ - name = "voidsuit accessories" - }, /turf/simulated/floor/tiled/dark, /area/tether/exploration/pilot_office) "Ub" = ( @@ -22974,6 +22755,13 @@ /obj/item/folder/white, /turf/simulated/floor/wood, /area/tether/station/visitorhallway/office) +"Uq" = ( +/obj/effect/catwalk_plated/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor, +/area/shuttle/belter) "Ur" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -23058,12 +22846,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Uz" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "UA" = ( @@ -23130,7 +22914,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "UJ" = ( /obj/structure/table/standard, @@ -23155,7 +22939,7 @@ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/warehouse) "UN" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -23164,7 +22948,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/customs) "UO" = ( /obj/random/junk, @@ -23324,11 +23108,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -23339,20 +23119,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "Vh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/turf/simulated/open, +/area/tether/elevator/two) "Vi" = ( /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/floor_decal/borderfloor, @@ -23379,7 +23147,6 @@ /area/tether/exploration) "Vk" = ( /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, @@ -23452,7 +23219,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/gear) "Vr" = ( /obj/machinery/door/firedoor/glass, @@ -23490,25 +23257,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) -"Vv" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Vw" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; @@ -23529,8 +23277,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -23587,15 +23334,14 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "VC" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-8" }, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "VD" = ( @@ -23753,7 +23499,7 @@ /area/quartermaster/warehouse) "VR" = ( /obj/structure/ore_box, -/turf/simulated/shuttle/floor/yellow/airless, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "VS" = ( /obj/structure/railing/grey{ @@ -23867,7 +23613,6 @@ pixel_y = 30 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -23879,7 +23624,7 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "Wf" = ( /obj/structure/cable/green{ @@ -23908,6 +23653,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "Wi" = ( @@ -23936,11 +23683,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "Wj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -24068,26 +23811,15 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/item/mining_scanner, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/shoes/magboots, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/clothing/accessory/holster/waist/kinetic_accelerator, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "Wy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -24314,7 +24046,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/dark, @@ -24352,11 +24083,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals3, /turf/simulated/floor/tiled{ icon_state = "monotile" @@ -24372,7 +24099,7 @@ id_tag = "mining_docking"; pixel_y = 26 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "WU" = ( /obj/effect/floor_decal/techfloor{ @@ -24455,15 +24182,12 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "Xd" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "Xe" = ( /obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/mining_outpost/shuttle) "Xf" = ( /obj/structure/disposalpipe/segment{ @@ -24517,7 +24241,7 @@ /area/hallway/station/port) "Xk" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2l"; name = "interior access button"; @@ -24525,8 +24249,7 @@ pixel_y = -26; req_access = list(13) }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -24554,7 +24277,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "Xo" = ( @@ -24574,21 +24299,17 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "Xp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "Xq" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "packageSort1" - }, -/obj/machinery/camera/network/cargo{ - dir = 1; - name = "security camera" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/quartermaster/office) +/turf/simulated/floor/wood, +/area/tether/station/burial) "Xr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -24705,9 +24426,18 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_upper) +"XD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "XE" = ( /obj/structure/noticeboard, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "XF" = ( /obj/landmark/spawnpoint/job/ai/secondary, @@ -24741,23 +24471,12 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "XI" = ( -/obj/structure/grille, -/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" - }, -/obj/structure/window/reinforced{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "XJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -24793,6 +24512,7 @@ /obj/machinery/light, /obj/structure/closet/secure_closet/miner, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "XN" = ( @@ -24890,7 +24610,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/quartermaster/qm) "XZ" = ( /obj/structure/cable/green{ @@ -24932,25 +24652,13 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "Yc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "Yd" = ( /obj/structure/sign/deck2, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/station/stairs_two) -"Ye" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Yf" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/phoron, @@ -25042,17 +24750,12 @@ /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) "Yq" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/tether/station/burial) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "Yr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -25248,19 +24951,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"YM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "YN" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -25346,21 +25036,15 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "YW" = ( -/obj/structure/grille, -/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" - }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/dock_one) "YX" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -25391,34 +25075,11 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) -"Za" = ( -/obj/machinery/atm{ - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Zb" = ( /obj/item/storage/secure/safe{ pixel_x = -24 @@ -25432,14 +25093,13 @@ name = "Cargo Bay"; sortType = "Cargo Bay" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Zd" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -25489,11 +25149,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "Zj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 24 @@ -25604,8 +25260,26 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "Zr" = ( -/turf/simulated/wall/r_wall, -/area/security/customs) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Zs" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25681,13 +25355,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "Zz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/station/starboard) "ZA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "ZB" = ( @@ -25960,24 +25633,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light{ - dir = 4 - }, -/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/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "ZZ" = ( @@ -25990,13853 +25652,13465 @@ /area/chapel/main) (1,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(2,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(2,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (3,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (4,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(5,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(6,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(7,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(8,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(9,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(10,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(11,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(12,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(13,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(14,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(15,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(16,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(17,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(18,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(19,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(20,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(21,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(22,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(23,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(24,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(25,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(26,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(27,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(28,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(29,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(30,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(31,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(32,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(5,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(33,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(6,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(34,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(7,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(8,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(35,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(9,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(36,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(10,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(11,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(37,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(12,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(13,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(38,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(14,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(39,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(15,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(16,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(40,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(17,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(18,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(41,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(19,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(42,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(20,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(21,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(43,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(22,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(23,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(44,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(24,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(45,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(25,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(26,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(46,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(27,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(28,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(47,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(29,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(48,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(30,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(31,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(49,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(32,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(33,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(50,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(34,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(51,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(35,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(36,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(52,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(37,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(38,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(53,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(39,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov ov -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY "} -(54,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -zf -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(40,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(41,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(55,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(42,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(56,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(43,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(44,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(57,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(45,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(46,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(58,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(47,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(59,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(48,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(49,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(60,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(50,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(51,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(61,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(52,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(62,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(53,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(54,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +zf +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(63,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(55,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(56,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(64,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(57,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(65,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(58,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(59,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(66,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(60,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(61,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(67,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(62,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(68,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(63,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(64,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(69,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(65,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(66,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(70,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -Lx -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(67,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(71,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(68,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(69,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(72,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(70,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -39851,186 +39125,380 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +Lx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(71,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(73,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(72,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40045,186 +39513,380 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(73,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (74,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40240,185 +39902,185 @@ gd gd gd yy -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (75,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40434,185 +40096,185 @@ gd gd gd yy -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (76,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40627,186 +40289,186 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (77,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40821,186 +40483,186 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (78,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -41015,138 +40677,138 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (79,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -41154,47 +40816,47 @@ EM EM EM EM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY rY rY rY rY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -41208,137 +40870,137 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (80,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -41354,24 +41016,24 @@ EM EM EM EM -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM -OY -OY +ov +ov rY -OY -OY -OY -OY +ov +ov +ov +ov rY rY rY @@ -41387,8 +41049,8 @@ rY rY rY rY -OY -OY +ov +ov gd gd gd @@ -41402,139 +41064,136 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (81,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EM -EM -EM +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -41549,41 +41208,9 @@ EM EM EM EM -gd -gd -gd -gd -gd -gd -gd EM EM EM -OY -OY -rY -OY -OY -OY -OY -rY -Mq -EY -EY -EY -Mq -EY -EY -EY -Mq -rY -OY -OY -OY -rY -OY -OY -yy gd gd gd @@ -41591,192 +41218,33 @@ gd gd gd gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(82,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EM -EM -EM -EM -Qu -Qu -mZ -Qu -EM -EM EM EM EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -rY -rY -rY -rY +ov +ov rY +ov +ov +ov +ov rY -TA -Lu -AH -GH -eb -GH -AH -jQ +uX +nV +nV +nV +uX nV +nV +nV +uX rY -OY -OY -OY +ov +ov +ov rY -OY -OY +ov +ov yy gd gd @@ -41790,135 +41258,329 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(82,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +EM +EM +EM +EM +Qu +Qu +mZ +Qu +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +rY +rY +rY +rY +rY +rY +nV +Lu +AH +GH +eb +GH +AH +jQ +nV +rY +ov +ov +ov +rY +ov +ov +yy +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (83,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -41934,28 +41596,28 @@ EM EM jF jF -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -EY -EY -EY -Mq +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +nV +nV +nV +uX BG fk AO @@ -41963,20 +41625,20 @@ sj sj TH wL -Mq -EY -EY -EY -Mq -PK -PK +uX +nV +nV +nV +uX +wi +wi wg -PK -PK -PK +wi +wi +wi wg -PK -PK +wi +wi wg uu gd @@ -41984,134 +41646,134 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (84,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42128,7 +41790,7 @@ EM EM jF jF -Mq +uX kQ cO FU @@ -42152,16 +41814,16 @@ FU Rq sV MA -Mq -Mq -Mq +uX +uX +uX eW RA mK mK pg eR -Mq +uX Dh Dh Dh @@ -42178,134 +41840,134 @@ uu uu gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (85,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42322,7 +41984,7 @@ EM jF jF II -Mq +uX VF pe TH @@ -42346,9 +42008,9 @@ sj sj sj zO -Mq +uX jF -Mq +uX eW rB sj @@ -42373,133 +42035,133 @@ uu EM EM EM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (86,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42512,44 +42174,44 @@ Qu Qu EM EM -Mq +uX jF sE by -Mq +uX dm mg +uX +uX +uX +uX Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX SP -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX +uX +uX SP -Mq -Mq -Mq -Mq +uX +uX +uX +uX jF -Mq -dJ -dJ -Mq -dJ -pV -Mq -Mq +uX +nV +nV +uX +nV +nV +uX +uX Dh Dh Dh @@ -42567,133 +42229,133 @@ uu EM EM uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (87,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42710,31 +42372,31 @@ jF jF by Oz -Mq +uX iY mg -Mq +uX tR Bd Bd Oz PH ki -Mq +uX Oz -Mq +uX uu uu uu uu -Mq +uX Oz Oz Oz Oz Oz Oz -Mq +uX EM uu uu @@ -42761,133 +42423,133 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (88,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42900,35 +42562,35 @@ Qu EM EM EM -Mq +uX jF Oz Oz -Mq +uX iY Jx -Mq +uX fx Bd Mu Oz Bd Ep -Mq +uX Oz -Mq +uX EM uu uu uu -Mq +uX jW Oz Oz Oz Oz vu -Mq +uX uu uu fT @@ -42955,133 +42617,133 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (89,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43094,188 +42756,188 @@ EM EM EM EM -Mq +uX jF Oz Oz -Mq +uX fQ Jx -Mq +uX Mb Kf Xc Zp MU UF -Mq +uX Oz -Mq +uX EM EM EM uu -Mq +uX Cq Oz Oz Oz Oz xn -Mq -uu -uu -CU -le -LU -te -zq -uu -wg -Dh -Dh -Dh -Dh -jP -SE -yX -Dh -Dh -ln -js -wg -LR -uu -uu -uu +uX uu uu -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +CU +le +LU +te +zq +uu +wg +Dh +Dh +Dh +Dh +jP +SE +yX +Dh +Dh +ln +js +wg +LR +uu +uu +uu +uu +uu +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (90,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43288,35 +42950,35 @@ EM qu EM EM -Mq +uX jF Oz Oz uX iY Jx -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX +uX +uX NU -Mq +uX EM uu uu uu -Mq +uX Kg YV jW FJ Rb Ps -Mq +uX uu uu Ii @@ -43365,112 +43027,112 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (91,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43482,14 +43144,14 @@ EM EM EM EM -Mq +uX jF Oz Oz -Mq +uX fQ Jx -Mq +uX KI NU Oz @@ -43498,7 +43160,7 @@ Oz Oz Oz Oz -Mq +uX EM uu uu @@ -43512,13 +43174,13 @@ Fc Fc Fc Fc -rU +qf rU rU kT rU rU -rU +qf qf Dh Dh @@ -43543,128 +43205,128 @@ uu gd gd gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (92,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43676,23 +43338,23 @@ EM EM EM EM -Mq +uX by Oz Oz -Mq +uX iY Jx -Mq +uX AJ Oz -Mq -Mq -Mq -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX +uX hu hu hu @@ -43753,112 +43415,112 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (93,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43870,17 +43532,17 @@ EM EM EM EM -Mq +uX by by Oz -Mq +uX xm Jx SP Oz NU -Mq +uX EM EM hu @@ -43944,115 +43606,115 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (94,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44064,17 +43726,17 @@ EM EM EM EM -Mq +uX jF by by -Mq +uX iY Jx -Mq +uX Oz Oz -Mq +uX EM EM hu @@ -44125,128 +43787,128 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (95,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44262,23 +43924,23 @@ jF jF II Sx -Mq +uX iY Jx -Mq +uX eM Oz -Mq +uX EM -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX +uX +uX +uX Fc iU iU @@ -44319,129 +43981,129 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (96,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44451,20 +44113,20 @@ EM EM EM EM -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX LM uh -Rg -Rg -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX EM EM EM @@ -44513,130 +44175,130 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (97,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44645,15 +44307,15 @@ EM EM EM EM -Mq +uX Rs Jh Rb KI -Mq +uX Ic mg -Rg +uX EM EM EM @@ -44707,131 +44369,131 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (98,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44839,15 +44501,15 @@ EM EM EM EM -Mq +uX Oz Oz Oz Oz -Mq +uX Ic uh -Rg +uX WB yN EM @@ -44902,146 +44564,146 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (99,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM EM -Mq +uX LX Oz Oz BQ -Mq +uX Ic uh -Rg +uX EM uu EM @@ -45076,14 +44738,14 @@ qO Ti HL Ti -pE -pE -pE -pE -pE -pE -pE -pE +fO +fO +fO +fO +fO +EY +EY +EY EM uu uu @@ -45096,146 +44758,146 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (100,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM EM -Mq +uX Oz Oz Oz Oz -Mq +uX iY Ci -Rg +uX EM uu uu @@ -45260,7 +44922,7 @@ Vi Fc EM EM -qO +In Ul cY jb @@ -45270,14 +44932,14 @@ vs lF Ev ju -pE +fO LP nq qB -pE +fO pz gZ -pE +EY EM EM EM @@ -45291,137 +44953,137 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (101,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM EM -Mq +uX Oz Oz Oz @@ -45429,7 +45091,7 @@ Oz SP iY Ci -Rg +uX EM uu uu @@ -45454,7 +45116,7 @@ Fc Fc EM EM -qO +In Ul yv OZ @@ -45464,14 +45126,14 @@ vs tB Ev zp -pE +fO Be bM ie af vn Dl -pE +EY EM EM EM @@ -45485,145 +45147,145 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (102,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM EM -Mq +uX GG XC Oz iP -Mq +uX rR Ci -Rg +uX EM uu EM @@ -45645,10 +45307,10 @@ In Xv TZ tX -qO -qO -qO -qO +In +In +In +In Ul yv OZ @@ -45658,14 +45320,14 @@ vs tB Ev Tw -pE -pE -pE -pE +fO +fO +fO +fO Yd bc GE -pE +EY EM EM EM @@ -45680,144 +45342,144 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (103,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX Ic Ci -Rg +uX EM uu EM @@ -45852,20 +45514,20 @@ vs tB Ev zp -pE +EY qU Gb Gb Gb vx wF -pE +EY EM -Fy -Fy -Fy -Fy -Fy +BZ +BZ +BZ +BZ +BZ uu uu uu @@ -45874,131 +45536,131 @@ uu uu uu uu -Yq -DX -DX -DX -xM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Tm +Tm +Tm +Tm +Tm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (104,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -46008,10 +45670,10 @@ EM EM uu EM -Mq +uX Ic Ci -Rg +uX EM uu uu @@ -46046,152 +45708,152 @@ vs tB Ev jw -pE +EY Gb Gb Gb Gb Ef eP -pE +EY EM BZ BZ UZ DT BZ -DX -DX +Tm +Tm Im -DX -DX -DX -DX -DX +Tm +Tm +Tm +Tm +Tm Tm yb up ED -oE -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Tm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (105,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -46202,10 +45864,10 @@ PJ uu uu uu -Mq +uX iY Ci -Rg +uX EM EM uu @@ -46227,9 +45889,9 @@ In tC lP OH -qO -qO -qO +In +In +In qy my AV @@ -46241,147 +45903,147 @@ tB nC zp LC -pE -pE -pE -pE +EY +EY +EY +EY se sL -pE +EY EM -BZ -tp -zK -as -BZ -sq -gz -Ez -gz -gz -gz -gz -gz -Zu -BS -PG -Sk -oE -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +BZ +tp +zK +as +BZ +sq +gz +Ez +gz +gz +qK +Xq +gz +Zu +BS +PG +Sk +Tm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (106,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -46396,10 +46058,10 @@ PJ uu uu uu -Mq +uX iY Ci -Rg +uX EM EM uu @@ -46424,7 +46086,7 @@ In In EM EM -qO +In ih AV OZ @@ -46441,7 +46103,7 @@ CR Fp bA EX -pE +EY EM BZ tp @@ -46450,7 +46112,7 @@ qt Lh Vz qz -qz +tw qz qz HH @@ -46460,122 +46122,122 @@ xs je pc Au -oE -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Tm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (107,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -46590,10 +46252,10 @@ PJ EM uu uu -Mq +uX iY XG -Rg +uX EM EM EM @@ -46612,13 +46274,13 @@ uu uu uu uu -Rg +uX NR mD -Rg -Rg +uX +uX EM -qO +In ih AV jM @@ -46635,7 +46297,7 @@ vU dH qV dH -pE +EY EM BZ tp @@ -46644,132 +46306,132 @@ Gw BZ EB tw -ro -ro -ro -ro -ro -ro -ro -XK -Nx -ro Im Im -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Im +Im +Im +Im +Im +XK +Nx +Im +Im +Im +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (108,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -46784,10 +46446,10 @@ EM EM EM EM -Mq +uX iY Mv -Rg +uX EM EM EM @@ -46806,13 +46468,13 @@ uu uu uu uu -Rg +uX Lj ru XX -Rg +uX EM -qO +In hA yz Ky @@ -46829,7 +46491,7 @@ YS hj Vl gZ -pE +fO iq iq iq @@ -46838,150 +46500,150 @@ Ox iq Tb ym -ro +Im eu Zn zR CY wv -ro +Im sQ qz WK XO Hc -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (109,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX fQ Mi -Rg +uX EM EM EM @@ -47000,13 +46662,13 @@ uu uu uu uu -Rg -Rg +uX +uX wT -Rg -Rg +uX +uX EM -qO +In Vf XL sD @@ -47029,141 +46691,141 @@ xQ pI Xb VD -eh +AC om oB -ro -Th -PQ -zR -CY -Vx -ro -qz -Ja Im -Im -Im -uu -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Th +PQ +zR +CY +Vx +Im +qz +Ja +Im +Im +Im +uu +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (110,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -TA +nV Fs Oz SZ @@ -47175,7 +46837,7 @@ Yz bp TI ys -Rg +uX EM EM EM @@ -47195,11 +46857,11 @@ uu uu uu uu -Rg +uX Gm -Rg -Rg -Rg +uX +uX +uX In Bi ph @@ -47223,20 +46885,20 @@ QM Lb Iu EI -eh +AC om qz -ro +Im bm PQ zR CY hQ -ro +Im rz -ro -ro -ro +Im +Im +Im Im uu gd @@ -47251,107 +46913,107 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (111,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd nz Mm @@ -47366,10 +47028,10 @@ Oz NU nr Rb -Mq +uX fQ ch -Rg +uX EM EM EM @@ -47381,190 +47043,190 @@ EM EM EM uu -uu -uu -uu -uu -uu -uu -uu -uu -Rg -Kq -Rg -SS -Jt -Rg -Rg -XT -Rg -Rg -Rg -Rg -Ae -xV -lg -CP -Mk -ne -ne -ne -hG -Gx -iq -ku -zl -JP -Wb -mj -wl -fl -qz -ro -Qp -PQ -zR -Jl -CJ -ro -CY -jV -jV -FI -Im -uu -uu -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +uu +uu +uu +uu +uu +uu +uu +uu +uX +Kq +uX +SS +Jt +gK +gK +XT +gK +gK +gK +gK +Ae +xV +lg +CP +Mk +ne +ne +ne +hG +Gx +iq +ku +zl +JP +Wb +mj +wl +fl +qz +Im +Qp +PQ +zR +Jl +CJ +Im +CY +jV +jV +FI +Im +uu +uu +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (112,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -Mq +uX Ma Oz NU NU -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX Ic wX -Rg -Rg +uX +uX EM EM EM @@ -47583,7 +47245,7 @@ uu uu uu uu -Rg +uX zM Es hc @@ -47594,7 +47256,7 @@ Jj JY rI Gu -Mq +uX ap xV da @@ -47639,126 +47301,126 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (113,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -TA +nV tH NU QQ bT -Mq +uX uu uu EM -Mq +uX iY Jx Oz -Rg +uX EM EM EM @@ -47777,9 +47439,9 @@ uu uu uu uu -Rg +uX FY -Mq +uX rd hh vL @@ -47788,7 +47450,7 @@ wR fP dC DD -Mq +uX Wy eO hH @@ -47805,16 +47467,16 @@ rA kz xN ck -eh +AC xz qz -ro +Im kp nk -ro +Im mJ nx -ro +Im jV Pu Iq @@ -47830,136 +47492,136 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (114,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -TA +nV YV Oz dh Us -Mq +uX EM uu uu -Mq +uX iY uh Oz -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Rg +uX +uX +uX +uX +uX +uX +uX +uX uu uu uu @@ -47971,9 +47633,9 @@ uu uu uu uu -Rg +uX FY -Rg +uX Mz Xa Fj @@ -47982,7 +47644,7 @@ ww oG UO NE -Mq +uX lG ic NS @@ -47997,18 +47659,18 @@ iq iq iq iq -ud -ud +AC +AC iq -xz +bF cF -ro -ro -ro -ro -ro -ro -ro +Im +Im +Im +Im +Im +Im +Im Im Im Im @@ -48016,144 +47678,144 @@ Im Im LR uu -OY +ov gd gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (115,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX EM uu EM -Mq +uX iY uh Oz -Mq +uX uj Bj Oz uj uj CO -Rg +uX uu uu uu @@ -48164,10 +47826,10 @@ uu uu uu uu -Rg -Rg +uX +uX xC -Rg +uX xf BR Tx @@ -48184,144 +47846,144 @@ Rr CP CP CP -CP -CP -CP -Fv -Fv -Fv -Qd -mq -un -XV -VG -CF -ZZ -aZ -CF -Yj -CF -mk -wS -qj -uu -uu -uu -uu -uu -uu -cC -OY -OY -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +CP +CP +CP +Cl +Cl +Cl +fw +mq +un +XV +VG +CF +ZZ +aZ +CF +Yj +CF +mk +wS +qj +uu +uu +uu +uu +uu +uu +cC +ov +ov +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (116,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -48336,18 +47998,18 @@ PJ EM uu EM -Mq +uX iY eW Oz -Mq +uX BA Oz fu Oz fu Oz -Rg +uX uu uu uu @@ -48358,10 +48020,10 @@ uu uu uu uu -Rg +uX cR hg -Rg +uX Ji Ji Ji @@ -48370,7 +48032,7 @@ Ji Ji Yl GR -Rg +uX ZN DY mh @@ -48384,7 +48046,7 @@ Fm AY qi lr -Qd +fw mW Xt CF @@ -48405,117 +48067,117 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (117,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -48530,18 +48192,18 @@ uu EM uu uu -Mq +uX iY eW Oz -Mq +uX Oz ad At Oz Oz Oz -Rg +uX uu uu uu @@ -48552,19 +48214,19 @@ uu uu uu uu -Rg +uX vj Gh -Rg +uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji Yl -Rg -so +uX +Fv Vp RJ ya @@ -48599,117 +48261,117 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (118,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -48724,40 +48386,40 @@ uu uu uu EM -Mq +uX iY wX Oz -Mq +uX UW Oz XQ Oz Bj uj -Rg +uX uu uu -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX +uX +uX +uX Wj Mx -Rg +uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji Yl -Rg +uX uy vl yq @@ -48793,117 +48455,117 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (119,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -48913,26 +48575,26 @@ gd gd EM EM -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX iY ch Oz -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX Ze vj Oz @@ -48940,18 +48602,18 @@ Oz Oz Oz Oz -Rg +uX gH Nt -Rg +uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji bk -Rg +uX wn ZN DO @@ -48988,116 +48650,116 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (120,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49105,9 +48767,9 @@ gd gd gd gd -Mq -Mq -Mq +uX +uX +uX Oz MT bw @@ -49116,7 +48778,7 @@ GZ ae di NB -Mq +uX Oz Oz BN @@ -49137,15 +48799,15 @@ bw bw bw qh -Rg +uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji dB -Rg +uX Of ZN yZ @@ -49160,7 +48822,7 @@ ks AY qi lr -Qd +fw mW Wa CF @@ -49183,115 +48845,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (121,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49299,14 +48961,14 @@ gd gd gd EM -Mq +uX xL bw bw Qo -Mq -Mq -Mq +uX +uX +uX Kz RH bw @@ -49320,41 +48982,41 @@ bw Qo wY aL -Mq +uX +Rg +Rg Rg Rg Rg Rg Rg Rg -Oz -Oz Oz ZP -Rg +uX Ji Ji Hb Hb ez Ji -Rg -Rg -so +uX +uX +Fv av pF IM KY -Fv -Fv -Fv -Fv -Fv -Fv -Fv -Fv -Fv -Qd +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +fw rK jS gj @@ -49377,115 +49039,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (122,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49493,28 +49155,28 @@ gd gd gd EM -Mq +uX kK -Mq -Mq -Mq -Mq +uX +uX +uX +uX EM -Mq +uX fh xD Az -Mq +uX vj Xs jd mM Kv Kv -Rg -Rg -Rg -Rg +uX +uX +uX +uX Dz Dz Dz @@ -49523,7 +49185,7 @@ Dz Dz Rg Rg -Rg +uX qF Iz WQ @@ -49548,16 +49210,16 @@ sK Yh Fv gp -Qd -Qd -Qd -Qd -Qd -Qd +fw +fw +fw +fw +fw +fw AA Qd fs -Qd +fw Ec fw fw @@ -49571,115 +49233,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (123,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49687,29 +49349,29 @@ gd gd EM EM -Mq +uX kK -Mq +uX KU KU KU EM -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Rg +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX uu uu uu -rn +sm Dz ky Bq @@ -49717,163 +49379,163 @@ hE aX sH Dz -Dz +Ok rn -yS +NC gB WS WS WS -YM +qS aJ ot nR wW -Xj -wz -pl -FG -jR -FG -FG -FG -FG -jp -zH -Fv -gp -lV -aH -Sh -iZ -sS -Qd -Eu -QC -kU -Qd -gp -gp -FK -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Xj +wz +pl +FG +jR +FG +FG +FG +FG +jp +zH +Fv +gp +lV +aH +Sh +iZ +sS +fw +Eu +QC +kU +fw +gp +gp +lV +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (124,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49881,7 +49543,7 @@ gd gd EM EM -Mq +uX kK KU KU @@ -49917,9 +49579,9 @@ Ym xT pp pp -Ye +pp ws -ox +pp ZY qR Gq @@ -49941,14 +49603,14 @@ Jk gp Ei KV -Qd -Qd -Qd -Qd -Qd +fw +fw +fw +fw +fw yA gp -FK +lV Vw hx hx @@ -49959,115 +49621,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (125,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -50111,12 +49773,12 @@ UP EJ EJ EJ -Gj +EJ dP -cm -wN -NC -Fv +KP +Qc +XD +so fE Pt Fv @@ -50127,145 +49789,145 @@ Js Fv ht bK -zp -Fv -gp -gp -Jk -gp -Ei -cu -an -ci -ST -Dr -Dr -Dr -dg -FK -HO -VW -VW -VW -HO -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +zp +Fv +gp +gp +Jk +gp +Ei +cu +an +ci +ST +Dr +Dr +Dr +dg +lV +HO +VW +VW +VW +HO +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (126,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd EM EM @@ -50303,15 +49965,15 @@ wk eG gG Ld -WS -DG -sT -Vh -cm -NC -PB -gp -gp +Sb +Sb +Sb +Lw +Ls +TU +ut +EP +lV VB gp Fv @@ -50336,7 +49998,7 @@ gp gp gp oy -FK +lV HO HE md @@ -50347,118 +50009,118 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (127,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -50485,7 +50147,7 @@ uu uu uu uu -rn +sm Dz jz vB @@ -50493,19 +50155,19 @@ iQ YQ eK Dz -Dz +Ok rn -yS -fD -WS -WS -sT -Vh -cm NC -Ca +Is +Is +Cz +Cz +Is +xM +Qa +bS tK -mO +pQ kD mr Fv @@ -50529,130 +50191,130 @@ qY Fv Fv Fv -Fv -so -HO -oH -HP -bf -HO -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Fv +Fv +HO +oH +HP +bf +HO +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (128,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -50687,19 +50349,19 @@ Dz Dz Dz Dz -Dz -Dz +Ok +Ok NC -TP -iW -eG -ua +Is Vh -cm -NC -gp -VB -gp +Vh +Vh +Vh +Is +Qa +ut +gF +lV So PB Fv @@ -50724,7 +50386,7 @@ xv Ht WD uC -so +Fv HO oH HP @@ -50733,120 +50395,120 @@ HO uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (129,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -50884,15 +50546,15 @@ jq jq EM NC -NC -NC -NC -Vv -Ea -oJ -NC -gp -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV lV lV @@ -50903,144 +50565,144 @@ Dk Tv ht Vo -KN -dG -pr -xk -hw -OX -hw -KN -dG -pr -hw -bL -gI -iz -FT -nX -Ns -RP -HP -tn -HO -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +KN +dG +pr +xk +hw +OX +hw +KN +dG +pr +hw +bL +gI +iz +FT +nX +Ns +RP +HP +tn +HO +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (130,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -51078,15 +50740,15 @@ Zx jq EM EM -EM -EM -NC -cB -mV -qb -NC -gp -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV EM EM @@ -51098,14 +50760,14 @@ Fv nm bK ZB -Wl +yQ kN Wl Wl Wl Wl ZB -Wl +yQ kN Wl Wl @@ -51119,122 +50781,122 @@ HP tn HO uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (131,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -51272,15 +50934,15 @@ VZ jq jq EM -EM -EM -NC -Za -vD -cm -NC -jc -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV EM uu @@ -51306,7 +50968,7 @@ WA VL WA PE -so +Fv HO oH HP @@ -51314,122 +50976,122 @@ pR HO uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (132,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd EM EM @@ -51447,7 +51109,7 @@ rg ZT nL nL -ji +wG EM EM EM @@ -51466,15 +51128,15 @@ HG Ny jq EM -EM -EM -NC -tk -vD -Ml -NC -gp -VB +Is +Is +Is +Is +Is +Is +Qa +ut +gF lV EM uu @@ -51492,15 +51154,15 @@ Fv Fv Fv Fv -so -so -so -so -so -so -so -so -so +Fv +Fv +Fv +Fv +Fv +Fv +Fv +Fv +Fv HO oH HP @@ -51508,123 +51170,123 @@ bf HO uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (133,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM KU @@ -51642,9 +51304,9 @@ wG wG wG wG -EM -EM -EM +ji +ji +ji EM EM EM @@ -51663,12 +51325,12 @@ EM EM EM NC -MD -vD +sn aK -NC -PB -VB +aK +Zr +ut +Ni lV EM uu @@ -51686,138 +51348,138 @@ EM EM EM EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -HO -Vk -HP -Rk -HO -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +EM +EM +EM +EM +EM +EM +EM +EM +EM +HO +Vk +HP +Rk +HO +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (134,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -51834,11 +51496,11 @@ EM EM EM EM -EM -EM -EM -EM -EM +ji +yk +tQ +yP +ji EM EM EM @@ -51858,11 +51520,11 @@ EM EM NC pW -vD -cm -NC -gp -VB +FF +FF +Tf +Hd +gF lV EM uu @@ -51897,120 +51559,120 @@ HO uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (135,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -52029,9 +51691,9 @@ Fi Fi Fi ji -ji -ji -ji +Cv +vt +Po ji EM EM @@ -52054,154 +51716,154 @@ NC MD Ax bu -NC -gp -VB -lV -EM -uu -uu -uu -uu -EM -Fv -ht -bK -zH -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -EM -EM -uu -HO -NP -HO -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +wC +It +He +lV +EM +uu +uu +uu +uu +EM +Fv +ht +bK +zH +cw +cw +cw +cw +hn +hn +hn +pG +pG +pG +pG +pG +pG +EM +EM +uu +HO +NP +HO +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (136,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -52223,9 +51885,9 @@ Ek py py ji -yk -tQ -yP +re +lv +oe ji EM EM @@ -52249,8 +51911,8 @@ tA vD Bm NC -gp -VB +lV +jY lV EM uu @@ -52262,19 +51924,19 @@ Fv ht bK zp -Fk +cw FX AR -Fk +cw Zt AR -Fk +hn JW vh sv oR -Fk -Fk +pG +pG EM EM uu @@ -52284,113 +51946,113 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (137,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi Fi Fi @@ -52417,9 +52079,9 @@ wd gk gk ji -Cv -vt -Po +jG +FQ +oN ji IY IY @@ -52444,147 +52106,147 @@ gt em NC gp -VB -lV -EM -uu -uu -uu -EM -EM -Fv -ht -bK -zp -Fk -FX -fz -Fk -Nw -fz -Fk -Yk -fz -fz -fz -Fk -Fk -EM -EM -uu -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +VB +lV +EM +uu +uu +uu +EM +EM +Fv +ht +bK +zp +cw +FX +fz +cw +Nw +fz +hn +Yk +fz +fz +fz +pG +pG +EM +EM +uu +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (138,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi ik zI @@ -52611,13 +52273,13 @@ KZ KZ bI ji -re -lv -oe +DM +kJ +wD ji Mr ho -iG +Gg Nh fv sU @@ -52649,20 +52311,20 @@ EM Fv ht bK -zp -Fk +DU +cw eJ nA -Fk +cw eJ bj -Fk +hn eJ hB yO SN -Fk -Fk +pG +pG EM EM uu @@ -52673,112 +52335,112 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (139,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb lT @@ -52805,13 +52467,13 @@ kf ef zP ji -jG -FQ -oN +Hk +ro +Hk ji lo Sv -iG +Gg uP bD Zi @@ -52828,151 +52490,151 @@ oz oz Zz bR -BU -EL -NC -gp -VB -lV -EM -uu -uu -uu -EM -EM -Fv -ht -bK -rv -cs -Zq -fN -Nk -CH -fN -CN -Qx -fN -lW -vr -kr -Fk -EM -EM -EM -uu -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +BU +EL +NC +gp +VB +lV +EM +uu +uu +uu +EM +EM +Fv +ht +bK +rv +ea +Zq +fN +Nk +CH +fN +CN +Qx +fN +lW +vr +kr +pG +EM +EM +EM +uu +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (140,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi LA XP @@ -52999,9 +52661,9 @@ Or ef ef ji -DM -kJ -wD +oE +ro +eA ji EO ob @@ -53050,7 +52712,7 @@ fz yI fz Dq -Fk +pG EM EM EM @@ -53061,112 +52723,112 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (141,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi Ry tY @@ -53204,163 +52866,163 @@ LN Wu YB Pg -AD -oU -rJ -Nj -Dp -Ou -im -im -im -wx -Lr -Rd -Li -UY -FP -jI -Bk -lV -EM -uu -uu -uu -uu -EM -Fv -nm -lS -PD -mQ -XZ -vi -OC -nn -hU -QN -Zs -Bh -yI -fz -qH -Fk -EM -EM -EM -EM -EM -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +AD +oU +rJ +Nj +Dp +Ou +im +im +im +wx +Lr +Rd +Li +UY +FP +jI +Bk +lV +EM +uu +uu +uu +uu +EM +Fv +nm +lS +PD +mQ +XZ +vi +OC +nn +hU +QN +Zs +Bh +yI +fz +qH +pG +EM +EM +EM +EM +EM +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (142,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -53393,13 +53055,13 @@ kE ji RO Pq -iG +Gg Aq eB Zi Mp Uk -iG +Gg Hn jh jk @@ -53438,7 +53100,7 @@ lN CM Pa vP -Fk +pG EM EM EM @@ -53448,113 +53110,113 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (143,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -53587,13 +53249,13 @@ kE ji vK vK -iG +Gg id eB Zi Mp UC -iG +Gg zJ Uo NZ @@ -53607,148 +53269,148 @@ Wi BU cm NC -gp +PB VB lV -EM -uu -uu -uu -EM -EM -Fv -ht -Wl -DE -cs -YI -tU -UG -dd -zh -JZ -Ww -KJ -kA -zy -RG -Fk -EM -EM -EM -EM -EM -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +EM +uu +uu +uu +EM +EM +Fv +ht +Wl +DE +ea +YI +tU +UG +dd +zh +JZ +Ww +KJ +kA +zy +RG +pG +EM +EM +EM +EM +EM +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (144,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -53761,7 +53423,7 @@ nh sA sy Eg -Ok +Ij Kj Eg pZ @@ -53781,16 +53443,16 @@ gS ji vK vK -iG +Gg Qb mt Zi Mp nQ -iG +Gg Hn Uo -hC +ge Gg Lz Np @@ -53814,10 +53476,10 @@ Fv RY TM TC -Fk +Fy ld fm -Fk +Fy ea xR Ew @@ -53825,8 +53487,8 @@ SN Aj VC SN -Fk -Fk +pG +pG EM EM EM @@ -53835,126 +53497,126 @@ EM uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (145,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY qZ qZ KM -kP +OW UV uI Cb qs -aI +Ij lR Qi Eg @@ -53981,174 +53643,174 @@ Gf jk RS nQ -iG +Gg zJ Uo BK Gg oz -Np -Np -oz -Zz -bR -BU -cm -NC -gp -VB -lV -uu -uu -EM -EM -EM -EM -Fv -Fv -hV -Fv -Fk -sG -fz -Fk -OI -fz -fz -fz -jK -ce -fz -Uu -Fk -EM -EM -EM -EM -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Np +Np +oz +Zz +bR +BU +cm +NC +gp +VB +lV +uu +uu +EM +EM +EM +EM +Fv +Fv +hV +Fv +Fy +sG +fz +Fy +OI +fz +fz +fz +jK +ce +fz +Uu +pG +EM +EM +EM +EM +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (146,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi vE Cx qZ qZ oM -kP +OW uv ue tS VP -aI +Ij CB cJ Eg @@ -54175,7 +53837,7 @@ Lt kM Sm Ik -iG +Gg Hn xt hC @@ -54202,10 +53864,10 @@ lV DQ DQ zV -Fk +Fy sG CZ -Fk +Fy OI fz nB @@ -54214,7 +53876,7 @@ pD GN fz Uu -Fk +pG EM EM EM @@ -54223,126 +53885,126 @@ EM uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (147,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi jT tY qZ qZ oM -kP +OW EH eo Tt hJ -aI +Ij Kw AL Eg @@ -54374,172 +54036,172 @@ Gg Gg Gg Gg -NC -NC -NC -NC -NC -JX -BU -cm -NC -gp -LQ -lV -lV -uu -lV -dS -QJ -kv -lV -vQ -DQ -DQ -Fk -Fk -Fk -Fk -Fk -Fk -ES -Fk -Fk -cW -Fk -Fk -EM -EM -EM -EM -EM -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +NC +NC +NC +NC +NC +JX +BU +cm +NC +gp +LQ +lV +lV +uu +lV +dS +QJ +kv +lV +vQ +DQ +DQ +Fy +Fy +Fy +Fy +pG +pG +ES +pG +pG +cW +pG +pG +fF +EM +EM +EM +EM +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (148,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi NV Br qZ qZ oM -kP +OW uv UL hF kd -aI +Ij Ap Yo -wp +Ij Wr xU Ds @@ -54595,12 +54257,12 @@ EM EM EM EM -Fk +pG qL to -Fk +pG Bf -Fk +pG EM EM EM @@ -54612,125 +54274,125 @@ EM uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (149,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb XP qZ qZ oM -kP +OW Pd uI Ur wb -aI +Ij jO pf qT @@ -54768,151 +54430,151 @@ tb zk kq Vd -Un -cm -NC -gp -VB -gp -lV -lV -lV -lV -lV -jr -lV -lV -lV -lV -lV -lV -lV -EM -EM -Fk -mu -mf -Fk -xW -Fk -EM -EM -EM -EM -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Un +cm +NC +gp +VB +gp +lV +lV +lV +lV +lV +jr +lV +lV +lV +lV +lV +lV +lV +EM +EM +pG +mu +mf +pG +xW +pG +EM +EM +EM +EM +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (150,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -54983,12 +54645,12 @@ lV lV uu EM -Fk -Fk -Fk -Fk +pG +pG +pG +pG dV -Fk +pG EM EM EM @@ -54998,115 +54660,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (151,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -55149,158 +54811,158 @@ Uj QK aq jg -TX -Te -xc -xc -Af -WS -qS -sP -fO -IC -IC -IC -gp -gp -gp -Ir -su -la -Pp -Ir -Ir -fI -Ir -at -tt -lV -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +TX +Te +xc +xc +Af +WS +qS +sP +xj +IC +IC +IC +gp +gp +gp +Ir +su +la +Pp +Ir +Ir +fI +Ir +at +tt +lV +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (152,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -55345,13 +55007,13 @@ yd jg TX Te -fO -fO -fO -fO +xj +xj +xj +xj xr -fO -fO +xj +xj yW Dm sp @@ -55386,115 +55048,115 @@ Ge Ge Ge uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (153,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi Ry tY @@ -55539,7 +55201,7 @@ Nu eC TX AP -fO +xj vO vO vO @@ -55563,132 +55225,132 @@ OU ry Ir lV -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (154,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi LA BE @@ -55706,7 +55368,7 @@ Pz ct OV Mt -OW +Bu Ug iX nt @@ -55714,10 +55376,10 @@ qZ Or ef xH -My -My -My -My +Fi +Fi +Fi +Fi hy oF kY @@ -55733,7 +55395,7 @@ Nu hK CI Te -fO +xj vO DA nF @@ -55762,127 +55424,127 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (155,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb nE @@ -55908,7 +55570,7 @@ RI ay ef WL -My +Fi DS rN Wn @@ -55927,155 +55589,155 @@ Du nf Uy Te -fO +xj vO DA IP -yu -Ys -NJ -KF -BP -sp -HI -LG -bG -sp -oZ -op -sm -lw -Kr -Xh -OU -lV -EV -lV -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +yu +Ys +NJ +KF +BP +sp +HI +LG +bG +sp +oZ +op +bE +lw +Kr +Xh +OU +lV +EV +lV +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (156,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY Fi RV @@ -56121,8 +55783,8 @@ li fG TX Te -fO -vO +IC +nu MY Dj HU @@ -56150,125 +55812,125 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (157,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY Fi @@ -56296,7 +55958,7 @@ sh sh sh mx -My +Fi My rD vv @@ -56310,12 +55972,12 @@ Oe rx mU kg -Xq +HD kS DB TX Te -fO +xj vO lL lA @@ -56344,126 +56006,126 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (158,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY po yE @@ -56477,25 +56139,25 @@ yE yE yE UI -cx +yj UX uK -cx +yj Fi bb bb -My -My +Fi +Fi kF -Xp +pE dk -My -My -My -My -My +Fi +Fi +aI +aI +aI hy -fA +ja fg go ja @@ -56509,7 +56171,7 @@ Nu cE Tn Te -fO +xj vO dp gx @@ -56525,7 +56187,7 @@ JO sp ol gL -rT +bE Sw Jc TG @@ -56538,140 +56200,140 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (159,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI +cl +cl +cx +Ad +cl tv tv -tv -tv -tv -tv -tv -tv +cl OA FR -cx +yj UX UX Pr @@ -56679,7 +56341,7 @@ Ka aU pA kn -hW +gb bX km Aw @@ -56703,7 +56365,7 @@ Nu PL TX vY -fO +xj vO vO vO @@ -56732,140 +56394,140 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (160,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI QS BC OL +MS gM -gM -gM -PX -tv -tv +HB +eh +cl +cl FR -cx +yj UX UX Pr @@ -56873,7 +56535,7 @@ jL Sd TJ XM -hW +gb tJ TS TS @@ -56897,11 +56559,11 @@ Nu Tq Sf Te -fO -fO -fO -fO -fO +xj +xj +xj +xj +xj ac rw IC @@ -56926,142 +56588,142 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (161,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI QS VR OL -OL +Uq OL OL xO Dg ej TN -cx -cx -cx +yj +yj +yj Pr Eb QD @@ -57096,10 +56758,10 @@ xc xc xc pt -pG +QF hv NX -Yc +hW LV oq Qg @@ -57117,141 +56779,141 @@ at lV gd gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (162,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI QS gv eZ -OL -wJ +ud wJ +Nd PX -tv -tv +cl +cl Dy nw sJ @@ -57261,7 +56923,7 @@ LH gr Na KT -hW +gb wH mz EW @@ -57293,7 +56955,7 @@ Od bq DL dM -Yc +hW UQ oq oq @@ -57314,139 +56976,139 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (163,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI -tv -tv -tv +cl +cl +fA um +cl tv tv -tv -tv +cl OA -FR +OY xp nK We @@ -57455,11 +57117,11 @@ ee Xl cb tq -hW -hW +gb +gb Xp -hW -hW +gb +gb lp Cp SL @@ -57508,138 +57170,138 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (164,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY xe +cZ +cZ +cZ +hT +cp +zg +eQ KL -KL -KL -KL -KL -KL -KL -KL -KL -KL +yS +yS fa xp Gd @@ -57649,7 +57311,7 @@ jU ri yl hI -Qh +Pr wo aC iF @@ -57702,142 +57364,142 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (165,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY rY rY ko +BM pi -pi -pi -pi -cx -cx -cx +IG +As +yj +yj +yj IB Tz -uR +sW JA Pl ri @@ -57865,7 +57527,7 @@ Bl yg XE JK -Xm +iu dA PF PF @@ -57884,149 +57546,149 @@ rV Jb iy jJ -HY -pq -Jm -Jm -Jm -Id -hn -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +HY +pq +Jm +Jm +Jm +Id +Jm +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (166,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY rY -cx +yj sc sc sc -cx -cx +yj +yj KC TY QL @@ -58084,138 +57746,138 @@ jE Kx WE ug -Bu +hR gd gd gd gd gd -OY -OY +ov +ov tT -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov iV -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (167,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY -cx +yj dR PO Ms @@ -58231,7 +57893,7 @@ qg YH ab jC -Qh +Pr GO Ia Su @@ -58245,7 +57907,7 @@ Nq vI RF VT -hW +gb iv rx rx @@ -58253,10 +57915,10 @@ gC yx Nu lZ -Xm +XI nT -xc -xc +lb +Lq VN gf bB @@ -58278,138 +57940,138 @@ RK RR RR GL -Bu +hR gd gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (168,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY -cx +yj aW pw Ph @@ -58431,21 +58093,21 @@ Sg zQ gb Uz -nu +Uz wB Ig -pQ +Uz Ig Fq -nu Uz -hW +Uz +gb BL tO tO zw ds -kS +fJ mY hN lD @@ -58472,137 +58134,137 @@ Jb Jb Jb DV -Bu +hR gd gd gd gd -OY -OY -Hk +ov +ov +Al SH -MS -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Al HV -DU -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (169,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj JF -uR +sW ER yj yj @@ -58625,15 +58287,15 @@ gl gl gb Ws -Eh +Uz Vm TS -pQ +Uz TS lO -cw +Uz Xz -hW +gb qc Ai aM @@ -58641,9 +58303,9 @@ Zy nG hb Og -lb +iG HS -xc +Hx mX TR eX @@ -58665,136 +58327,136 @@ co co co hf -mw -Bu -gd -gd -gd -OY -OY -OY -cl -kV -AU -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -ge -lm -HB -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +mw +hR +gd +gd +gd +ov +ov +ov +JQ +kV +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +JQ +lm +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (170,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj MH lz BX @@ -58819,27 +58481,27 @@ ly gl Ws Ws -XI +MV wB Ig MV Ig Fq -YW +MV cM -hW +gb Nu cj EK PU rc -li cV IV -vy -fo +IV +IV +uR xq -xc +Xm eU Ol EG @@ -58860,135 +58522,135 @@ oc oc oo DV -hn -TU -TU -TU +Jm +JQ +JQ +JQ Sn -TU -TU -eA +JQ +JQ +JQ ha -eA -TU -TU -TU +JQ +JQ +JQ +JQ Sn -TU -TU -TU -TU +JQ +JQ +JQ +JQ Sn -TU -TU -TU -Cl +JQ +JQ +JQ +JQ wA -Cl -ut -TU -TU -TU -ut -ut -TU -TU -IG -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +Sn +JQ +JQ +JQ +Sn +Sn +JQ +JQ +Al +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (171,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj To lz gU @@ -59022,21 +58684,21 @@ gd gd gd gd -OY +ov ON ON DW ON ON NF -lV -lV -FH +nD +hz +Nu lB FH uD uD -Zr +EG jB mo EG @@ -59056,7 +58718,7 @@ oo sN AW OP -OP +Yq qv Rh OP @@ -59066,7 +58728,7 @@ Oa Oo OP tF -OP +Yq oD OP qv @@ -59074,127 +58736,127 @@ WY OP OP qv -OP +Yq WY OG qC MB IK OP -qv +tF OP Xk Ly bN eY JS -OY +ov Hm -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (172,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj IB OO Rx yj -bo -bo -bo +OE +OE +OE Qe bl Qe -bo -bo +OE +OE gl gl Uf @@ -59222,15 +58884,15 @@ QH Fb Ho ON -Cz -tt -lV -GB -qM +PK +PK +vy +Nu +pV GB uD rY -Zr +EG bt CS EG @@ -59250,7 +58912,7 @@ oo bO gq Oh -Oh +YW qN ng vN @@ -59260,7 +58922,7 @@ rW Jg ze nJ -ze +Eh GP ze Nl @@ -59268,13 +58930,13 @@ VA JC ze iM -ze +Eh FC -ty +JC Wh -ty +JC Cs -ty +JC CA ty qq @@ -59282,106 +58944,106 @@ lf eS xJ On -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (173,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj lH UX eL -bo +OE xS ZR lI @@ -59392,11 +59054,11 @@ wm ml ia Uf -cp +SO yn yn yn -cp +SO kk gl gd @@ -59416,15 +59078,15 @@ aN DR qD ON -Dc -Qt -lV -eQ +Nu +bC +Nu +Nu qM -GB +cs uD rY -Zr +EG cH Xx EG @@ -59444,7 +59106,7 @@ oo rE VS Mg -Qs +bo qv au Qs @@ -59454,7 +59116,7 @@ pS Qs Qs wE -Qs +bo Lg Qs CK @@ -59462,120 +59124,120 @@ bz Qs Lg qv -Qs +bo BY -Qs +dJ qv Qs ss Qs -qv +wE Qs HA -eA -fF -fF -qK -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(174,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +JQ +JQ +JQ +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(174,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj lH UX eL -bo +OE jo no XW @@ -59586,11 +59248,11 @@ Md IO ek rM -cp +SO hk -Xe +wp xX -cp +SO UK gl gd @@ -59611,18 +59273,18 @@ SA iK YE Dc -Ir -lV -GB +Ks +Ks +kP fi wI uD rY -Zr -Zr -Zr -Zr -hn +EG +EG +EG +EG +Jm XA Vc ZE @@ -59638,137 +59300,137 @@ uZ AG AG Sn -fF -fF +JQ +JQ Sn -fF -fF -fF +JQ +JQ +JQ Sn -fF -fF -fF -fF +JQ +JQ +JQ +JQ Sn -fF -Cl +JQ +JQ wA -Cl +JQ Sn -fF -fF -fF -ut -fF -fF -ut -fF -fF -fF -ut -ut -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +JQ +JQ +Sn +JQ +JQ +Sn +JQ +JQ +JQ +Sn +Sn +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (175,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx -cx -cx -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj +yj +yj +yj OE Fe Ha @@ -59805,18 +59467,18 @@ Gv ON ON OR -Ir -FK -Qa +Qt +lV +uD Rf -Qa +kh uD rY rY rY rY rY -hn +Jm lu Dn tZ @@ -59831,138 +59493,138 @@ VS bZ do CV -hn -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -Cl +Jm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +JQ Fg -HB -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (176,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE dY ZA @@ -60000,8 +59662,8 @@ xx Vr zv tt -FK -Qa +lV +uD oI kh rY @@ -60010,10 +59672,10 @@ rY rY rY rY -hn +Jm hR hR -hn +Jm OJ IJ Jm @@ -60025,138 +59687,138 @@ do AG AG KO -Bu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -Nd +hR +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +Al SF JQ -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (177,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE If ZA @@ -60168,11 +59830,11 @@ lc gl kx pX -cp +SO zF Kt wf -cp +SO JH gl gd @@ -60186,7 +59848,7 @@ gd gd gd gd -OY +ov lV Ir Ir @@ -60194,10 +59856,10 @@ Ir lV bQ lV -FK +lV Ng HQ -gK +kh rY rY rY @@ -60205,12 +59867,12 @@ rY rY rY rY -OY -OY -hn -hn -hn -hn +ov +ov +Jm +Jm +Jm +Jm CV aa tG @@ -60219,138 +59881,138 @@ tG CV KO rj -Bu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +hR +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (178,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE NG ZA @@ -60362,11 +60024,11 @@ Ck gl Hz BD -cp +SO WT Kt wf -cp +SO kk gl rY @@ -60387,358 +60049,358 @@ Uc wc lV vd -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov rY rY rY rY -OY -OY -OY -OY +ov +ov +ov +ov QE -OY -hn -hn +ov +Jm +Jm hR hR -hn +Jm hR hR -hn -hn -hn -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Jm +Jm +Jm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov AM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(179,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OE -Il -bo -Zj -mi -Xo -bo -Ck -gl -Rm -Xr -cp -lJ -cP -lJ -cp -kk -gl -rY -rY -rY -OY -OY -OY -OY -OY -OY -OY -rY -rY -lV -tI -tI -tI -lV -vd -OY -OY -OY -uM -OY -OY -OY -rY -rY -rY -rY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(179,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +OE +Il +OE +Zj +mi +Xo +OE +Ck +gl +Rm +Xr +SO +lJ +cP +lJ +SO +kk +gl +rY +rY +rY +ov +ov +ov +ov +ov +ov +ov +rY +rY +lV +tI +tI +tI +lV +vd +ov +ov +ov +uM +ov +ov +ov +rY +rY +rY +rY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (180,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE NG ZA @@ -60750,189 +60412,189 @@ Ck gl mB kO -cp +SO SO qn SO -cp +SO UK gl rY rY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov rY -OY -OY -OY -OY +ov +ov +ov +ov rY vd -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov rY rY rY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (181,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE mS ed @@ -60945,390 +60607,390 @@ gl du sl rh -cp +SO Gs -cp +SO rh kk gl rY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov oi -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(182,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OE -OE -OE -OE -OE -OE -OE -OE -gl -rh -Rp -Kp -Kp -Kp -Kp -Kp -px -gl -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(182,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +OE +OE +OE +OE +OE +OE +OE +OE +gl +rh +Rp +Kp +Kp +Kp +Kp +Kp +px +gl +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (183,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gl gl gl @@ -61339,1901 +61001,1901 @@ QT QT gl gl -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (184,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(185,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(186,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(185,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(186,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (187,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (188,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(189,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(190,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(189,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(190,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (191,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (192,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm index f0d2852cac..bc5b92ef90 100644 --- a/maps/tether/levels/surface1.dmm +++ b/maps/tether/levels/surface1.dmm @@ -119,7 +119,7 @@ /obj/machinery/door/airlock/mining, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "aei" = ( /obj/structure/extinguisher_cabinet{ @@ -183,10 +183,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "aga" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "agi" = ( @@ -194,6 +192,9 @@ icon_state = "1-4" }, /obj/effect/floor_decal/industrial/warning/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "agK" = ( @@ -243,7 +244,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "aic" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_one) "aih" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -304,11 +305,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "ajN" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -425,12 +422,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "amh" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "amv" = ( @@ -479,22 +475,18 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "anu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "aob" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/structure/curtain/black{ + icon_state = "open" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/engineering/atmos_intake) +/area/crew_quarters/visitor_dining) "aoc" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -610,6 +602,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"aqB" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "aqJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -650,10 +645,7 @@ /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "arB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -718,6 +710,9 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "atu" = ( @@ -730,15 +725,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) -"atv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/rnd/outpost/mixing) "atJ" = ( /obj/structure/railing{ dir = 8 @@ -799,14 +785,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "auv" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/tram) "auC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -846,8 +826,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -868,7 +847,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside1) "avD" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/tether/surfacebase/outside/outside1) "avJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -950,23 +929,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) -"axp" = ( -/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/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "axr" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, @@ -1015,7 +977,7 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "azD" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lowmedbaymaint) "azH" = ( /obj/machinery/door/firedoor/glass, @@ -1045,7 +1007,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "aAw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/mimeoffice) "aAF" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -1193,7 +1155,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "aEl" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/holodeck_control) "aEI" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -1250,10 +1212,7 @@ /obj/effect/floor_decal/corner/blue/border, /obj/machinery/light, /obj/structure/cable/orange, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/crew_quarters/showers) "aFW" = ( @@ -1377,7 +1336,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "aIm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/primary) "aIF" = ( /obj/effect/floor_decal/borderfloor{ @@ -1450,9 +1409,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +"aKe" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "aKB" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -1684,7 +1658,6 @@ dir = 8 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -1724,11 +1697,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -1938,7 +1907,7 @@ }, /area/tether/surfacebase/old_tram) "aVW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/tankstorage) "aWe" = ( /obj/structure/catwalk, @@ -2019,7 +1988,7 @@ }, /area/tether/surfacebase/old_tram) "baG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/storage/surface_eva) "baS" = ( /obj/machinery/air_alarm{ @@ -2066,8 +2035,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -2197,6 +2165,20 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) +"bhf" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "bhU" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -2296,8 +2278,8 @@ /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Construction Site"; - dir = 8 + dir = 8; + name = "Construction Site" }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/surface_one_hall) @@ -2339,7 +2321,6 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) "blB" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2352,6 +2333,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "bmn" = ( @@ -2547,8 +2531,8 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "bre" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/public_garden_one) "brf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -2679,22 +2663,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"bwo" = ( -/obj/machinery/light{ - dir = 1 - }, -/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, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "bws" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2771,8 +2739,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/power/apc/high{ - dir = 4; +/obj/machinery/power/apc/high/east_mount{ pixel_x = 28 }, /turf/simulated/floor/tiled, @@ -2800,11 +2767,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -2846,7 +2809,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) "byY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/emergency_storage/atrium) "bzF" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -2927,8 +2890,8 @@ /turf/simulated/floor/tiled/steel_ridged, /area/rnd/outpost/mixing) "bAS" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) +/turf/simulated/wall/prepainted/science, +/area/tether/surfacebase/outside/outside1) "bAT" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -2942,7 +2905,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "bBd" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/processing) "bBx" = ( /obj/structure/cable/green{ @@ -3006,17 +2969,14 @@ }, /obj/structure/table/standard, /obj/item/bikehorn/rubberducky, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/crew_quarters/showers) "bEk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/door/firedoor{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -3064,7 +3024,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_4) "bEZ" = ( @@ -3090,9 +3052,27 @@ /obj/machinery/atmospherics/pipe/tank/oxygen, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"bFr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "bFv" = ( /obj/structure/sign/biohazard, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/mimeoffice) "bFx" = ( /obj/effect/floor_decal/industrial/warning{ @@ -3161,7 +3141,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 10 }, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -3249,7 +3228,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) "bJY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/atmos) "bKt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3302,7 +3281,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "bLp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/research) "bLs" = ( /obj/structure/cable/heavyduty{ @@ -3318,7 +3297,6 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "bLI" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/medical{ id_tag = "Psych"; name = "Mental Health" @@ -3336,16 +3314,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "bLN" = ( /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -3489,10 +3465,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -3501,14 +3473,13 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "bRr" = ( /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -25 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -3549,11 +3520,10 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) "bSz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/lowernortheva/external) "bSA" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -3645,11 +3615,11 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/cave) "bWi" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "psych_office_inside" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "psych_office_inside"; + name = "Psych Office - Inside" }, -/obj/structure/grille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "bWA" = ( @@ -3705,7 +3675,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_7) "bXz" = ( @@ -3755,8 +3727,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -3788,9 +3759,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/processing) "bYF" = ( -/turf/simulated/wall{ - can_open = 1 - }, +/turf/simulated/wall/prepainted/medical, /area/maintenance/lowmedbaymaint) "bYP" = ( /obj/landmark{ @@ -3855,9 +3824,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "cbm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "cbt" = ( @@ -3886,7 +3854,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; dir = 8; frequency = 1379; master_tag = "virology_airlock_control"; @@ -3916,7 +3884,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "ccx" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/clownoffice) "cdo" = ( /obj/effect/floor_decal/industrial/warning/dust, @@ -3925,6 +3893,20 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) +"cdp" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "cdU" = ( /obj/structure/railing{ dir = 8 @@ -4218,10 +4200,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "ckK" = ( @@ -4337,8 +4316,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/airlock_sensor/phoron/airlock_interior{ + pixel_x = 33; + pixel_y = 24 + }, +/obj/map_helper/airlock/sensor/int_sensor, /turf/simulated/floor/tiled, -/area/tether/surfacebase/lowernorthhall) +/area/tether/surfacebase/lowernortheva) "cnc" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -4484,7 +4468,9 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 4 + }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -4569,7 +4555,7 @@ /obj/structure/sign/directions/evac{ name = "\improper Secondary Evacuation Route" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/xenoflora) "cug" = ( /obj/effect/floor_decal/borderfloor{ @@ -4718,7 +4704,7 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -4727,18 +4713,20 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "cwT" = ( -/obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "cxs" = ( -/turf/simulated/wall, -/area/tether/surfacebase/security/weaponsrange) +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/engineering/atmos) "cxv" = ( /obj/structure/cable{ icon_state = "1-4" @@ -4758,11 +4746,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -4843,6 +4827,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "cAy" = ( @@ -4905,14 +4892,47 @@ /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) "cBT" = ( -/turf/simulated/wall/r_wall, -/area/engineering/atmos_intake) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/north_stairs_one) "cCl" = ( /obj/structure/table/borosilicate, /turf/simulated/floor/wood, /area/vacant/vacant_bar) +"cCq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"cCs" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "cCw" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/lower/solars) "cCy" = ( /obj/machinery/button/remote/blast_door{ @@ -4954,11 +4974,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "0-2" @@ -5033,10 +5049,7 @@ /turf/simulated/floor/tiled, /area/maintenance/lower/atmos) "cGj" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -5106,11 +5119,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "cHI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "psych_birdcage" - }, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "cHP" = ( @@ -5216,11 +5226,7 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "cKB" = ( @@ -5353,7 +5359,7 @@ /area/crew_quarters/sleep/Dorm_6) "cMx" = ( /obj/structure/sign/electricshock, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/solars) "cNH" = ( /obj/structure/table/marble, @@ -5375,7 +5381,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) "cNN" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/brig/bathroom) "cNV" = ( /obj/structure/window/reinforced, @@ -5418,7 +5424,7 @@ /area/maintenance/lowmedbaymaint) "cPy" = ( /obj/structure/sign/warning/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/airlock) "cPE" = ( /obj/structure/table/alien/blue{ @@ -5493,10 +5499,7 @@ /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "cRX" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "cSe" = ( @@ -5812,8 +5815,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -5839,11 +5841,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "cZI" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -5887,7 +5886,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -6040,7 +6039,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock{ name = "Unisex Showers" }, @@ -6050,8 +6051,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "die" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -6111,6 +6111,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"djJ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "dkx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6161,10 +6167,23 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "dkS" = ( -/turf/simulated/wall, -/area/maintenance/lower/atmos) +/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/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "dlE" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/centralstairwell) "dlX" = ( /obj/machinery/portable_atmospherics/powered/pump, @@ -6297,10 +6316,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/portables_connector{ dir = 1 }, @@ -6384,11 +6400,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "dqu" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -6433,10 +6445,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/visitor_dining) -"drC" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "drK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6474,15 +6482,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "dsk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/curtain/black{ icon_state = "open" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "dsp" = ( @@ -6567,7 +6573,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "dtJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/airlock) "dtW" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -6592,7 +6598,7 @@ /area/tether/surfacebase/security/brig) "dtY" = ( /obj/structure/sign/department/toxins, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/airlock) "dud" = ( /obj/effect/floor_decal/borderfloor, @@ -6702,7 +6708,7 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/medical/mentalhealth) "dxH" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/crew_quarters/sleep/Dorm_1) "dyl" = ( /obj/structure/railing{ @@ -6717,9 +6723,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/rnd) "dyy" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "dzq" = ( @@ -6788,11 +6792,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "dBK" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/orange{ icon_state = "0-4" }, @@ -6813,10 +6813,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "dCa" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -6935,17 +6932,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"dEV" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/simulated/wall/prepainted, +/area/maintenance/substation/civ_west) "dFB" = ( /obj/machinery/bomb_tester, /turf/simulated/floor/tiled/steel_grid, /area/rnd/outpost/testing_lab) "dFO" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "dFS" = ( @@ -6962,10 +6966,7 @@ pixel_x = -2; pixel_y = -1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -7021,11 +7022,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/outpost) "dGO" = ( @@ -7254,6 +7251,9 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance) +"dNT" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/surface_one_hall) "dOp" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -7301,9 +7301,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"dQI" = ( +/turf/simulated/wall/prepainted/civilian, +/area/tether/surfacebase/surface_one_hall) "dQJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "dRg" = ( @@ -7313,9 +7317,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "dRq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/art) "dRA" = ( @@ -7400,6 +7402,11 @@ }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) +"dTk" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargostore) "dTD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -7425,8 +7432,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "dVi" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7497,10 +7503,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "dWg" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_bar) "dWq" = ( @@ -7580,18 +7583,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/storage/surface_eva) -"dYB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/button/remote/airlock{ - id = "elevescaper"; - name = "elevator escape button"; - pixel_y = 32 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "dYC" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -8082,7 +8073,7 @@ /turf/simulated/floor/tiled, /area/rnd/external) "elf" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/brig/storage) "elh" = ( /obj/machinery/vending/cola{ @@ -8188,10 +8179,7 @@ pixel_x = -2; pixel_y = -1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light_switch{ pixel_x = 12; pixel_y = -24 @@ -8270,9 +8258,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "era" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/primary) "erh" = ( @@ -8300,12 +8286,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) -"erH" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "esy" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -8371,7 +8351,7 @@ /turf/simulated/floor/tiled, /area/security/checkpoint) "ewh" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/xenoarch_storage) "ewK" = ( /obj/structure/cable/orange{ @@ -8390,25 +8370,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig/bathroom) "ewT" = ( +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/warehouse) -"exA" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, +"exw" = ( +/turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/surface_one_hall) "exV" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "eyc" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/cable/green{ @@ -8420,6 +8392,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "eyh" = ( @@ -8460,6 +8435,12 @@ /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) +"ezv" = ( +/obj/structure/sign/directions/evac{ + dir = 4 + }, +/turf/simulated/wall/prepainted/civilian, +/area/tether/surfacebase/surface_one_hall) "ezH" = ( /obj/structure/cable{ icon_state = "2-4" @@ -8507,10 +8488,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "eBc" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -8594,7 +8572,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/testing) "eCJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost) "eCR" = ( /obj/structure/cable/heavyduty{ @@ -8606,7 +8584,12 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "eDq" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "eDJ" = ( @@ -8663,19 +8646,6 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) -"eFe" = ( -/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, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "eFC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -8715,7 +8685,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "eGP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/lowernortheva) "eHb" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -8846,7 +8816,7 @@ /obj/structure/sign/directions/cargo{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_one) "eKy" = ( /obj/turbolift_map_holder/tether{ @@ -8881,12 +8851,8 @@ /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 1 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "eMc" = ( @@ -8910,9 +8876,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "eMp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "eMB" = ( @@ -8945,7 +8910,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "eOw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/locker) "eOE" = ( /obj/effect/floor_decal/industrial/danger{ @@ -9127,6 +9092,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"eVq" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/crew_quarters/sleep/Dorm_7) "eXs" = ( /obj/machinery/button/windowtint{ id = "holodeck"; @@ -9163,9 +9131,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "eXH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/structure/curtain/black, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) @@ -9286,7 +9252,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "eZZ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/medical/virology) "fae" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9338,12 +9304,8 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "faJ" = ( -/obj/structure/closet/secure_closet/xenoarchaeologist, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/anomaly_lab) +/turf/simulated/wall/prepainted/science, +/area/hallway/lower/first_west) "faP" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9397,7 +9359,7 @@ /turf/simulated/floor, /area/rnd/outpost/atmos) "fci" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/chemistry_lab) "fcm" = ( /obj/structure/disposalpipe/segment{ @@ -9430,31 +9392,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site) -"fdb" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "fdG" = ( /mob/living/simple_mob/animal/passive/gaslamp, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -9467,19 +9404,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "fea" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = 30 - }, -/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/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "fey" = ( @@ -9685,8 +9611,7 @@ /turf/simulated/floor/maglev/virgo3b, /area/tether/surfacebase/outside/outside1) "fjm" = ( -/obj/machinery/power/apc/high{ - dir = 4; +/obj/machinery/power/apc/high/east_mount{ pixel_x = 28 }, /obj/structure/cable/green{ @@ -9714,6 +9639,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/camera/network/tether{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "fjH" = ( @@ -9729,7 +9657,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ dir = 8 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/medical/virology) "fkh" = ( /obj/effect/floor_decal/borderfloor{ @@ -9856,10 +9784,7 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "fmo" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9964,7 +9889,7 @@ /obj/structure/sign/directions/evac{ name = "\improper Secondary Evacuation Route" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_one) "fny" = ( /obj/item/bone/skull/unathi, @@ -10066,7 +9991,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_5) "fpi" = ( @@ -10193,7 +10120,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "ftm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_5) "ftG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -10306,7 +10233,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 1 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor{ dir = 1 }, @@ -10349,6 +10278,10 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, +/obj/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/phoron/airlock_exterior{ + pixel_x = 25 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/storage/surface_eva/external) "fzG" = ( @@ -10542,8 +10475,7 @@ "fDW" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -10561,8 +10493,7 @@ /obj/structure/dispenser{ phorontanks = 0 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/corner/paleblue{ @@ -10599,8 +10530,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "fEX" = ( -/turf/simulated/wall, -/area/rnd/xenoarch_storage) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/outside/outside1) "fFc" = ( /obj/machinery/fitness/punching_bag/clown, /turf/simulated/floor/plating, @@ -10704,11 +10635,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor, /area/rnd/outpost/atmos) @@ -10784,6 +10712,25 @@ "fJF" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) +"fJH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "fJW" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -10801,15 +10748,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_2) "fKN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/orange{ icon_state = "0-4" }, @@ -10836,7 +10781,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "fLr" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/lower/first_west) "fLC" = ( /obj/machinery/door/firedoor/glass, @@ -10853,10 +10798,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) "fLE" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -10896,7 +10838,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "fNh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/tram) "fNu" = ( /obj/structure/catwalk, @@ -10910,11 +10852,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "fNI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -11206,15 +11144,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "fTT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "fTY" = ( @@ -11224,11 +11158,7 @@ pixel_y = 4 }, /obj/item/storage/box/masks, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -11409,10 +11339,7 @@ dir = 1 }, /obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "fWF" = ( @@ -11513,7 +11440,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "fZN" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/external) "fZP" = ( /obj/structure/table/woodentable, @@ -11554,7 +11481,7 @@ /area/maintenance/lower/trash_pit) "gbQ" = ( /obj/structure/sign/warning/compressed_gas, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/storage) "gbR" = ( /obj/effect/floor_decal/borderfloor, @@ -11601,11 +11528,7 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "gdI" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11739,12 +11662,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "ggL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) "ggR" = ( @@ -11831,10 +11749,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/table/standard, /obj/item/stack/cable_coil/random_belt, /obj/item/stack/cable_coil/random_belt, @@ -11929,10 +11844,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -12174,7 +12086,7 @@ /obj/structure/sign/warning{ name = "\improper STAND AWAY FROM TRACK EDGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/tram) "gqk" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, @@ -12251,12 +12163,6 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "gst" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12267,7 +12173,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/brig) "gsy" = ( @@ -12389,12 +12296,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "gwy" = ( @@ -12673,21 +12576,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) -"gCI" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/computer/timeclock/premade/south, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "gCK" = ( /obj/structure/bed/chair/comfy/black, /obj/effect/floor_decal/borderfloor{ @@ -12699,21 +12587,13 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "gCQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/surfaceservicesubstation) "gDl" = ( /obj/machinery/light/small, /turf/simulated/floor/wood, /area/crew_quarters/visitor_dining) "gDT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "psych_office" - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -12725,6 +12605,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "psych_office"; + name = "Psych Office" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "gEn" = ( @@ -12793,11 +12678,7 @@ }, /area/hallway/lower/first_west) "gFJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -12839,7 +12720,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "gGA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/mentalhealth) "gHF" = ( /obj/effect/floor_decal/borderfloor{ @@ -12981,9 +12862,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost/eva) "gJF" = ( @@ -13023,7 +12902,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "gKQ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/anomaly_lab/storage) "gKV" = ( /obj/structure/cable/yellow{ @@ -13035,10 +12914,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -13047,14 +12922,12 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "gLq" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -13093,10 +12966,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, @@ -13227,11 +13097,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "0-2" @@ -13308,10 +13174,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "gSb" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/visitor_dining) "gSh" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/anomaly_lab/analysis) "gSQ" = ( /obj/effect/floor_decal/borderfloor{ @@ -13382,10 +13248,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "gUt" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "gVu" = ( @@ -13407,15 +13272,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/lower/atmos) "gVG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "gVJ" = ( @@ -13491,8 +13348,7 @@ /area/rnd/hallway) "gZb" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/reagent_dispensers/water_cooler/full, @@ -13528,7 +13384,7 @@ /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/locker/laundry_arrival) "hdk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13553,22 +13409,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"hdA" = ( -/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/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "hdR" = ( /obj/machinery/conveyor{ dir = 4; @@ -13685,20 +13525,8 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "hhh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/tether/surfacebase/cargostore/office) -"hhC" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "hhW" = ( /obj/structure/bed/psych, /turf/simulated/floor/carpet/blue, @@ -13738,11 +13566,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -13895,12 +13719,11 @@ /turf/simulated/floor, /area/rnd/outpost/atmos) "hmK" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "hna" = ( @@ -13928,7 +13751,7 @@ /area/rnd/outpost/anomaly_lab) "hnn" = ( /obj/structure/sign/science, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/breakroom) "hnH" = ( /obj/effect/floor_decal/industrial/warning, @@ -13949,7 +13772,7 @@ /area/maintenance/lower/vacant_site) "hoc" = ( /obj/structure/sign/department/anomaly, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/hallway/lower/first_west) "hoo" = ( /obj/effect/floor_decal/borderfloor{ @@ -13972,11 +13795,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "0-2" @@ -14020,9 +13839,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "hpc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/first_aid_west) "hpi" = ( @@ -14363,24 +14180,13 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "hxV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/rnd/outpost/mixing) +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/lowerhall) "hyb" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "hyj" = ( @@ -14390,8 +14196,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "hyG" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/lower/atmos) +/obj/machinery/door/blast/regular, +/turf/simulated/floor/maglev, +/area/tether/surfacebase/tram) "hzu" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -14411,11 +14218,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "hzG" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/medical{ name = "Mental Health"; req_one_access = list() }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "hzL" = ( @@ -14480,7 +14287,7 @@ /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_one) "hCr" = ( /turf/simulated/floor/wood, @@ -14544,6 +14351,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "hDY" = ( @@ -14600,8 +14408,7 @@ /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/item/melee/umbrella/random, @@ -14731,12 +14538,12 @@ name = "Mental Health"; req_access = list(64) }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/mentalhealth) "hIz" = ( @@ -14818,6 +14625,18 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) +"hKr" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "hKC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14875,6 +14694,15 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"hLB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "hLP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -14928,7 +14756,7 @@ /area/tether/surfacebase/medical/lowerhall) "hMM" = ( /obj/structure/sign/department/anomaly, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/anomaly_lab) "hNg" = ( /obj/structure/bed, @@ -14947,11 +14775,10 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "hND" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/heavyduty{ icon_state = "1-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "hNG" = ( @@ -15134,11 +14961,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) "hRB" = ( @@ -15158,24 +14981,23 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "hRQ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "hSe" = ( @@ -15193,7 +15015,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) "hSy" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lowerhall) "hTC" = ( /obj/random/junk, @@ -15256,26 +15078,6 @@ }, /turf/simulated/floor/greengrid, /area/rnd/outpost/testing_lab) -"hVK" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "holodeck"; - name = "Holodeck Privacy Shutters"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "holodeck" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "holodeck" - }, -/turf/simulated/floor/plating, -/area/holodeck_control) "hVM" = ( /obj/machinery/camera/network/research_outpost{ dir = 4 @@ -15308,7 +15110,7 @@ /area/maintenance/lower/mining_eva) "hWL" = ( /obj/structure/sign/signnew/biohazard, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/outside/outside1) "hWM" = ( /obj/machinery/shower{ @@ -15414,6 +15216,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) +"hYQ" = ( +/obj/effect/step_trigger/teleporter/to_mining, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/lowernortheva/external) "hYS" = ( /obj/machinery/light/small{ dir = 8 @@ -15617,14 +15423,10 @@ /turf/simulated/floor/carpet, /area/crew_quarters/visitor_dining) "ifE" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/curtain/black{ icon_state = "open" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/tram) "ifV" = ( @@ -15764,32 +15566,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) -"iiJ" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera/network/northern_star{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "iji" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/white, @@ -15811,6 +15587,10 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) +"ijH" = ( +/obj/effect/step_trigger/teleporter/to_plains, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside1) "ijY" = ( /obj/structure/table/standard{ name = "plastic table frame" @@ -15823,8 +15603,7 @@ /area/crew_quarters/locker) "ikl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "ikn" = ( @@ -15837,8 +15616,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 28 }, /turf/simulated/floor/tiled, @@ -16130,11 +15908,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "iqO" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/anomaly_lab/airlock) "irQ" = ( /obj/structure/sign/warning/hot_exhaust, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/chamber) "irT" = ( /obj/structure/disposalpipe/segment{ @@ -16179,7 +15957,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) "isQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/outside/outside1) "itU" = ( /obj/effect/floor_decal/borderfloor{ @@ -16314,7 +16092,7 @@ /area/tether/surfacebase/lowernorthhall) "ixT" = ( /obj/machinery/door/firedoor{ - dir = 8 + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -16384,12 +16162,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "izd" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "izA" = ( @@ -16532,14 +16309,10 @@ dir = 1 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 28 }, /obj/structure/bed/roller, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) @@ -16582,7 +16355,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "iEF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/visitor_laundry) "iEN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16696,7 +16469,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "iIW" = ( @@ -16730,6 +16502,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "iKs" = ( @@ -16799,7 +16574,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "iMm" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1379; @@ -16829,10 +16603,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "iMr" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_site/east) "iMz" = ( /obj/structure/catwalk, @@ -16903,8 +16680,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -16972,8 +16748,8 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "iQX" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/security/brig/bathroom) "iRw" = ( /obj/structure/table/standard, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -17025,10 +16801,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "iSm" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "iSA" = ( @@ -17123,11 +16896,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "iUX" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -17381,10 +17150,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/maintenance/substation/SurfMedsubstation) "jbL" = ( @@ -17605,7 +17371,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/outpost/solars_shed) "jgm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -17630,7 +17396,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenance) "jii" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm2) "jiJ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, @@ -17676,12 +17442,6 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) "jmi" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -17689,7 +17449,9 @@ id = "gogogo"; opacity = 0 }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, /area/rnd/testingroom) "jmr" = ( /obj/machinery/light{ @@ -17915,11 +17677,8 @@ "jrU" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/cyan{ icon_state = "0-4" @@ -17941,6 +17700,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"jsX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "jta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18010,7 +17777,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "juN" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/hardstorage) "jvw" = ( /obj/structure/closet/crate, @@ -18167,11 +17934,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/corner/purple{ dir = 6 }, @@ -18311,6 +18074,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) +"jEh" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "jEQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -18337,17 +18115,21 @@ /turf/simulated/floor/tiled, /area/rnd/hardstorage) "jFz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/mining_eva) "jGa" = ( /obj/machinery/camera/network/research, /obj/machinery/floodlight, +/obj/machinery/airlock_sensor/phoron/airlock_exterior{ + pixel_x = 1; + pixel_y = 24 + }, +/obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "jGl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -18378,10 +18160,7 @@ /area/crew_quarters/sleep/maintDorm3) "jGz" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "jGL" = ( @@ -18393,7 +18172,7 @@ /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "jHU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/art) "jIl" = ( /obj/machinery/door/firedoor/glass, @@ -18462,10 +18241,10 @@ }, /area/tether/surfacebase/lowernorthhall) "jJq" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/breakroom) "jJw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/lowernorthhall) "jJE" = ( /obj/machinery/light/flamp/noshade, @@ -18511,8 +18290,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - dir = 1; - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -18761,7 +18539,7 @@ /area/tether/surfacebase/outside/outside1) "jRi" = ( /obj/structure/symbol/lo, -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/atmos) @@ -18926,13 +18704,10 @@ }, /area/crew_quarters/visitor_lodging) "jVz" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/crew_quarters/sleep/Dorm_3) "jVN" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/bed/chair/wood{ dir = 4 @@ -19113,8 +18888,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -19287,8 +19061,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -19464,7 +19237,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_site/east) "kpo" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_4) "kpK" = ( /obj/effect/floor_decal/corner/lightorange{ @@ -19574,7 +19347,7 @@ dir = 4; name = "\improper Secondary Evacuation Route" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/research) "ksf" = ( /obj/effect/floor_decal/borderfloor{ @@ -19740,7 +19513,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "kwf" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/showers) "kwg" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -19821,10 +19594,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, @@ -19910,11 +19680,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "kAK" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -19950,8 +19716,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -19975,15 +19740,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "kCc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/outside/outside1) "kCg" = ( @@ -20052,7 +19809,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) "kDE" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/crew_quarters/sleep/Dorm_7) "kDZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -20163,8 +19920,7 @@ pixel_x = 4; pixel_y = -28 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -20197,6 +19953,7 @@ /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "kGS" = ( @@ -20213,18 +19970,19 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "kHm" = ( -/obj/structure/disposalpipe/up{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) -"kHy" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "kHK" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet, @@ -20245,10 +20003,12 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore) "kHQ" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "kIr" = ( /obj/machinery/atmospherics/valve/digital{ dir = 4 @@ -20292,6 +20052,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"kKu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "kLL" = ( /obj/structure/window/reinforced{ dir = 1 @@ -20334,10 +20110,7 @@ pixel_x = 12; pixel_y = -24 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/storage/primary) "kMt" = ( @@ -20353,8 +20126,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) "kNt" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -20458,11 +20230,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -20479,6 +20247,15 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) +"kRe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_one_hall) "kRR" = ( /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's on the fishing channel. I wonder what else is on?"; @@ -20542,23 +20319,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) -"kSL" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "kSO" = ( /obj/structure/closet/crate/bin, /obj/machinery/light{ @@ -20699,10 +20459,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "kUp" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20758,18 +20515,9 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "kVl" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/gasstorage) "kWm" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/blast/regular{ density = 0; @@ -20778,7 +20526,9 @@ id = "gogogo"; opacity = 0 }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, /area/rnd/testingroom) "kWC" = ( /obj/machinery/power/smes/buildable{ @@ -20877,11 +20627,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -20903,9 +20650,8 @@ /turf/simulated/floor/tiled, /area/storage/primary) "kXZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/analysis) "kYi" = ( @@ -21133,8 +20879,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "lea" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/medical/virology) "lfc" = ( @@ -21143,13 +20889,18 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "lfi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 }, -/obj/structure/flora/pottedplant, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "lfB" = ( @@ -21339,10 +21090,7 @@ "ljC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/orange, /turf/simulated/floor/tiled, /area/security/checkpoint) @@ -21474,7 +21222,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock{ name = "Unisex Showers" }, @@ -21560,27 +21310,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor, /area/rnd/outpost/atmos) -"lqT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/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, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "lqW" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "lqX" = ( @@ -21628,6 +21359,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"lrw" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "lsw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21778,7 +21518,7 @@ /area/maintenance/lowmedbaymaint) "lwj" = ( /obj/structure/symbol/sa, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_bar) "lwR" = ( /obj/structure/table/glass, @@ -21794,6 +21534,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"lwW" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "lxe" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -22118,10 +21876,9 @@ "lHD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor, /area/rnd/outpost/anomaly_lab) "lHE" = ( /obj/effect/floor_decal/borderfloor, @@ -22146,7 +21903,7 @@ dir = 4 }, /obj/machinery/door/firedoor{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/border, /obj/structure/cable/orange{ @@ -22194,7 +21951,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/surfaceservicesubstation) "lLS" = ( /obj/effect/floor_decal/corner/lightgrey{ @@ -22247,8 +22004,7 @@ dir = 1 }, /obj/machinery/door/firedoor{ - dir = 1; - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -22271,7 +22027,7 @@ /turf/simulated/floor/tiled, /area/rnd/testingroom) "lNB" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_6) "lOA" = ( /obj/effect/floor_decal/borderfloor{ @@ -22326,12 +22082,7 @@ /area/engineering/atmos) "lPI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lPP" = ( @@ -22436,11 +22187,8 @@ /area/tether/surfacebase/security/brig) "lRY" = ( /obj/effect/floor_decal/industrial/warning/dust, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -22448,27 +22196,27 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "lSg" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/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 + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "lSi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/vacant_site) "lSZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, @@ -22615,7 +22363,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_1) "lYh" = ( @@ -22802,10 +22552,7 @@ /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "mbh" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "mbn" = ( @@ -22871,9 +22618,6 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mcw" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -22886,6 +22630,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, +/obj/machinery/door/firedoor{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "mcD" = ( @@ -22901,11 +22648,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/surface_atmos) "mcI" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -22949,15 +22692,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "mfs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "mfX" = ( @@ -23064,15 +22803,12 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/analysis) "mhr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "surfcargooffice"; - layer = 3.3; name = "Cargo Office Shutters" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore/office) "miK" = ( @@ -23085,7 +22821,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "mjr" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/crew_quarters/sleep/Dorm_5) "mkH" = ( /obj/machinery/air_alarm{ @@ -23208,7 +22944,6 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) "mop" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -23219,18 +22954,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/brig) "moy" = ( @@ -23274,7 +22998,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "moZ" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -23282,18 +23005,11 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/brig) "mpa" = ( @@ -23312,7 +23028,9 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 4 + }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, @@ -23420,7 +23138,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 8; frequency = 1379; master_tag = "virology_airlock_control"; @@ -23438,9 +23156,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -23501,8 +23216,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -23831,9 +23545,16 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) "mCf" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/closet/firecloset, +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "mCy" = ( @@ -23911,18 +23632,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "mEc" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled, /area/rnd/testingroom) "mEi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_1) "mEM" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ @@ -24046,10 +23763,10 @@ dir = 4 }, /obj/structure/catwalk, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/external{ - name = "Evacuation Route" +/obj/machinery/door/firedoor/glass{ + dir = 8 }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/lower/research) "mGM" = ( @@ -24080,11 +23797,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "mHj" = ( @@ -24133,8 +23846,8 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "mIE" = ( -/turf/simulated/wall, -/area/maintenance/lower/research) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/security/brig/storage) "mIF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -24185,9 +23898,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "mJX" = ( @@ -24406,6 +24117,7 @@ /area/rnd/outpost/anomaly_lab/storage) "mPG" = ( /obj/effect/floor_decal/rust, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "mPO" = ( @@ -24444,22 +24156,18 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mQc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "mQq" = ( /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint) "mQI" = ( /obj/machinery/camera/network/research_outpost{ @@ -24471,11 +24179,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/extinguisher_cabinet{ dir = 1; @@ -24548,10 +24253,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) -"mSA" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "mSR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24568,8 +24269,8 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) "mTg" = ( -/turf/simulated/wall/r_wall, -/area/storage/surface_eva/external) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/north_stairs_one) "mTH" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -24578,10 +24279,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "mUT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost) "mVl" = ( @@ -24604,11 +24303,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mWc" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/camera/network/civilian, /obj/structure/table/standard, /obj/random/soap, @@ -24619,11 +24314,7 @@ "mWv" = ( /obj/structure/table/woodentable, /obj/item/toy/plushie/therapy/blue, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -24699,10 +24390,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 5 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, @@ -24755,11 +24443,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "mYB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "mYG" = ( @@ -24773,9 +24457,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"mYW" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/security/brig) "mYZ" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -24787,11 +24468,7 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "mZa" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -24935,7 +24612,6 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "nfZ" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1379; @@ -24960,6 +24636,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "ngA" = ( @@ -25037,8 +24716,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor/phoron/airlock_interior{ + pixel_x = 26; + pixel_y = -1 + }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/rnd/external) "nis" = ( /obj/structure/cable{ icon_state = "1-2" @@ -25119,10 +24803,7 @@ /obj/item/toy/nanotrasenballoon, /obj/item/deck/cards, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light/small{ dir = 1 }, @@ -25133,11 +24814,7 @@ frequency = 1379; scrub_id = "civ_airlock_scrubber" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -25200,40 +24877,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) -"nlW" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "nmq" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/atmos) "nmF" = ( @@ -25302,11 +24951,7 @@ /turf/simulated/floor/tiled, /area/rnd/hardstorage) "npe" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/orange{ icon_state = "0-4" }, @@ -25386,15 +25031,11 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "nrW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/maintenance/substation/outpost) "nsA" = ( @@ -25532,7 +25173,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -25576,7 +25217,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "nwh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/civ_west) "nwj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -25616,16 +25257,14 @@ /turf/simulated/floor/plating, /area/storage/surface_eva) "nxC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/engi{ - id_tag = "elevescaper"; - name = "Elevator Maintenance" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "nxI" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -25643,13 +25282,11 @@ dir = 4; pixel_x = -30 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "nxL" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/substation/outpost) "nyg" = ( /obj/effect/floor_decal/borderfloor{ @@ -25921,13 +25558,12 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) "nIk" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "nIl" = ( /obj/machinery/atmospherics/portables_connector, @@ -25941,13 +25577,12 @@ dir = 1 }, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) +"nIE" = ( +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/surface_one_hall) "nIL" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_external{ @@ -26007,11 +25642,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "nJE" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26051,8 +25682,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "nLH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "nLT" = ( @@ -26068,8 +25698,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "nMi" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/camera/network/civilian{ @@ -26111,16 +25740,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "nMN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/old_tram) +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/lowernorthhall) "nMO" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_one_hall) "nMZ" = ( /obj/structure/window/reinforced, @@ -26358,10 +25982,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "nUU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "nVv" = ( @@ -26430,8 +26052,8 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Laundry"; - dir = 8 + dir = 8; + name = "Laundry" }, /obj/structure/cable/orange{ icon_state = "4-8" @@ -26461,22 +26083,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/purple, /turf/simulated/floor/tiled, /area/engineering/atmos/processing) -"nYy" = ( -/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/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "nYA" = ( /obj/structure/closet, /obj/random/maintenance/clean, @@ -26487,22 +26093,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "nYQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; +/obj/spawner/window/low_wall/reinforced/full/firelocks{ id = "holodeck"; - name = "Holodeck Privacy Shutters"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "holodeck" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "holodeck" + name = "holodeck" }, /turf/simulated/floor/plating, /area/holodeck_control) @@ -26537,11 +26130,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "nZU" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -26580,12 +26169,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "oaj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "oay" = ( @@ -26687,9 +26282,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) "ofa" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "ofq" = ( @@ -26712,6 +26305,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "ofG" = ( @@ -26870,7 +26466,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) "oiD" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/weaponsrange) "oiL" = ( /obj/structure/table/rack, @@ -26913,14 +26509,16 @@ /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/dropper, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) +"oln" = ( +/turf/simulated/wall/prepainted/science, +/area/rnd/testingroom) "olq" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -26971,7 +26569,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "omk" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/hallway) "omN" = ( /obj/structure/railing, @@ -26982,7 +26580,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) "onC" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/tunnel) "onO" = ( /obj/machinery/air_alarm{ @@ -27001,13 +26599,20 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/outpost/chamber) "oou" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "opd" = ( @@ -27072,17 +26677,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "oqT" = ( /turf/simulated/wall, /area/storage/surface_eva) "orl" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -27099,10 +26701,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) "orU" = ( @@ -27208,11 +26807,7 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "oxa" = ( @@ -27229,7 +26824,7 @@ /area/tether/surfacebase/outside/outside1) "oxb" = ( /obj/machinery/holoposter, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/lower/first_west) "oxq" = ( /obj/structure/stairs/spawner/north, @@ -27297,7 +26892,7 @@ /area/maintenance/lower/research) "oyX" = ( /obj/structure/sign/warning/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/tram) "ozq" = ( /obj/landmark{ @@ -27384,8 +26979,7 @@ /area/crew_quarters/visitor_dining) "oDh" = ( /obj/machinery/disposal, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/disposalpipe/trunk{ @@ -27401,32 +26995,28 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "oDt" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "oDS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; id = "cafe"; layer = 3.1; name = "Cafe Shutters" }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "oEs" = ( @@ -27494,7 +27084,7 @@ /area/storage/primary) "oId" = ( /obj/machinery/holoposter, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/visitor_laundry) "oIn" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -27653,7 +27243,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "oMf" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/brig) "oMr" = ( /obj/structure/disposalpipe/segment, @@ -27714,10 +27304,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "oOh" = ( @@ -27890,7 +27477,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "oSm" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos) "oSy" = ( /obj/structure/cable/green{ @@ -27983,20 +27570,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) -"oUb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/structure/catwalk, -/obj/machinery/door/airlock/glass_external/public{ - name = "Evacuation Route" - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/surface_one_hall) "oUl" = ( /turf/simulated/floor/plating, /area/engineering/atmos/processing) @@ -28084,24 +27657,8 @@ /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "oYn" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "gogogo"; - opacity = 0 - }, -/turf/simulated/floor/tiled, -/area/rnd/testingroom) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/tram) "oYu" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 @@ -28381,7 +27938,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "pgf" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/medical/first_aid_west) "pgk" = ( /obj/machinery/door/firedoor/glass, @@ -28398,7 +27955,7 @@ /area/tether/surfacebase/security/brig/bathroom) "pgr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/medical/virology) "pgv" = ( /obj/effect/floor_decal/industrial/warning, @@ -28455,9 +28012,7 @@ /area/tether/surfacebase/surface_one_hall) "pha" = ( /obj/structure/sign/deck/first, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "phe" = ( /obj/random/junk, @@ -28588,7 +28143,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "pkY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/maintenance/lower/mining_eva) "plq" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -28619,14 +28174,10 @@ /area/engineering/atmos) "plG" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ id = "cdorm1" }, -/obj/structure/window/reinforced/polarized{ - id = "cdorm1" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) "plI" = ( /obj/effect/shuttle_landmark{ @@ -28661,7 +28212,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "pmc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm3) "pms" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -28688,7 +28239,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "pnj" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/lowerhall) "pnK" = ( /obj/structure/cable/green{ @@ -29102,6 +28653,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) +"pwO" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "pxc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -29227,7 +28796,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; dir = 8; frequency = 1379; master_tag = "virology_airlock_control"; @@ -29243,7 +28812,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -29422,7 +28990,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "pDO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/maintenance/substation/SurfMedsubstation) "pDX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -29512,8 +29080,8 @@ /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Cafe"; - dir = 8 + dir = 8; + name = "Cafe" }, /obj/structure/cable/orange{ icon_state = "4-8" @@ -29651,10 +29219,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -29664,10 +29229,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "pMb" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "holodeck" +/obj/spawner/window/low_wall/reinforced/full/firelocks{ + id = "holodeck"; + name = "holodeck" }, /turf/simulated/floor, /area/holodeck_control) @@ -29679,8 +29243,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "pMr" = ( @@ -29690,8 +29253,12 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 30 }, +/obj/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor/phoron/airlock_interior{ + pixel_x = -25 + }, /turf/simulated/floor/tiled, -/area/storage/surface_eva) +/area/storage/surface_eva/external) "pMt" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -29757,7 +29324,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "pRw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/mixing) "pRF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -29830,7 +29397,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "surfcargooffice"; - layer = 3.3; name = "Cargo Office Shutters" }, /turf/simulated/floor/tiled, @@ -29845,6 +29411,9 @@ /obj/structure/cable, /turf/simulated/floor, /area/maintenance/substation/surfaceservicesubstation) +"pSv" = ( +/turf/simulated/wall/prepainted, +/area/security/checkpoint) "pTr" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -29892,6 +29461,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "pUj" = ( @@ -29908,16 +29478,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenance) "pUN" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/station_map{ - pixel_y = 32 + dir = 9 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "pUR" = ( @@ -29984,15 +29553,9 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "pXc" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -30000,6 +29563,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "pXd" = ( @@ -30046,11 +29611,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) -"pYd" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +"pXK" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"pYd" = ( +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/light_switch{ dir = 8; @@ -30066,11 +29641,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "0-2" @@ -30167,11 +29738,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -30212,15 +29779,7 @@ /turf/unsimulated/mineral/virgo3b, /area/tether/surfacebase/outside/outside1) "qbk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "qbr" = ( @@ -30273,11 +29832,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "qdo" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "qdD" = ( @@ -30400,7 +29958,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "qgR" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_2) "qgX" = ( /obj/effect/floor_decal/rust, @@ -30446,10 +30004,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "qjR" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -30486,7 +30041,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "qlp" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/outpost/solars_shed) "qmk" = ( /obj/structure/cable{ @@ -30637,7 +30192,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "qpi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/surface_eva/external) "qpj" = ( /obj/effect/floor_decal/borderfloor{ @@ -30684,8 +30239,17 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "qqd" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -30732,11 +30296,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -30883,18 +30443,8 @@ /obj/random/maintenance/cargo, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) -"qvs" = ( -/obj/structure/sign/directions/evac{ - name = "\improper Secondary Evacuation Route" - }, -/turf/simulated/wall, -/area/tether/surfacebase/surface_one_hall) "qvz" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -31096,14 +30646,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) "qBc" = ( -/obj/structure/grille, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "qBh" = ( @@ -31269,12 +30815,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "qEE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "qEX" = ( @@ -31357,7 +30899,7 @@ /area/rnd/outpost/atmos) "qJd" = ( /obj/structure/sign/poster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/lower/first_west) "qJp" = ( /obj/structure/catwalk, @@ -31391,7 +30933,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_3) "qKa" = ( @@ -31658,10 +31202,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "qPj" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -31717,7 +31258,7 @@ /area/tether/surfacebase/medical/centralstairwell) "qPU" = ( /obj/structure/sign/warning/high_voltage, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/substation/outpost) "qPY" = ( /obj/effect/floor_decal/corner/purple{ @@ -31729,8 +31270,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "qQj" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -31756,15 +31296,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "qRv" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -31772,6 +31306,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "qRz" = ( @@ -31807,10 +31343,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -31923,8 +31456,13 @@ /area/tether/surfacebase/north_stairs_one) "qVb" = ( /obj/machinery/light, +/obj/machinery/airlock_sensor/phoron/airlock_exterior{ + pixel_x = 1; + pixel_y = -24 + }, +/obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) +/area/tether/surfacebase/lowernortheva) "qVm" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -31996,7 +31534,7 @@ }, /area/storage/surface_eva) "qWF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/anomaly_lab/airlock) "qWX" = ( /obj/machinery/floodlight, @@ -32017,14 +31555,14 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) "qYz" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/machinery/door/firedoor/glass{ + dir = 1; + req_one_access = list(18,47) + }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "qYE" = ( @@ -32058,7 +31596,7 @@ dir = 8 }, /obj/machinery/power/apc/high{ - pixel_y = -28 + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -32072,8 +31610,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/corner/purple{ @@ -32087,7 +31624,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "qZX" = ( @@ -32121,17 +31657,17 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "raL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-2" }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-8" + }, +/obj/machinery/door/firedoor/glass{ + dir = 1; + req_one_access = list(18,47) }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -32212,12 +31748,10 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/processing) "rbS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/curtain/black{ icon_state = "open" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/surface_one_hall) "rcP" = ( @@ -32263,9 +31797,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "ree" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "ren" = ( /obj/effect/floor_decal/borderfloor{ @@ -32401,11 +31933,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "rfS" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -32418,12 +31946,8 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "rfX" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "rga" = ( @@ -32512,21 +32036,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) -"rik" = ( -/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/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "rjV" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/light/small, @@ -32595,10 +32104,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "rly" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/public_garden_maintenance) "rmA" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/gas_storage) "rmC" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -32732,9 +32241,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 6 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(67) }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -32843,6 +32350,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/research) +"rwM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_one_hall) "rxf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -32866,8 +32384,7 @@ /area/storage/primary) "ryp" = ( /obj/machinery/door/firedoor{ - dir = 8; - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -32946,9 +32463,7 @@ /area/maintenance/lower/xenoflora) "rzQ" = ( /obj/structure/cable/orange, -/obj/machinery/power/apc/high{ - pixel_y = -28 - }, +/obj/machinery/power/apc/high, /obj/machinery/light, /obj/structure/bed/chair/wood{ dir = 8 @@ -33077,8 +32592,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "rEm" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -33167,11 +32681,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -33257,12 +32767,6 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/reinforced, /area/rnd/testingroom) -"rIq" = ( -/obj/structure/sign/directions/evac{ - dir = 4 - }, -/turf/simulated/wall, -/area/tether/surfacebase/surface_one_hall) "rIs" = ( /obj/structure/railing{ dir = 1 @@ -33319,10 +32823,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/crew_quarters/sleep/maintDorm1) "rJU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/testingroom) "rKa" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/paramed) "rKg" = ( /obj/effect/floor_decal/rust, @@ -33566,7 +33070,7 @@ /turf/simulated/floor/tiled, /area/rnd/testingroom) "rOS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_one_hall) "rPf" = ( /obj/structure/cable/green{ @@ -33645,10 +33149,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -33694,9 +33195,8 @@ /turf/simulated/floor/plating, /area/rnd/hallway) "rSR" = ( -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor, -/area/rnd/outpost/anomaly_lab/storage) +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/brig) "rTb" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -33817,7 +33317,7 @@ dir = 1; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_one) "rUA" = ( /obj/machinery/gear_painter, @@ -34397,8 +33897,7 @@ }, /obj/structure/table/standard, /obj/random/plushie, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -34410,15 +33909,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/testingroom) +"skO" = ( +/turf/simulated/wall/prepainted, +/area/rnd/testingroom) "sld" = ( -/obj/machinery/camera/network/northern_star, -/obj/effect/floor_decal/borderfloor{ - dir = 5 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/structure/flora/pottedplant, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "sle" = ( @@ -34572,7 +34081,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/paramed) "soy" = ( @@ -34595,7 +34103,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "spx" = ( -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "spB" = ( @@ -34669,10 +34179,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) -"sqv" = ( -/obj/structure/table, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "sqw" = ( /obj/structure/grille, /obj/structure/railing{ @@ -34701,9 +34207,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "srn" = ( @@ -34812,11 +34316,7 @@ /obj/structure/table/standard, /obj/item/hand_labeler, /obj/item/hand_labeler, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -34856,11 +34356,6 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/grass, /area/tether/surfacebase/surface_one_hall) -"suw" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "sux" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -34893,15 +34388,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_8) "suS" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -34917,6 +34413,9 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) +"svt" = ( +/turf/simulated/wall/prepainted, +/area/crew_quarters/sleep/Dorm_8) "svy" = ( /obj/structure/table/steel, /obj/item/paper_bin, @@ -34946,8 +34445,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "swx" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/table/woodentable, @@ -34962,12 +34460,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "swM" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/eva) "swU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "sxr" = ( @@ -34977,11 +34474,10 @@ /area/rnd/outpost/atmos) "sxt" = ( /obj/machinery/door/blast/regular, -/turf/simulated/wall, +/turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "syr" = ( -/obj/machinery/power/apc/super{ - dir = 4; +/obj/machinery/power/apc/super/east_mount{ name = "east bump"; pixel_x = 24 }, @@ -35023,7 +34519,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "szR" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/anomaly_lab/testing) "sAL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -35099,10 +34595,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -35115,7 +34608,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "sCF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/asmaint2) "sDb" = ( /obj/machinery/atmospherics/pipe/manifold/visible/supply, @@ -35130,10 +34623,10 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Cargo Shop" }, -/obj/machinery/door/firedoor/multi_tile, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "sDy" = ( @@ -35162,9 +34655,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, @@ -35389,30 +34880,29 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "sMA" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/turbolift_map_holder/tether/two, +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) +"sML" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "sMV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -35421,6 +34911,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "sNn" = ( @@ -35507,7 +34999,7 @@ /area/tether/surfacebase/public_garden_one) "sPq" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lowerhall) "sQa" = ( /obj/structure/cable/green{ @@ -35532,7 +35024,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "sQq" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/medical/virologyaccess) "sQy" = ( /obj/structure/railing{ @@ -35550,11 +35042,8 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ @@ -35604,7 +35093,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "sSd" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_7) "sSg" = ( /obj/structure/anomaly_container, @@ -35639,19 +35128,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "sTk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/security/checkpoint) "sTA" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, @@ -35674,11 +35158,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "1-2" }, @@ -35796,8 +35276,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/testing) "sWV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/tram) "sXj" = ( @@ -35861,11 +35340,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "sYF" = ( @@ -35955,13 +35430,6 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) -"taw" = ( -/obj/structure/closet/crate, -/obj/random/unidentified_medicine, -/obj/random/firstaid, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "taF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -35981,8 +35449,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -36036,10 +35503,7 @@ /area/tether/surfacebase/security/weaponsrange) "tbR" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "tcX" = ( @@ -36390,6 +35854,24 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) +"tqc" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "tqe" = ( /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside1) @@ -36433,9 +35915,6 @@ /area/rnd/xenoarch_storage) "tsZ" = ( /obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -36483,14 +35962,10 @@ /area/tether/surfacebase/medical/mentalhealth) "tty" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ id = "cdorm2" }, -/obj/structure/window/reinforced/polarized{ - id = "cdorm3" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) "ttR" = ( /obj/effect/debris/cleanable/blood/oil, @@ -36523,14 +35998,12 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "txw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/surface_eva) "txJ" = ( @@ -36606,9 +36079,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "tzO" = ( @@ -36745,7 +36215,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -36818,8 +36290,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -36873,11 +36344,8 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -36941,7 +36409,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) "tIU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/solars) "tJi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36952,10 +36420,7 @@ "tJv" = ( /obj/structure/table/standard, /obj/random/medical, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) @@ -36969,11 +36434,11 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tJK" = ( -/turf/simulated/wall, -/area/rnd/outpost/anomaly_lab) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/security/checkpoint) "tJP" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/borderfloor, @@ -37050,25 +36515,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "tLf" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "tLI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/miscellaneous_lab) "tMe" = ( /obj/effect/floor_decal/borderfloor, @@ -37119,10 +36579,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "tNc" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -37176,8 +36633,7 @@ }, /area/tether/surfacebase/old_tram) "tOd" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -37225,11 +36681,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "tOT" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -37324,19 +36776,14 @@ /area/tether/surfacebase/tram) "tSu" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ id = "cdorm2" }, -/obj/structure/window/reinforced/polarized{ - id = "cdorm2" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm2) "tSO" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "tTq" = ( @@ -37367,10 +36814,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/testing_lab) "tTW" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -37520,10 +36964,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/orange{ icon_state = "2-8" }, @@ -37597,18 +37038,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) -"tYy" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "tZm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted{ + can_open = 1 + }, /area/engineering/atmos) "tZw" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/xenoflora) "uaj" = ( /obj/machinery/atmospherics/portables_connector{ @@ -37736,11 +37172,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "ucc" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/surfaceservicesubstation) "ucg" = ( /obj/machinery/disposal, @@ -37750,11 +37185,22 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "ucs" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/surface_one_hall) +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/gasstorage) "ucB" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) +"ucF" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "ucO" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 1 @@ -37791,11 +37237,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/sleep/maintDorm3) "uew" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_3) "uez" = ( /obj/structure/sign/nanotrasen, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint) "ueJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -37806,11 +37252,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm3) -"ufd" = ( -/obj/structure/grille, -/obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_one_hall) "ufe" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -37862,15 +37303,9 @@ /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) "ugV" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, @@ -37881,6 +37316,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "ugW" = ( @@ -38028,7 +37465,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) "unF" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/chamber) "unK" = ( /obj/machinery/atmospherics/portables_connector, @@ -38129,15 +37566,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "upn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/mimeoffice) "upD" = ( @@ -38300,9 +37729,6 @@ /area/rnd/outpost/testing_lab) "utU" = ( /obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -38347,7 +37773,7 @@ /area/rnd/outpost/anomaly_lab) "uvG" = ( /obj/structure/sign/xenobio, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/tether/surfacebase/outside/outside1) "uvH" = ( /obj/effect/floor_decal/borderfloor{ @@ -38444,9 +37870,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"uzf" = ( -/turf/simulated/wall, -/area/maintenance/lower/xenoflora) "uzl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -38514,20 +37937,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "uAv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "surfcargooffice"; - layer = 3.3; name = "Cargo Office Shutters" }, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore/office) "uBk" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal{ name = "Shop Warehouse"; req_one_access = list(48) @@ -38538,6 +37957,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/warehouse) "uBY" = ( @@ -38640,7 +38060,7 @@ /turf/simulated/floor/tiled/techfloor/grid/virgo3b, /area/tether/surfacebase/tunnel) "uFO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint) "uGu" = ( /obj/structure/disposalpipe/segment, @@ -38696,6 +38116,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"uIm" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"uIy" = ( +/obj/structure/sign/warning{ + name = "\improper STAND AWAY FROM TRACK EDGE" + }, +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/tram) "uIE" = ( /obj/machinery/shower{ dir = 4; @@ -38731,7 +38163,6 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/structure/anomaly_container, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "uKS" = ( @@ -38892,11 +38323,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "uNx" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -38923,10 +38350,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) "uOh" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -39035,7 +38459,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "uRP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/tether/surfacebase/cargostore/warehouse) "uSu" = ( /obj/machinery/door/airlock/glass/security{ @@ -39142,12 +38566,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/storage/surface_eva) "uWT" = ( @@ -39240,7 +38659,7 @@ }, /area/tether/surfacebase/old_tram) "uYR" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/tether/surfacebase/emergency_storage/rnd) "uZf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -39282,13 +38701,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "uZS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/tether/surfacebase/medical/first_aid_west) "vaq" = ( /obj/effect/floor_decal/borderfloor/shifted, @@ -39319,10 +38736,7 @@ /turf/simulated/floor, /area/maintenance/substation/surfaceservicesubstation) "vbj" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light_switch{ dir = 1; pixel_x = -13; @@ -39341,9 +38755,6 @@ /area/tether/surfacebase/lowernorthhall) "vbn" = ( /obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -39441,11 +38852,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1452; @@ -39461,7 +38868,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "vdT" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/trash_pit) "vdW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -39696,8 +39103,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "vjE" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -39711,7 +39117,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "vjO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_8) "vjQ" = ( /obj/effect/floor_decal/borderfloor{ @@ -39785,8 +39191,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 28 }, /obj/machinery/button/remote/blast_door{ @@ -39892,25 +39297,16 @@ /obj/structure/sign/redcross{ name = "FirstAid" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/medical/first_aid_west) +"vno" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "vny" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "vnS" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 4; @@ -39956,8 +39352,8 @@ /area/tether/surfacebase/outside/outside1) "vpR" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Laundry"; - dir = 8 + dir = 8; + name = "Laundry" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/structure/cable/orange{ @@ -39972,7 +39368,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/crew_quarters/visitor_laundry) "vqc" = ( @@ -39990,7 +39388,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "vqX" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_bar) "vre" = ( /obj/structure/disposalpipe/segment, @@ -40025,6 +39423,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +"vrR" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/maintenance/lower/research) "vsp" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 1; @@ -40077,7 +39478,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/surface_one_hall) "vtI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm1) "vuc" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, @@ -40141,7 +39542,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/maintenance/substation/SurfMedsubstation) "vvq" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -40149,9 +39550,18 @@ }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside1) -"vwJ" = ( -/turf/simulated/wall/r_wall, -/area/medical/virologyaccess) +"vwP" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "vwW" = ( /obj/machinery/light/small/flicker{ dir = 1 @@ -40189,7 +39599,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 8; frequency = 1379; master_tag = "virology_airlock_control"; @@ -40223,11 +39633,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "vyN" = ( @@ -40237,9 +39643,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "vyR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) "vze" = ( @@ -40248,9 +39652,7 @@ dir = 4; pixel_x = -22 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "vzw" = ( @@ -40276,8 +39678,27 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "vAn" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "vAp" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) @@ -40469,7 +39890,7 @@ /area/hallway/lower/first_west) "vEJ" = ( /obj/structure/symbol/em, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/outpost/solars_shed) "vER" = ( /obj/machinery/door/airlock/research{ @@ -40517,11 +39938,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -40587,21 +40004,19 @@ /turf/simulated/floor/tiled, /area/security/checkpoint) "vGz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "vGE" = ( -/turf/simulated/wall{ - can_open = 1 - }, +/turf/simulated/wall/prepainted, /area/maintenance/lower/atmos) "vGW" = ( /obj/structure/closet/secure_closet/brig, @@ -40712,11 +40127,8 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "vIy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/tether/surfacebase/tram) +/turf/simulated/wall/prepainted/security, +/area/maintenance/lower/mining_eva) "vJa" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -40759,12 +40171,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "vJp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -40776,7 +40182,8 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/paramed) "vJq" = ( @@ -40833,10 +40240,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -40885,16 +40289,12 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "vLx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "vMn" = ( @@ -40964,7 +40364,7 @@ /turf/simulated/floor/tiled, /area/storage/art) "vOc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/testing_lab) "vOe" = ( /obj/structure/railing, @@ -41072,11 +40472,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/purple/full{ dir = 4 @@ -41085,7 +40481,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) "vQt" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/tether/surfacebase/cargostore) "vQH" = ( /obj/effect/floor_decal/borderfloor{ @@ -41144,10 +40540,7 @@ "vSa" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -41532,7 +40925,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_6) "wdw" = ( @@ -41547,10 +40942,7 @@ /area/tether/surfacebase/outside/outside1) "wep" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "wez" = ( @@ -41573,9 +40965,6 @@ /area/rnd/outpost/heating) "weY" = ( /obj/effect/floor_decal/borderfloor, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -41583,15 +40972,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/structure/disposalpipe/junction/yjunction{ +/obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/cable{ + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "wfq" = ( @@ -41653,7 +41041,7 @@ /area/rnd/outpost/breakroom) "wfR" = ( /obj/structure/sign/warning/nosmoking_2, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/tankstorage) "wfU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -41743,7 +41131,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "whS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/locker/laundry_arrival) "wic" = ( /obj/machinery/door/window{ @@ -41753,7 +41141,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) "wik" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/heating) "wiT" = ( /obj/machinery/vending/coffee{ @@ -42046,12 +41434,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "wpy" = ( -/obj/machinery/door/firedoor/glass{ - dir = 1; - req_one_access = list(18,47) - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/anomaly_lab) +/turf/simulated/wall/prepainted, +/area/maintenance/substation/SurfMedsubstation) "wpP" = ( /obj/machinery/radiocarbon_spectrometer, /obj/structure/window/reinforced{ @@ -42077,11 +41461,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -42095,14 +41475,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"wqu" = ( -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "wqL" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -42196,22 +41568,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"wsJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/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, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "wsR" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/carpet, @@ -42223,10 +41579,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass{ - dir = 1; - req_one_access = list(18,47) - }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "wtv" = ( @@ -42241,10 +41593,7 @@ /turf/simulated/mineral, /area/storage/surface_eva/external) "wuD" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/lightorange{ dir = 6 @@ -42317,17 +41666,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "wwn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/anomaly_container, -/turf/simulated/floor/tiled, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/anomaly_lab) "wwo" = ( /obj/effect/floor_decal/corner/lime{ @@ -42436,7 +41775,7 @@ /area/security/checkpoint) "wzb" = ( /obj/structure/sign/biohazard, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/trash_pit) "wzm" = ( /obj/structure/cable/green{ @@ -42642,9 +41981,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wFa" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "wFz" = ( @@ -42670,9 +42008,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "wGb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/lower/first_west) "wGo" = ( @@ -42841,8 +42177,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -42920,11 +42255,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "wOX" = ( @@ -42938,6 +42269,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "wPq" = ( @@ -43022,8 +42356,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -43038,11 +42371,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "wSe" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -43149,11 +42478,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "wUj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -43215,9 +42540,6 @@ dir = 4 }, /obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -43306,11 +42628,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) -"wXU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "wXZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -43449,6 +42766,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xaC" = ( @@ -43512,9 +42830,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) "xcL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full, /turf/simulated/floor/plating, /area/tether/surfacebase/old_tram) "xcR" = ( @@ -43522,7 +42838,7 @@ /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "xdh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenoarch_storage) "xee" = ( /obj/structure/fence{ @@ -43942,6 +43258,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "xqC" = ( @@ -44074,7 +43394,7 @@ /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "xtJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/hideyhole) "xtL" = ( /obj/structure/closet/firecloset, @@ -44093,6 +43413,18 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"xuk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "xuD" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -44112,11 +43444,8 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 10 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -44138,11 +43467,7 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -44176,7 +43501,7 @@ /area/tether/surfacebase/medical/mentalhealth) "xwZ" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/locker) "xxh" = ( /turf/simulated/floor/tiled/steel_dirty, @@ -44203,6 +43528,7 @@ /obj/random/junk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xxM" = ( @@ -44254,10 +43580,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/paramed) "xyy" = ( @@ -44278,7 +43606,7 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "xzc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/storage) "xzO" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -44314,7 +43642,7 @@ /area/hallway/lower/first_west) "xAn" = ( /obj/structure/sign/warning, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/tether/surfacebase/outside/outside1) "xAo" = ( /obj/machinery/door/window/southleft{ @@ -44552,7 +43880,7 @@ /area/maintenance/lower/vacant_site) "xHs" = ( /obj/structure/sign/department/anomaly, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/airlock) "xIj" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -44696,7 +44024,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab/airlock) "xMj" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/maintenance/substation/surface_atmos) "xMv" = ( /obj/structure/cable/yellow{ @@ -44720,8 +44048,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -44760,6 +44087,9 @@ /obj/item/stack/cable_coil/random_belt, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"xNf" = ( +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/outside/outside1) "xNq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44816,11 +44146,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) "xPh" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -44888,7 +44214,7 @@ dir = 4; name = "\improper Secondary Evacuation Route" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/xenoflora) "xTp" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -44905,7 +44231,7 @@ /area/tether/surfacebase/surface_one_hall) "xUl" = ( /obj/structure/sign/warning/caution, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/tankstorage) "xUp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -44983,12 +44309,6 @@ /area/crew_quarters/visitor_dining) "xYl" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -44996,7 +44316,9 @@ id = "gogogo"; opacity = 0 }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, /area/rnd/testingroom) "xYJ" = ( /obj/structure/cable/green{ @@ -45005,8 +44327,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/outpost/testing_lab) "xYZ" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/steel_dirty, @@ -45026,11 +44347,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) @@ -45102,16 +44419,25 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/airlock) +"yeP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "yeR" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "yfm" = ( @@ -45126,8 +44452,7 @@ "yfP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -53342,7 +52667,7 @@ gzf gzf gzf xqE -gKV +pTr gzf gzf gzf @@ -53355,7 +52680,7 @@ bGE bGE bGE bGE -xqE +ftO gKV bGE bGE @@ -53562,7 +52887,7 @@ tqe tqe tqe mYZ -bre +uXC eJo aFY aFY @@ -53756,7 +53081,7 @@ tqe tqe tqe mYZ -bre +uXC eJo aFY aFY @@ -54338,7 +53663,7 @@ tqe tqe tqe mYZ -bre +uXC eJo aFY aFY @@ -54532,7 +53857,7 @@ tqe aFY aFY mYZ -bre +uXC eJo aFY aFY @@ -54921,7 +54246,7 @@ aFY aFY mYZ eJo -bre +uXC aFY aFY aFY @@ -55115,7 +54440,7 @@ aFY aFY mYZ eJo -bre +uXC aFY aFY aFY @@ -56278,7 +55603,7 @@ aFY aFY aFY mYZ -bre +uXC eJo aFY aFY @@ -56472,7 +55797,7 @@ aFY aFY aFY mYZ -bre +uXC eJo aFY aFY @@ -56666,7 +55991,7 @@ aFY aFY aFY mYZ -bre +uXC eJo aFY aFY @@ -57928,10 +57253,10 @@ tqe tqe pRw pRw -hxV +aga eLL gwo -hxV +aga pRw pRw aFY @@ -57951,11 +57276,11 @@ jcY jcY szR szR -tJK -tJK -tJK -tJK -tJK +wwn +wwn +wwn +wwn +wwn osh osh osh @@ -58149,7 +57474,7 @@ xiV hVM xJp xJp -tJK +wwn osh osh osh @@ -58214,12 +57539,12 @@ aFY aFY eJo eJo -bre +uXC eJo eJo xyK -bre -bre +uXC +uXC aFY aFY aFY @@ -58343,7 +57668,7 @@ rNe qgQ oXz hmC -tJK +wwn osh osh osh @@ -58537,7 +57862,7 @@ fXS uNA vee eOE -tJK +wwn osh osh osh @@ -58574,7 +57899,7 @@ eJo eJo qkU aFY -bre +uXC aFY aFY eJo @@ -58600,8 +57925,8 @@ eJo aFY eJo eJo -bre -bre +uXC +uXC aFY aFY aFY @@ -58731,7 +58056,7 @@ hmy myz uvd vZt -tJK +wwn osh osh osh @@ -58763,7 +58088,7 @@ eJo aFY aFY aFY -bre +uXC aFY eJo eJo @@ -58772,7 +58097,7 @@ aFY eJo aFY aFY -bre +uXC aFY eJo eJo @@ -58792,7 +58117,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -58832,7 +58157,7 @@ eJo aFY eJo aFY -bre +uXC aFY eJo aFY @@ -58895,7 +58220,7 @@ tqe tqe tqe tqe -atv +aga aPp nIl aqZ @@ -58925,7 +58250,7 @@ bxS dPj dWI wda -tJK +wwn osh osh osh @@ -58985,8 +58310,8 @@ eJo eJo aFY eJo -bre -bre +uXC +uXC aFY aFY aFY @@ -59089,7 +58414,7 @@ tqe tqe tqe tqe -atv +aga wGP rTy lkI @@ -59119,7 +58444,7 @@ eak fqi wKB aRD -tJK +wwn osh osh osh @@ -59179,7 +58504,7 @@ aFY aFY aFY aFY -bre +uXC eJo aFY aFY @@ -59308,12 +58633,12 @@ wDf qWF wgp mQI -tJK +wwn gAl ghi wKB wdw -tJK +wwn osh osh osh @@ -59373,7 +58698,7 @@ aFY aFY eJo eJo -bre +uXC aFY aFY aFY @@ -59507,7 +58832,7 @@ sNE vGm gPu xtL -tJK +wwn osh osh osh @@ -59701,7 +59026,7 @@ daD nvh twy jMi -tJK +wwn osh osh osh @@ -59732,7 +59057,7 @@ eJo aFY aFY aFY -hVK +nYQ elP elP elP @@ -59746,7 +59071,7 @@ elP aEl isQ srn -isQ +fEX bJu fyK gMi @@ -59895,7 +59220,7 @@ vHH sLC wKB eDJ -tJK +wwn osh osh osh @@ -59926,7 +59251,7 @@ eJo aFY aFY aFY -hVK +nYQ elP elP elP @@ -59953,9 +59278,9 @@ fyK nLH huX bSp -bre -bre -bre +uXC +uXC +uXC his his his @@ -60089,7 +59414,7 @@ qsm pAu nUn sNF -tJK +wwn osh osh osh @@ -60120,7 +59445,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60132,14 +59457,14 @@ elP elP elP aEl -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ +bre +bre +bre +bre +bre +bre +bre +bre his his isQ @@ -60147,9 +59472,9 @@ lDu ikl gjl wXn -bre -bre -bre +uXC +uXC +uXC his his his @@ -60283,7 +59608,7 @@ eQi pAu juA hnb -tJK +wwn osh osh osh @@ -60314,7 +59639,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60333,7 +59658,7 @@ aFc aFc sUU aFc -cxQ +bre his his isQ @@ -60385,7 +59710,7 @@ his his aFY aFY -bre +uXC aFY eJo aFY @@ -60477,7 +59802,7 @@ fcY pAu wKB tLf -tJK +wwn osh osh osh @@ -60508,7 +59833,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60527,7 +59852,7 @@ eGo eGo aFc gkS -cxQ +bre his his isQ @@ -60538,7 +59863,7 @@ qpi uxe bEA qpi -mTg +qpi his his his @@ -60671,7 +59996,7 @@ wKB wSk lht myk -tJK +wwn osh osh osh @@ -60702,7 +60027,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60721,7 +60046,7 @@ eGo eGo eGo eGo -cxQ +bre his his isQ @@ -60732,7 +60057,7 @@ dmT cYq dTb rAD -mTg +qpi his his his @@ -60856,16 +60181,16 @@ qKL mzv gKQ hnH -rSR +aTa iJd -rSR +aTa hGy gKQ wpP wIP wKB pXz -tJK +wwn osh osh osh @@ -60889,14 +60214,14 @@ aFY eJo aFY aFY -bre +uXC aFY aFY aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60915,7 +60240,7 @@ eGo eGo eGo eGo -cxQ +bre his his isQ @@ -60926,7 +60251,7 @@ aMg kFT eOM gYg -mTg +qpi his his his @@ -61059,7 +60384,7 @@ cVx wIP nUn ylf -tJK +wwn osh osh osh @@ -61090,7 +60415,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -61109,7 +60434,7 @@ iCc eGo eGo aFc -cxQ +bre his his isQ @@ -61120,7 +60445,7 @@ qpi nIL oPH qpi -mTg +qpi his his his @@ -61253,7 +60578,7 @@ jpR wIP wKB frK -tJK +wwn osh osh osh @@ -61303,13 +60628,13 @@ eGo eGo aFc aFc -cxQ +bre ivS -oqT -oqT +baG +baG uWM -oqT -oqT +baG +baG pMr oNS ryL @@ -61447,7 +60772,7 @@ jum ssJ gyg scT -tJK +wwn osh osh osh @@ -61497,9 +60822,9 @@ fqB wuH gkS sUU -cxQ +bre ivS -oqT +baG jLy iLZ nxm @@ -61574,11 +60899,11 @@ aFY aFY aFY aFY -isQ -isQ -isQ -isQ -isQ +bAS +avD +avD +avD +bAS aFY aFY aFY @@ -61633,15 +60958,15 @@ wik vHW tKj eSB -tJK +wwn xtL qev qYz -wpy +wKB mxc wKB xtL -tJK +wwn osh osh osh @@ -61683,22 +61008,22 @@ wAx qaj aEl aEl -cxQ -cxQ -cxQ -cxQ -cxQ +bre +bre +bre +bre +bre tXv -cxQ -cxQ -cxQ +bre +bre +bre ivS -oqT +baG jeZ agN dYv -oqT -oqT +baG +baG aqp mdC oqT @@ -61827,7 +61152,7 @@ wik gjs eAI hty -tJK +wwn eyh oaj raL @@ -61835,7 +61160,7 @@ wtf uyx nDI pox -tJK +wwn osh osh osh @@ -61854,7 +61179,7 @@ aFY aFY aFY aFY -bre +uXC aFY eJo eJo @@ -61883,15 +61208,15 @@ vAJ viB sPo wVz -cxQ +bre mXO mXO ivS -oqT +baG wZr roi aLm -oqT +baG uZu vjT uLH @@ -61900,7 +61225,7 @@ baG pgf pgf pgf -pgf +uZS ewh ewh ewh @@ -62075,22 +61400,22 @@ pLW qRz dcM diE -cxQ -cxQ -cxQ +bre +bre +bre mXO mXO ivS -oqT -oqT +baG +baG mVl lBy -oqT +baG eBr ihp mWP slq -uZS +pgf fnJ hAA kBt @@ -62108,7 +61433,7 @@ fci fci cCw iOI -tIU +cCw tLI tLI tLI @@ -62218,7 +61543,7 @@ gZO hMM qYE wKB -faJ +nqE gSh cOh nSh @@ -62262,29 +61587,29 @@ owC owC owC owC -cxQ -cxQ +bre +bre aHI oTc unb unb rcX ggF -cxQ -cxQ +bre +bre mXO mXO ivS ivS -oqT -oqT -oqT -oqT +baG +baG +baG +baG ahA ihp mXr xxv -uZS +pgf sSS qxp wgL @@ -62378,11 +61703,11 @@ aFY aFY eJo eJo -bre +uXC eJo -bre +uXC eJo -bre +uXC eJo uNW dtJ @@ -62409,7 +61734,7 @@ wik ksw gNW lQN -tJK +wwn uWb wKB nqE @@ -62451,12 +61776,12 @@ his rly rly dNH -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ +bre +bre +bre +bre +bre +bre syv ksf aoT @@ -62465,20 +61790,20 @@ gVJ fSx lHE usP -cxQ -cxQ +bre +bre mXO qfi qfi qfi qfi qfi -oqT +baG oYW ihp mWP izN -uZS +pgf qQU qxp bbh @@ -62487,7 +61812,7 @@ jzP fXl fXl hrS -fEX +ewh nOk rgT pkn @@ -62603,7 +61928,7 @@ wik bJI hNU kCn -tJK +wwn sSh vAs nqE @@ -62660,19 +61985,19 @@ vVD lHE iFL rqK -cxQ +bre mXO qfi qfi qfi qfi qfi -oqT +baG bmW vVZ nmF maP -uZS +pgf lgw jEY iDi @@ -62681,11 +62006,11 @@ ugA cuS fkq xvm -fEX +ewh aaI vSB rvU -tIU +cCw abx rJU rJU @@ -62763,10 +62088,10 @@ aFY aFY aFY aFY -bre +uXC qkU eJo -bre +uXC qkU eJo qkU @@ -62854,32 +62179,32 @@ vVD lHE opO hws -cxQ +bre mXO qfi qfi fLr fLr fLr -oqT +baG txw qWl qJr txw -uZS +pgf vna fPv hpc uZS -fLr -fLr -fLr -fLr -fLr +faJ +faJ +faJ +faJ +faJ rRi hoc omk -tIU +cCw spN rJU ePO @@ -62961,10 +62286,10 @@ eJo ctJ qkU eJo -bre -bre +uXC +uXC eJo -bre +uXC qkU qgX dtJ @@ -63033,12 +62358,12 @@ his rly aNj rYP -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ +bre +bre +bre +bre +bre +bre fmt ksf wjG @@ -63047,8 +62372,8 @@ unb vVD lHE xrw -cxQ -cxQ +bre +bre mXO qfi qfi @@ -63097,8 +62422,8 @@ atU uOh fZN lpz -bre -bre +uXC +uXC eJo aFY aFY @@ -63232,16 +62557,16 @@ cni cni cni cni -cxQ -cxQ +bre +bre fkh bva oGP tAB nlL wvg -cxQ -cxQ +bre +bre mXO mXO qfi @@ -63291,9 +62616,9 @@ ksX jXH pgC xvt -bre -bre -bre +uXC +uXC +uXC eJo eJo aFY @@ -63405,7 +62730,7 @@ aFY aFY aFY aFY -bre +uXC aFY aFY aFY @@ -63427,14 +62752,14 @@ ifV ifV jih cni -cxQ -cxQ +bre +bre eMn mkI ntD qvz -cxQ -cxQ +bre +bre mXO mXO mXO @@ -63485,12 +62810,12 @@ ylo guR xiE xvt -bre +uXC eJo -bre -bre +uXC +uXC eJo -bre +uXC aFY aFY aFY @@ -63622,12 +62947,12 @@ lnq fUq cni cni -cxQ +bre cxQ qVq tMr -cxQ -cxQ +bre +bre mXO mXO nwh @@ -63662,7 +62987,7 @@ ePO ePO ePO rHN -oYn +jmi kTG ctQ rOR @@ -63679,14 +63004,14 @@ vXE eld fZN jGa -bre -bre -bre +uXC +uXC +uXC eJo -bre -bre -bre -bre +uXC +uXC +uXC +uXC eJo eJo eJo @@ -63705,16 +63030,16 @@ eJo qkU qkU eJo -bre -bre -bre +uXC +uXC +uXC eJo eJo eJo eJo eJo -bre -bre +uXC +uXC eJo eJo eJo @@ -63725,14 +63050,14 @@ eJo eJo eJo eJo -bre -bre +uXC +uXC eJo eJo eJo eJo eJo -bre +uXC eJo qkU qkU @@ -63809,18 +63134,18 @@ oiD oiD oiD oiD -cxs -cxs -cxs +oiD +oiD +oiD lmQ jnf eGa xFy rly -cxQ +bre gFV jge -cxQ +bre mXO mXO mXO @@ -63828,7 +63153,7 @@ nwh wqe oNR dRA -pCE +dEV xAe bDa iKx @@ -63874,41 +63199,41 @@ xqC fZN his his -bre -bre -bre -bre -bre +uXC +uXC +uXC +uXC +uXC eJo eJo -bre +uXC eJo -bre -bre -bre -bre +uXC +uXC +uXC +uXC qkU eJo -bre +uXC eJo -bre -bre -bre +uXC +uXC +uXC eJo -bre +uXC eJo eJo -bre +uXC eJo qkU qkU qkU qkU -bre +uXC eJo eJo -bre -bre +uXC +uXC eJo eJo eJo @@ -64005,7 +63330,7 @@ jOR vmG mcI kFO -cxs +oiD sdk jCW ifV @@ -64066,16 +63391,16 @@ fZN ubB ubB fZN -isQ -isQ +bAS +bAS dzq -bre -bre -bre +uXC +uXC +uXC eJo -bre -bre -bre +uXC +uXC +uXC qkU eJo eJo @@ -64087,18 +63412,18 @@ eJo qkU eJo eJo -bre +uXC eJo -bre +uXC eJo eJo -bre -bre +uXC +uXC eJo eJo eJo eJo -bre +uXC qkU qkU eJo @@ -64122,7 +63447,7 @@ qkU qkU eJo eJo -bre +uXC eJo eJo aFY @@ -64199,7 +63524,7 @@ jvw efb cqi tbi -cxs +oiD sdk lmQ urI @@ -64263,16 +63588,16 @@ fZN nLH huX bSp -bre +uXC aFY aFY eJo -bre +uXC eJo eJo qkU -bre -bre +uXC +uXC eJo eJo eJo @@ -64292,24 +63617,24 @@ qkU qkU eJo eJo -bre +uXC qkU qkU eJo eJo eJo -bre -bre +uXC +uXC eJo eJo eJo eJo -bre +uXC eJo eJo eJo eJo -bre +uXC eJo eJo eJo @@ -64393,7 +63718,7 @@ oRA sUX iTc eSi -cxs +oiD rly jih kaz @@ -64587,7 +63912,7 @@ siU efb alK lfF -cxs +oiD cni cni quN @@ -64678,11 +64003,11 @@ aFY aFY aFY aFY -isQ -isQ -isQ -isQ -isQ +bAS +avD +avD +avD +bAS aFY aFY aFY @@ -64781,7 +64106,7 @@ bcW uOz sbh fnG -cxs +oiD cni fwe cmk @@ -64819,7 +64144,7 @@ tIU sJV qet qjR -rJU +skO opT rJU ePO @@ -64897,7 +64222,7 @@ aFY aFY aFY aFY -bre +uXC qkU eJo eJo @@ -64975,11 +64300,11 @@ oiD oiD oiD ohg -cxs -ssM -ssM -ssM -ssM +oiD +hxV +hxV +hxV +hxV kVl kVl kVl @@ -65013,8 +64338,8 @@ tIU spN juN juN -rJU -rJU +oln +oln rJU rJU rJU @@ -65091,10 +64416,10 @@ aFY aFY aFY aFY -bre +uXC eJo eJo -bre +uXC aFY aFY aFY @@ -65167,13 +64492,13 @@ kwj gBD vGW wyL -elf +mIE rYF sDW -ssM +hxV nbr nbr -ssM +hxV amZ amZ qKa @@ -65288,7 +64613,7 @@ aFY qkU eJo eJo -bre +uXC aFY aFY aFY @@ -65361,13 +64686,13 @@ xIN wan nSz tTW -elf +mIE hGE lwc -ssM +hxV nbr nbr -ssM +hxV lAH aYW jCE @@ -65480,7 +64805,7 @@ aFY aFY aFY eJo -bre +uXC eJo eJo eJo @@ -65555,13 +64880,13 @@ nkI sle gTR ked -elf +mIE piB vJq -ssM +hxV nbr eID -ssM +hxV wUj sbI mJX @@ -65674,7 +64999,7 @@ aFY aFY aFY aFY -bre +uXC eJo eJo eJo @@ -65734,7 +65059,7 @@ aFY aFY aFY aFY -bre +uXC aFY aFY aFY @@ -65745,21 +65070,21 @@ his his his elf -elf +mIE gwy rRo -elf -elf +mIE +mIE ida qAX -ssM -pnj +hxV +hxV dYY -pnj +hxV kVl ckK -kVl -kVl +ucs +ucs kVl pnj pnj @@ -65869,7 +65194,7 @@ aFY aFY aFY aFY -bre +uXC eJo eJo eJo @@ -65938,7 +65263,7 @@ aFY aFY his his -ssM +hxV dqd xpV hKC @@ -65956,7 +65281,7 @@ reR vjQ trq ibl -pnj +hxV qfi qfi qfi @@ -66067,7 +65392,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -66132,7 +65457,7 @@ aFY aFY aFY his -ssM +hxV pcT scg oeV @@ -66150,7 +65475,7 @@ cUn jmr sBu pzt -pnj +hxV qfi qfi qfi @@ -66192,9 +65517,9 @@ bSX axa qpe omk -mIE -mIE -mIE +bLp +bLp +bLp uCh uCh uCh @@ -66326,25 +65651,25 @@ aFY aFY aFY aFY -ssM +hxV ssM iUL -mYW +oMf moZ byk -mYW +oMf moZ oLr -mYW -mYW -qea oMf +oMf +qea +rSR uSu aCg -jFz -jFz -jFz -jFz +pkY +vIy +vIy +vIy jFz jFz jFz @@ -66387,8 +65712,8 @@ imB dDu dvR xaq -rRu -mIE +sBb +bLp uCh uCh uCh @@ -66455,9 +65780,9 @@ aFY aFY aFY eJo -bre +uXC eJo -bre +uXC eJo aFY aFY @@ -66520,22 +65845,22 @@ aFY aFY aFY aFY -ssM +hxV kpK rPt -mYW +oMf dtX sVy -mYW +oMf aBm sVy -mYW +oMf wYh spU oMf nMM fLR -jFz +pkY wEY hSi snl @@ -66582,15 +65907,15 @@ dvX omk fuf mPG -mIE -mIE -mIE -mIE -mIE -mIE -mIE -mIE -mIE +bLp +bLp +bLp +bLp +bLp +bLp +bLp +bLp +bLp bBd vlg kTL @@ -66650,7 +65975,7 @@ aFY aFY aFY eJo -bre +uXC eJo eJo eJo @@ -66714,22 +66039,22 @@ aFY aFY aFY aFY -ssM +hxV lDi fVi -mYW +oMf wTd eSs -mYW +oMf wTd eSs -mYW +oMf mCN mop oMf mkS rfR -jFz +pkY hzA mvN mvN @@ -66750,12 +66075,12 @@ sua sua sua sua -uzf -uzf -uzf -uzf -uzf -uzf +tZw +tZw +tZw +tZw +tZw +tZw jfI juN juN @@ -66847,7 +66172,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -66908,22 +66233,22 @@ aFY aFY aFY aFY -ssM +hxV whL wUH -mYW +oMf iCC sVy -mYW +oMf iCC sVy -mYW +oMf tEf asX oMf inh edC -jFz +pkY pNH aIm aIm @@ -66937,14 +66262,14 @@ lAv gmo jta fLr -uzf -uzf -uzf -uzf -uzf -uzf -uzf -uzf +tZw +tZw +tZw +tZw +tZw +tZw +tZw +tZw gmC tfj fkV @@ -66957,7 +66282,7 @@ fkV rMK otA iem -uzf +tZw hTC jjs uYR @@ -66967,7 +66292,7 @@ uMO uYR uCh uCh -mIE +bLp fuf hDU rwn @@ -67041,7 +66366,7 @@ aFY aFY eJo eJo -bre +uXC eJo eJo aFY @@ -67102,17 +66427,17 @@ aFY aFY aFY aFY -ssM -ssM -ssM -mYW -mYW +hxV +hxV +hxV +oMf +oMf fiv -mYW -mYW +oMf +oMf qYu -mYW -mYW +oMf +oMf mMG oMf ggV @@ -67138,7 +66463,7 @@ mXi iDS iDS bVo -uzf +tZw mga kku kku @@ -67161,14 +66486,14 @@ gQH uYR uCh uCh -mIE +bLp mZa hDU -mIE +bLp acP rRu fDO -mIE +bLp rhs rKg lbC @@ -67298,7 +66623,7 @@ isQ aFY aFY aFY -mYW +rSR cRf cRf pKd @@ -67337,7 +66662,7 @@ xkJ umC jmE jmE -uzf +tZw qeU tZw tZw @@ -67355,7 +66680,7 @@ cYI uYR uCh uCh -mIE +bLp rRu hDU rmA @@ -67367,7 +66692,7 @@ rmA rmA rmA rmA -oSm +rmA hDA vlg egX @@ -67432,7 +66757,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -67523,15 +66848,15 @@ jHU jHU jHU jHU -uzf -uzf -uzf -uzf +tZw +tZw +tZw +tZw ryX emm ilc pKf -uzf +tZw mNR tZw ggb @@ -67549,7 +66874,7 @@ uYR uYR uCh uCh -mIE +bLp rRu hDU rmA @@ -67561,7 +66886,7 @@ bSA vgj avx avx -oSm +rmA hDg oSZ bBd @@ -67572,7 +66897,7 @@ hmK dFO bBd bBd -cBT +bBd bBd ugV pXc @@ -67627,7 +66952,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -67686,7 +67011,7 @@ aFY aFY aFY aFY -mYW +rSR kuQ kuQ cZM @@ -67720,12 +67045,12 @@ jHU jHU uWW uWW -uzf +tZw ryX emm -uzf -uzf -uzf +tZw +tZw +tZw kyJ tZw ree @@ -67736,14 +67061,14 @@ ree ree bLp fey -mIE +bLp uCh uCh uCh uCh uCh uCh -mIE +bLp rRu hDU rmA @@ -67755,7 +67080,7 @@ oKC gft gft rjV -oSm +rmA iEN mPV bBd @@ -67766,7 +67091,7 @@ aEI uwj kjd kjd -aob +kjd kjd gsy kyZ @@ -67880,7 +67205,7 @@ aFY aFY aFY his -mYW +rSR pKd pKd mCy @@ -67888,11 +67213,11 @@ lpc jnb mXb oCz -cNN -cNN +iQX +iQX ewR -cNN -cNN +iQX +iQX cNN pNH aIm @@ -67914,12 +67239,12 @@ nMi jHU jHU uWW -uzf +tZw jGz emm -uzf +tZw uWW -uzf +tZw gNh rgL ree @@ -67930,14 +67255,14 @@ eKy ree bLp fey -mIE +bLp uCh uCh uCh uCh uCh uCh -mIE +bLp swA hQG rmA @@ -67949,7 +67274,7 @@ qFr uat wZP wZP -oSm +rmA bnO tOd bBd @@ -68016,7 +67341,7 @@ aFY aFY eJo eJo -bre +uXC eJo eJo aFY @@ -68074,15 +67399,15 @@ aFY aFY aFY his -mYW +rSR pKd pKd cZM lpc jnb -mYW -mYW -cNN +oMf +oMf +iQX cDS vlR tQa @@ -68108,12 +67433,12 @@ fOr idA jHU uWW -uzf +tZw ryX emm -uzf +tZw uWW -uzf +tZw uud abq qeV @@ -68124,14 +67449,14 @@ vAp ree bLp fey -mIE +bLp uCh uCh uCh uCh uCh uCh -mIE +bLp bQJ hQG rmA @@ -68143,7 +67468,7 @@ dSV rmA rmA rmA -oSm +rmA hDg oSZ bBd @@ -68243,9 +67568,9 @@ aFY aFY aFY aFY -bre -bre -iQX +uXC +uXC +ijH "} (119,1,1) = {" qbg @@ -68268,7 +67593,7 @@ aFY aFY aFY aFY -mYW +rSR cRf cRf cZM @@ -68276,7 +67601,7 @@ eKH utc xBX pKd -cNN +iQX cDS eHO hqz @@ -68302,12 +67627,12 @@ pbb wfH jHU uWW -uzf +tZw ryX emm -uzf +tZw uWW -uzf +tZw gNh nWL ree @@ -68318,14 +67643,14 @@ vAp ree bLp fey -mIE +bLp uCh uCh uCh uCh -mIE -mIE -mIE +bLp +bLp +bLp ogQ tMU oSm @@ -68351,10 +67676,10 @@ pZm pZm pZm pZm -dkS +vGE ych sic -dkS +vGE his his his @@ -68437,9 +67762,9 @@ aFY aFY aFY eJo -bre -bre uXC +uXC +ijH "} (120,1,1) = {" qbg @@ -68470,11 +67795,11 @@ jYo aKQ aKQ aKQ -cNN +iQX cDS qyv -cNN -cNN +iQX +iQX cNN pNH aIm @@ -68496,12 +67821,12 @@ bKD hYB jHU uWW -uzf +tZw ryX emm -uzf +tZw uWW -uzf +tZw rFo tZw ree @@ -68512,12 +67837,12 @@ vAp ree bLp fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp pbw lfS lfS @@ -68545,18 +67870,18 @@ pZm pZm pZm pZm -dkS +vGE ych vMv -dkS -dkS -dkS -dkS -dkS -dkS -dkS -dkS -dkS +vGE +vGE +vGE +vGE +vGE +vGE +vGE +vGE +vGE his his his @@ -68630,10 +67955,10 @@ aFY aFY aFY aFY -bre -bre -bre uXC +uXC +uXC +ijH "} (121,1,1) = {" qbg @@ -68656,7 +67981,7 @@ aFY aFY aFY aFY -mYW +rSR kuQ kuQ pKd @@ -68664,7 +67989,7 @@ dsp lRt uFn uFn -cNN +iQX cDS gFJ nuU @@ -68679,23 +68004,23 @@ nSF jFz jFz jFz -aic +cBT spQ mbu fnd -uzf -uzf -uzf -uzf -uzf -uzf -uzf -uzf +tZw +tZw +tZw +tZw +tZw +tZw +tZw +tZw ryX emm -uzf +tZw uWW -uzf +tZw kyJ tZw ree @@ -68704,14 +68029,14 @@ vAp vAp pha ree -ucs +bLp fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp hQG xMj xMj @@ -68739,10 +68064,10 @@ pZm pZm pZm pZm -dkS +vGE ych wVw -dkS +vGE dvi lJo mry @@ -68750,7 +68075,7 @@ hqx ych ych ych -dkS +vGE his his his @@ -68794,16 +68119,16 @@ aFY aFY aFY aFY -bre +uXC eJo eJo -bre -bre -bre +uXC +uXC +uXC eJo eJo -bre -bre +uXC +uXC eJo qkU eJo @@ -68824,10 +68149,10 @@ qkU eJo eJo eJo -bre -bre -bre uXC +uXC +uXC +ijH "} (122,1,1) = {" ujj @@ -68884,28 +68209,28 @@ kku xJe rdn oSH -uzf +tZw ryX glh -uzf -uWW -uzf -kyJ -uzf +tZw +rOS +rOS +kRe +rOS rOS pUN -drC -drC +qqd +qqd qqd mCf -rOS +bLp mCS -mIE +bLp uCh uCh uCh uCh -mIE +bLp hQG xMj vFA @@ -68933,10 +68258,10 @@ oSm oSm pZm pZm -dkS +vGE ych eGl -dkS +vGE nTk ych khn @@ -68944,7 +68269,7 @@ ych ych hqx ych -dkS +vGE his his his @@ -68994,34 +68319,34 @@ eJo eJo eJo eJo -bre -bre +uXC +uXC eJo eJo eJo qkU eJo eJo -bre +uXC eJo eJo -bre +uXC eJo eJo eJo eJo eJo eJo -bre +uXC qkU qkU -bre +uXC eJo -bre -bre -bre -bre uXC +uXC +uXC +uXC +ijH "} (123,1,1) = {" ujj @@ -69067,39 +68392,39 @@ aDz mYG rAF pIu -aic +cBT fHf uAb -aic -aic -aic -uzf -uzf +cBT +cBT +cBT +tZw +tZw ryX ekp fkV -uzf +tZw ryX nDV -uzf -uWW -uzf -dYB -uWW +tZw rOS +aKe +qqd +pwO +tqc sld -exA lOQ -suw +djJ +lOQ lfi -rOS +bLp sRo -mIE +bLp uCh uCh uCh uCh -mIE +bLp edw jeN vRa @@ -69127,10 +68452,10 @@ dRg oSm pZm pZm -dkS +vGE ych cWT -dkS +vGE dvi ych iZr @@ -69138,7 +68463,7 @@ hqx ych ych ych -dkS +vGE his his his @@ -69194,28 +68519,28 @@ eJo eJo eJo eJo -bre +uXC eJo -bre +uXC eJo eJo -bre +uXC qkU qkU -bre +uXC eJo eJo eJo eJo -bre -bre +uXC +uXC eJo -bre +uXC eJo -bre -bre -bre uXC +uXC +uXC +ijH "} (124,1,1) = {" ujj @@ -69261,12 +68586,12 @@ jFz jFz lqc aTl -aic +cBT gKr moW qDr wKM -aic +mTg cjK xvT ryX @@ -69274,31 +68599,31 @@ ryX ryX dmr ryX -uzf -uzf -uzf -uzf -nxC -uzf -rOS +tZw +tZw rOS +jEh +nxC +fea +jsX +fea fea eDq -hhC -rOS -rOS +lOQ +ucF +vno sRo -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG xMj fkp kua -oSm +cxs dLf qSU hVZ @@ -69321,10 +68646,10 @@ uTF oSm pZm pZm -dkS +vGE ych nYA -dkS +vGE oQP ych rEa @@ -69332,7 +68657,7 @@ nSb hqx ych ych -dkS +vGE his his his @@ -69405,11 +68730,11 @@ qkU eJo eJo eJo -bre -bre -bre -bre uXC +uXC +uXC +uXC +ijH "} (125,1,1) = {" ujj @@ -69455,44 +68780,44 @@ qeH jFz ybG jBT -aic +cBT fmo moW qDr wKM -aic +mTg cjK -aic -uzf -uzf -uzf -uzf +cBT +tZw +tZw +tZw +tZw ryX xTb iDS -uzf -kHy -huJ -kHm -iDS -rOS -lqT -aKM -gCI rOS -mSA +jEh +hLB +kHm +lwW +cCs +lOQ +uIm +lOQ +ucF +bLp fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG xMj nVZ mcF -oSm +cxs dLf qSU hVZ @@ -69513,20 +68838,20 @@ oui nxh nxh oSm -hyG -dkS -dkS +vGE +vGE +vGE ych ozq -dkS -dkS vGE -dkS -dkS -dkS -dkS -dkS -dkS +vGE +vGE +vGE +vGE +vGE +vGE +vGE +vGE his his his @@ -69601,9 +68926,9 @@ aFY aFY aFY eJo -bre -bre uXC +uXC +ijH "} (126,1,1) = {" ujj @@ -69649,7 +68974,7 @@ qeH jFz lqc jIE -aic +cBT kpU omc rUw @@ -69660,28 +68985,28 @@ aic uWW uWW uWW -uzf +tZw ryX -uzf -iDS -uzf -sqv +tZw iDS -uzf -uzf rOS -wsJ -lOQ +jEh +hLB +ucF +dNT +vwP oDt -rOS -tYy +oDt +oDt +pXK +bLp vOr -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG xMj oSm @@ -69692,12 +69017,12 @@ oSm hVZ iAg laB -tZm +oSm eMp eMp eMp eMp -tZm +oSm xQw vJA qSU @@ -69720,7 +69045,7 @@ ych ych ych gju -dkS +vGE his his his @@ -69794,13 +69119,13 @@ aFY aFY aFY aFY -bre -bre -bre uXC +uXC +uXC +ijH "} (127,1,1) = {" -bAS +hYQ iDK iDK wMH @@ -69854,28 +69179,28 @@ aic uWW uWW uWW -uzf +tZw ryX -uzf -iDS -uzf -taw +tZw iDS -uzf -uWW -rOS -axp -lOQ -kSL rOS -wqu +jEh +hLB +ucF +aqB +aqB +vny +vny +aqB +aqB +vrR fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG tCv oSm @@ -69914,7 +69239,7 @@ sYr tPg ych gju -dkS +vGE his his his @@ -69994,7 +69319,7 @@ ujj ujj "} (128,1,1) = {" -vAn +hYQ iDK iDK wMH @@ -70037,7 +69362,7 @@ jFz jFz lqc oKb -aic +cBT uQY ssW aic @@ -70048,28 +69373,28 @@ aic uWW uWW uWW -uzf +tZw ryX cuc -uzf -uzf -uzf -kHQ -rOS -rOS +tZw rOS -hdA -ccr +sML +kHQ +bhf +aqB +vny +vny +vny sMA -rOS +aqB ajv fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG crC oSm @@ -70097,18 +69422,18 @@ uTF oSm pYC ych -dkS -dkS -dkS -dkS -dkS -dkS -dkS -dkS +vGE +vGE +vGE +vGE +vGE +vGE +vGE +vGE oTB -dkS -dkS -dkS +vGE +vGE +vGE vqX vqX aFY @@ -70188,7 +69513,7 @@ osh qbg "} (129,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -70242,28 +69567,28 @@ aic uWW uWW uWW -uzf +tZw ryX qYX pKf -pKf -pKf -pKf -rOS -lUe -ufd -nYy -lOQ +exw +jEh +hLB +hKr +aqB vny -qvs -mIE +vny +vny +vny +aqB +vrR azH -mIE -mIE -mIE -mIE -mIE -mIE +bLp +bLp +bLp +bLp +bLp +bLp oyR wLU oSm @@ -70291,7 +69616,7 @@ pgI oSm ych ych -dkS +vGE fVb dqk ogu @@ -70382,7 +69707,7 @@ osh qbg "} (130,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -70425,10 +69750,10 @@ vyN vyN pNH jFz -aic +cBT sUJ dkx -aic +cBT bIA rOS rOS @@ -70436,20 +69761,20 @@ rOS uWW uWW uWW -uzf +tZw ryX -uzf -rOS -rOS -pKf -pKf -rOS +tZw rOS rOS -bwo -lOQ -nlW -oUb +jEh +hLB +ucF +aqB +vny +vny +vny +vny +aqB oou sse lcn @@ -70485,7 +69810,7 @@ oSm oSm ych ych -dkS +vGE vdG kfM kfM @@ -70576,7 +69901,7 @@ osh qbg "} (131,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -70619,10 +69944,10 @@ uyB mvN wLp ioI -aic +cBT siJ qmk -aic +cBT bIA rOS lUe @@ -70630,21 +69955,21 @@ rOS uWW uWW uWW -uzf +tZw ryX -uzf +tZw lUe rOS -erH -pKf -pKf -pKf -qYX -eFe -lOQ -iiJ -rIq -sZP +jEh +hLB +ucF +aqB +vny +vny +vny +vny +aqB +cCq rUW sZP sZP @@ -70667,7 +69992,7 @@ qSU qSU qSU iEU -tZm +oSm nMw agK vmT @@ -70679,7 +70004,7 @@ sXS oSm fTt ych -dkS +vGE rdj dEy cKH @@ -70770,7 +70095,7 @@ osh qbg "} (132,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -70829,24 +70154,24 @@ kim rOS dzJ rOS -rOS -rOS -rOS -rOS -rOS -rik -wXU -fdb -rOS -mIE -mIE -mIE -mIE +bFr +xuk +cdp +aqB +aqB +aqB +aqB +aqB +aqB +cCq +bLp +bLp +bLp dSQ pub -mIE -mIE -mIE +bLp +bLp +bLp vUu oSm dbK @@ -70873,7 +70198,7 @@ uTF oSm ych ych -dkS +vGE nrR mRH mRH @@ -70964,7 +70289,7 @@ osh qbg "} (133,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -71011,8 +70336,8 @@ wyv vxE kjQ nng -lSg -nUI +vAn +fJH qAV qOJ gAj @@ -71020,27 +70345,27 @@ pMt nUI cZw nUI -nUI +cZw qAV ljx lSg -gAj +lrw hRQ xqk fjo ofq uGu weY -rOS +rwM +kKu uCh uCh -uCh -mIE +bLp wCx pub -mIE +bLp uCh -mIE +bLp vUu oSm dqs @@ -71067,7 +70392,7 @@ wwN oSm ych bmM -dkS +vGE hfw hfw hfw @@ -71158,7 +70483,7 @@ osh qbg "} (134,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -71205,8 +70530,8 @@ vDO ezH dcT vUq -vUq -vUq +ixh +gTt vUq vUq vUq @@ -71229,12 +70554,12 @@ rOS uCh uCh uCh -mIE +bLp aDg pub -mIE +bLp uCh -mIE +bLp vUu oSm fpo @@ -71261,7 +70586,7 @@ oSm oSm ych ttR -dkS +vGE cCl cCl hfw @@ -71352,7 +70677,7 @@ osh qbg "} (135,1,1) = {" -vAn +hYQ iDK iDK wMH @@ -71423,12 +70748,12 @@ rOS uCh uCh uCh -mIE +bLp nWl pub -mIE +bLp uCh -mIE +bLp vUu oSm max @@ -71455,7 +70780,7 @@ ych ych ych ych -dkS +vGE uqL cCl hfw @@ -71546,7 +70871,7 @@ osh qbg "} (136,1,1) = {" -vAn +hYQ iDK iDK wMH @@ -71588,7 +70913,7 @@ aPo pfv fQU rGw -fQU +dTk fpi sIZ pcG @@ -71617,12 +70942,12 @@ rOS rOS uCh uCh -mIE +bLp dSQ pub -mIE +bLp uCh -mIE +bLp wgQ oSm oSm @@ -71632,12 +70957,12 @@ oSm qSU gkc bPU -tZm +oSm eMp eMp eMp eMp -tZm +oSm uqo vJA qSU @@ -71649,7 +70974,7 @@ dqb xDr ych eBz -dkS +vGE cCl cCl doG @@ -71811,16 +71136,16 @@ hfh rOS uCh uCh -mIE +bLp dSQ fBj -mIE +bLp uCh -mIE +bLp cep hyj oIn -oSm +cxs dLf qSU qSU @@ -72008,13 +71333,13 @@ whS whS mas pub -mIE +bLp uCh -mIE +bLp sZP ppA pms -oSm +cxs dLf qSU qSU @@ -72202,10 +71527,10 @@ vhj whS cRu pub -mIE +bLp uCh -mIE -mIE +bLp +bLp dSQ wgQ oSm @@ -72396,10 +71721,10 @@ wFz fmB hyj pGH -mIE +bLp uCh uCh -mIE +bLp dSQ vUu oSm @@ -72590,10 +71915,10 @@ qzG whS ktx pub -mIE +bLp uCh uCh -mIE +bLp hPl vUu oSm @@ -72784,13 +72109,13 @@ wep whS fsF pub -mIE +bLp uCh uCh -mIE +bLp qNk vUu -mIE +bLp qso rRu oSm @@ -72931,7 +72256,7 @@ drK hSy jgC jgC -jJw +nMN muz ehJ eah @@ -72978,13 +72303,13 @@ whS whS oWb pub -mIE +bLp uCh uCh -mIE -mIE +bLp +bLp gND -mIE +bLp rRu fny gQC @@ -73125,7 +72450,7 @@ jrR hSy jgC jgC -jJw +nMN yiM cKB eBl @@ -73170,9 +72495,9 @@ dJe ayl cGH whS -mIE +bLp mGH -mIE +bLp iMr iMr rOS @@ -73181,7 +72506,7 @@ aOs rOS rOS sSd -kDE +sSd kDE kDE kDE @@ -73195,7 +72520,7 @@ jVz jVz dxH dxH -dxH +mEi mEi pxt eYt @@ -73374,7 +72699,7 @@ lOQ jxV lOQ hBS -sSd +eVq xIB ias xIB @@ -73568,7 +72893,7 @@ kRR jxV lOQ hBS -sSd +eVq xIB xIB xIB @@ -73937,9 +73262,9 @@ hpY ubV soU qrX -soU ezW -auv +yeP +ezW vWi nQv rOS @@ -74131,8 +73456,8 @@ uXS cjw tdU hWQ -mPi cLL +dkS wOX lOQ mRc @@ -74712,7 +74037,7 @@ lQS uFO kUE bkI -sTk +tJK eJj sTk fPO @@ -74906,7 +74231,7 @@ lQS uFO xXw evL -sTk +tJK eJj sTk sZz @@ -75100,9 +74425,9 @@ hoo uFO vGt bdR -sTk +tJK mAh -uFO +pSv iyI lOQ ydX @@ -75294,7 +74619,7 @@ umL uFO sty eFC -sTk +tJK eJj pjF xpQ @@ -75338,7 +74663,7 @@ kTB kDZ ejS uTV -dkS +vGE kug kug vtI @@ -75489,12 +74814,12 @@ uFO kYi jTx uFO -sTk +tJK uFO bdL wBz tXj -rOS +dQI gSb gSb gSb @@ -75509,8 +74834,8 @@ eXH eXH gSb vjO -vjO -vjO +svt +svt suI lNB lNB @@ -75532,9 +74857,9 @@ vpR oId vyR vyR -dkS -dkS -dkS +vGE +vGE +vGE vtI kjM hJO @@ -75727,7 +75052,7 @@ uvH thy rhx nBu -dkS +vGE ebf vtI nCf @@ -75737,7 +75062,7 @@ vtI tzO chk flQ -bzU +vms plG wqT aFY @@ -75921,7 +75246,7 @@ pRF wNN fSz bqM -dkS +vGE jRi vtI vtI @@ -76240,7 +75565,7 @@ bIr lEH lij xGi -pDO +wpy dJw irX seT @@ -76270,7 +75595,7 @@ uFO qtD lOQ acW -rOS +dQI vZm gSb wic @@ -76417,11 +75742,11 @@ aFY aFY his eZZ -vwJ -vwJ +sQq +sQq nfZ -vwJ -vwJ +sQq +sQq eZZ eZZ eZZ @@ -76464,8 +75789,8 @@ mQq sZz lOQ fmz -rIq -rOS +ezv +dQI gSb unR uMK @@ -76654,7 +75979,7 @@ xKC fAG thL rTb -rOS +nIE nyo whP fmz @@ -76673,9 +75998,9 @@ dqU dqU tyg vjO -vjO +svt qNQ -vjO +svt lNB lNB sYF @@ -76850,10 +76175,10 @@ fNh fNh fNh kfi -vIy +sWV tXS -fNh -fNh +auv +auv gSb gSb ihQ @@ -77040,7 +76365,7 @@ cXw eQt lYh szQ -fNh +auv kCk uaz aOm @@ -77048,7 +76373,7 @@ eCr sIN tFl kCk -fNh +auv jNV cFk fAw @@ -77191,7 +76516,7 @@ onw onw onw onw -avD +xNf eZZ taQ gxn @@ -77210,7 +76535,7 @@ vuL ctV pDO pDO -azD +bYF jgC jgC voY @@ -77234,7 +76559,7 @@ cFk cFk cFk gnY -fNh +auv kCk uaz aOm @@ -77242,7 +76567,7 @@ ykZ pgv tFl kCk -fNh +auv giJ cFk cFk @@ -77257,7 +76582,7 @@ aad vjO vjO vjO -vjO +svt lNB lNB lNB @@ -77428,15 +76753,15 @@ uCp uCp srB bad -fNh -fNh -fNh +auv +auv +auv gNB lZL tRM -fNh -fNh -fNh +auv +auv +auv ddH qOd fjH @@ -77616,7 +76941,7 @@ xVz xVz xVz xVz -fNh +auv iou cFk nbV @@ -77626,7 +76951,7 @@ iGH elh oyX hSt -vIy +sWV ksV oyX rpx @@ -77662,8 +76987,8 @@ his uaU lgC lOC -bre -bre +uXC +uXC qDA his his @@ -77810,7 +77135,7 @@ lSi lSi lSi lSi -fNh +auv qdD exV exV @@ -77835,9 +77160,9 @@ dsk dsk dsk gSb -dsk -dsk -dsk +aob +aob +aob gSb his his @@ -77856,7 +77181,7 @@ srn eJo eJo fyK -bre +uXC fyK srn lOC @@ -78004,7 +77329,7 @@ qTI wRB idy lDK -fNh +auv lqW cFk ykZ @@ -78028,14 +77353,14 @@ hiJ olB iIb lVz -fNh +auv cSU qBH srn qDA eJo -bre -bre +uXC +uXC srn lOC gFo @@ -78049,9 +77374,9 @@ eJo eJo fyK ndc -bre -bre -bre +uXC +uXC +uXC fyK eJo eJo @@ -78060,8 +77385,8 @@ eJo lOC eJo eJo -bre -bre +uXC +uXC eJo pDZ aFY @@ -78222,25 +77547,25 @@ cFk cFk cFk cFk -fNh +oYn oxq -bre -bre +uXC +uXC srn -bre +uXC fyK eJo -bre +uXC eJo -bre -bre -bre -bre +uXC +uXC +uXC +uXC fyK eJo eJo ndc -bre +uXC eJo eJo fyK @@ -78250,9 +77575,9 @@ lOC fyK eJo srn -bre +uXC fyK -bre +uXC fyK fyK fyK @@ -78355,7 +77680,7 @@ oAN oAN oAN oAN -avD +xNf eZZ eZZ eZZ @@ -78373,25 +77698,25 @@ xtJ gVG xtJ xtJ -bre -bre -bre -bre -bre +uXC +uXC +uXC +uXC +uXC orn -isQ -bre -bre -bre -bre +fEX +uXC +uXC +uXC +uXC isQ kCc kCc gqb -fNh -fNh -fNh -fNh +auv +auv +auv +auv gqb mOV tsM @@ -78416,23 +77741,23 @@ tsM tsM tsM jwg -gqb +uIy wkX srn -bre -bre -bre +uXC +uXC +uXC lOC eJo -bre +uXC fyK -bre +uXC eJo srn eJo ndc -bre -bre +uXC +uXC eJo srn eJo @@ -78441,16 +77766,16 @@ eJo eJo eJo eJo -bre -bre -bre +uXC +uXC +uXC eJo eJo srn lOC eJo fyK -bre +uXC xee aFY aFY @@ -79163,7 +78488,7 @@ fiP fiP fiP fiP -sxt +hyG sLD sLD sLD @@ -79192,7 +78517,7 @@ sLD sLD sLD sLD -sxt +hyG fiP fiP mbw @@ -79420,7 +78745,7 @@ fyK ijF tdn isQ -bre +uXC xee aFY aFY @@ -79808,7 +79133,7 @@ tdn tdn fyK mHr -bre +uXC pDZ aFY fyK @@ -80196,7 +79521,7 @@ tdn ijF fyK isQ -bre +uXC pDZ aFY tdn @@ -80327,7 +79652,7 @@ fiP fiP fiP fiP -sxt +hyG sLD sLD sLD @@ -80356,7 +79681,7 @@ sLD sLD sLD sLD -sxt +hyG fiP mbw fiP @@ -80565,9 +79890,9 @@ tQo tQo dzz tQo -nMN -nMN -nMN +xcL +xcL +xcL tQo tQo iKy @@ -81104,34 +80429,34 @@ oAN oAN oAN gqb -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv gqb mLo mLo diff --git a/maps/tether/levels/surface2.dmm b/maps/tether/levels/surface2.dmm index 890ac78aca..f7d5d362f4 100644 --- a/maps/tether/levels/surface2.dmm +++ b/maps/tether/levels/surface2.dmm @@ -58,7 +58,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) "adY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/middlehall) "aek" = ( /obj/structure/railing{ @@ -234,11 +234,7 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "akL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -285,15 +281,6 @@ /turf/simulated/mineral/floor/virgo3b, /area/tether/surfacebase/outside/outside2) "alC" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_c" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "patient_room_c" - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -305,6 +292,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_c"; + name = "Patient C" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_c) "alM" = ( @@ -343,10 +335,7 @@ }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/mauve/bordercorner2, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -412,19 +401,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"aqv" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aqZ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -533,11 +509,17 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) +"auz" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "auT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/camera/network/tether, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "avt" = ( @@ -574,16 +556,8 @@ name = "Pen 3 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "axi" = ( @@ -780,7 +754,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "aAE" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_slimepens) "aBA" = ( /obj/effect/floor_decal/borderfloor{ @@ -930,7 +904,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar_upper) "aGQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/emergency_storage/atmos) "aGU" = ( /obj/structure/cable/green{ @@ -1183,11 +1157,7 @@ /turf/simulated/floor/tiled, /area/rnd/lockers) "aUg" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -1200,15 +1170,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "aUm" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "aUn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomfoyer) "aUw" = ( @@ -1414,10 +1381,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/rnd/lockers) "bbE" = ( @@ -1457,11 +1421,7 @@ /area/maintenance/asmaint2) "bdR" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -1479,17 +1439,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) -"bdU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "bdX" = ( /obj/machinery/door/window/brigdoor/eastleft{ name = "Slime Pen 3"; @@ -1625,12 +1574,11 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "bhv" = ( @@ -1745,11 +1693,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -1839,7 +1783,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "boG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/interrogation) "boR" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -2036,12 +1980,8 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "bvC" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/obj/structure/cable/green{ - dir = 1; +/obj/machinery/fire_alarm/east_mount, +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/wood, @@ -2089,7 +2029,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Infirmary Lobby" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "byZ" = ( @@ -2411,10 +2351,6 @@ req_access = list(19) }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/blast/regular{ @@ -2428,6 +2364,9 @@ opacity = 0; open_layer = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor, /area/bridge/bridge_hallway) "bMp" = ( @@ -2478,12 +2417,11 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "bNJ" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomsat) "bNP" = ( @@ -2741,14 +2679,8 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "bXq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/southhall) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/surface_two_hall) "bXZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -2759,8 +2691,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "bYv" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/morgue) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/east_stairs_two) "bYE" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -2858,9 +2790,6 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "cdj" = ( @@ -2878,11 +2807,7 @@ /area/tether/surfacebase/medical/centralhall) "cdu" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2890,7 +2815,7 @@ /area/tether/surfacebase/security/detective/officeb) "cdQ" = ( /obj/structure/sign/department/telecoms, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/tcomms) "cdS" = ( /obj/effect/floor_decal/techfloor{ @@ -3030,13 +2955,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "cgz" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_slimepens) "cha" = ( @@ -3053,10 +2973,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "chh" = ( @@ -3118,33 +3035,22 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "chq" = ( -/turf/simulated/wall{ - can_open = 1 - }, -/area/maintenance/lower/bar) -"chC" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/obj/effect/floor_decal/corner/yellow/border, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) +/turf/simulated/wall/prepainted/engineering/atmos, +/area/tether/surfacebase/emergency_storage/atmos) "chK" = ( /obj/effect/debris/cleanable/blood, /turf/simulated/floor, /area/maintenance/lower/north) "chM" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/light_switch{ dir = 1; on = 0; pixel_x = -10; pixel_y = -24 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/teleporter) "cii" = ( @@ -3157,11 +3063,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) "ciA" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -3403,7 +3305,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "cpH" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/lower/atmos_eva) "cqh" = ( /obj/structure/catwalk, @@ -3469,15 +3371,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) -"ctj" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "ctt" = ( /obj/structure/bed/chair, /obj/item/radio/intercom{ @@ -3692,7 +3585,7 @@ /area/tether/surfacebase/old_tram) "czY" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_two_hall) "cAS" = ( /obj/structure/disposalpipe/segment{ @@ -3746,9 +3639,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "cFa" = ( -/turf/simulated/wall{ - can_open = 1 - }, +/turf/simulated/wall/prepainted, /area/vacant/vacant_bar_upper) "cFc" = ( /obj/machinery/porta_turret{ @@ -3822,20 +3713,14 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "cGM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/reading_room) "cGZ" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralhall) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "cHi" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4089,15 +3974,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "cNU" = ( @@ -4236,7 +4121,7 @@ /area/rnd/staircase/secondfloor) "cUi" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/examroom) "cUl" = ( /obj/machinery/computer/rdservercontrol{ @@ -4293,8 +4178,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "cWY" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/resleeving) +/turf/simulated/wall/prepainted/security, +/area/maintenance/lower/north) "cXO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -4340,9 +4225,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "cYW" = ( @@ -4356,8 +4239,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/security, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/holowarrant, @@ -4436,7 +4318,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "dbW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/evastorage) "dcg" = ( /obj/machinery/light/small{ @@ -4491,7 +4373,7 @@ /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" }, -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/engineering/lower/lobby) "deB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4509,11 +4391,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "deF" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -4724,29 +4602,15 @@ /area/engineering/drone_fabrication) "dmI" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) -"dnw" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Bridge"; - departmentType = 5; - name = "Bridge RC"; - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "doq" = ( /obj/machinery/space_heater, /obj/structure/window/reinforced{ @@ -4910,6 +4774,9 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) +"dwA" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "dwC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4937,6 +4804,24 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) +"dBJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 6 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "dCm" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -4960,17 +4845,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "dCW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/tcommsat/computer) -"dDb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "dDl" = ( /obj/structure/table/glass, /obj/item/folder/white_rd, @@ -4984,10 +4860,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) "dEE" = ( @@ -5087,12 +4960,11 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 6 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "dHL" = ( @@ -5242,11 +5114,12 @@ /turf/simulated/floor, /area/maintenance/substation/research) "dOp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "rd_office" - }, /obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "rd_office"; + name = "RD Office" + }, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/rdoffice) "dOK" = ( @@ -5352,18 +5225,8 @@ name = "Pen 10 Blast Doors"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "dRT" = ( @@ -5385,10 +5248,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) @@ -5435,7 +5295,7 @@ /area/teleporter) "dUz" = ( /obj/structure/symbol/gu, -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/south) @@ -5497,7 +5357,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/tcomms) "dWZ" = ( /obj/structure/cable{ @@ -5544,13 +5404,9 @@ /area/tcomfoyer) "dYM" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "dZc" = ( @@ -5572,10 +5428,7 @@ /turf/simulated/floor, /area/maintenance/lower/south) "dZF" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5634,9 +5487,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/lockers) -"edb" = ( -/turf/simulated/wall, -/area/rnd/rdoffice) "edp" = ( /obj/structure/railing, /obj/structure/railing{ @@ -5781,11 +5631,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor/shifted{ dir = 1 }, @@ -5805,9 +5651,6 @@ /obj/machinery/door/airlock/maintenance/command{ req_access = list(19) }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5824,19 +5667,13 @@ opacity = 0; open_layer = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/bridge/bridge_hallway) "ehM" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "cmo_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "cmo_office" - }, -/turf/simulated/floor/plating, +/turf/simulated/wall/r_wall/prepainted/medical, /area/tether/surfacebase/medical/cmo) "ehV" = ( /obj/structure/bookcase, @@ -5879,11 +5716,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "ejq" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "meetingroom" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "meetingroom"; + name = "Command Meeting" }, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor, /area/bridge/meeting_room) "ejF" = ( @@ -5900,7 +5737,7 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "eks" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/breakroom) "ekL" = ( /obj/structure/railing{ @@ -6037,7 +5874,6 @@ /area/maintenance/lower/north) "epk" = ( /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/white, @@ -6059,17 +5895,10 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "epZ" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/turf/simulated/wall/prepainted{ + can_open = 1 }, -/obj/structure/grille, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) +/area/maintenance/lower/rnd) "eqp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6111,11 +5940,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/staircase/secondfloor) @@ -6126,11 +5951,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -6161,7 +5982,6 @@ dir = 1 }, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/white, @@ -6218,23 +6038,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) -"ewg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/engineering/lower/breakroom) "ewU" = ( /turf/simulated/floor/tiled, /area/janitor) "ewZ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "ward_tint" - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/recoveryward) +/turf/simulated/wall/prepainted/science, +/area/rnd/staircase/secondfloor) "exa" = ( /obj/structure/railing{ dir = 4 @@ -6276,15 +6085,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"eyw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "eyK" = ( /obj/structure/railing{ dir = 1 @@ -6305,19 +6105,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"eAI" = ( -/obj/effect/floor_decal/borderfloor/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 5 - }, -/obj/structure/bed/chair, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "eAR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, @@ -6334,11 +6121,16 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "eAU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/maintenance/engineering/pumpstation) "eBn" = ( /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) +"eBq" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "eBr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6377,11 +6169,10 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) "eCd" = ( -/turf/simulated/wall, -/area/engineering/lower/lobby) +/turf/simulated/wall/prepainted, +/area/maintenance/lower/rnd) "eCp" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -6393,15 +6184,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "eCv" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_a" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "patient_room_a" - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -6413,6 +6195,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_a"; + name = "Patient A" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_a) "eCL" = ( @@ -6535,10 +6322,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "eFC" = ( @@ -6592,7 +6376,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "eJb" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/command, /area/maintenance/substation/command) "eJh" = ( /obj/item/radio/beacon, @@ -6646,7 +6430,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "eMx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/storage) "eMH" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -6771,12 +6555,7 @@ /turf/simulated/mineral, /area/tether/surfacebase/reading_room) "eQV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/readingrooms) "eQW" = ( @@ -6823,7 +6602,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "eRZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/fish_farm) "eSc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6864,11 +6643,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer) @@ -6877,7 +6653,7 @@ desc = "A warning sign which reads 'WATCH YOUR STEP'."; name = "\improper WATCH YOUR STEP" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/commandmaint) "eUG" = ( /turf/simulated/mineral, @@ -6996,13 +6772,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/medsec) "eYI" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/light/small, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "eZk" = ( @@ -7060,7 +6830,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "fah" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/bar) "fat" = ( /obj/machinery/portable_atmospherics/powered/scrubber, @@ -7072,29 +6842,16 @@ /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) "fav" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/detective) "fay" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "1-8" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) "faD" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -7102,7 +6859,8 @@ name = "Pen 10 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "fbh" = ( @@ -7285,7 +7043,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/tcomsat) "fht" = ( /obj/machinery/light{ @@ -7323,12 +7081,11 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 10 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "fiE" = ( @@ -7349,12 +7106,11 @@ /area/maintenance/lower/south) "fiW" = ( /obj/structure/sign/nanotrasen, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "fjg" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/paper_bin, @@ -7427,6 +7183,7 @@ "fmp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "fmr" = ( @@ -7487,6 +7244,9 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lower/south) +"fsv" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "fsz" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -7659,10 +7419,10 @@ initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; + on = 1; pressure_checks = 2; pressure_checks_default = 2; - pump_direction = 0; - on = 1 + pump_direction = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=500;TEMP=80"; @@ -7672,11 +7432,7 @@ "fzR" = ( /obj/structure/table/steel, /obj/effect/floor_decal/rust, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/random/maintenance/research, /obj/random/tech_supply, /turf/simulated/floor/tiled/steel_dirty, @@ -7781,11 +7537,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "fCy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -7846,11 +7598,8 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green{ +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/pink{ icon_state = "0-8" }, /turf/simulated/floor/plating, @@ -7879,17 +7628,12 @@ "fHA" = ( /obj/machinery/disposal, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "fHF" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -7901,13 +7645,8 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/centralhall) "fHS" = ( @@ -7995,12 +7734,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "fKx" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -8011,6 +7744,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/outfitting) "fKC" = ( @@ -8020,17 +7755,14 @@ /turf/simulated/floor/tiled, /area/janitor) "fKG" = ( -/turf/simulated/wall/r_wall, -/area/engineering/drone_fabrication) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/outside/outside2) "fKS" = ( /obj/structure/sink{ dir = 4; pixel_x = 11 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/mirror{ pixel_x = 29 }, @@ -8223,12 +7955,6 @@ /obj/item/seeds/random, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"fPs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "fQs" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; @@ -8241,6 +7967,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"fQu" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "fQB" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -8303,6 +8036,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_a) +"fSE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "fSS" = ( /obj/structure/closet/wardrobe/pjs, /obj/item/handcuffs/fuzzy, @@ -8435,11 +8177,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -8475,6 +8214,18 @@ /obj/item/slime_extract/grey, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) +"fXt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "fXL" = ( /obj/machinery/door/airlock/medical{ name = "Morgue"; @@ -8596,6 +8347,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) +"gcD" = ( +/obj/structure/railing, +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "gcP" = ( /obj/machinery/light/small{ dir = 4 @@ -8653,11 +8412,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "gep" = ( @@ -8683,6 +8438,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "ggP" = ( @@ -8723,6 +8481,17 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) +"gis" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "giu" = ( /obj/structure/bed/chair/comfy/black, /obj/structure/disposalpipe/segment, @@ -8766,6 +8535,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) +"gku" = ( +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "gkJ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -8832,8 +8604,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -8869,10 +8640,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "gmP" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8922,11 +8690,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) "goj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -8964,11 +8728,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "gpO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -8989,7 +8749,7 @@ /area/tether/surfacebase/medical/recoveryward) "gqK" = ( /obj/structure/sign/deck/second, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_slimepens) "grc" = ( /obj/machinery/disposal, @@ -9113,7 +8873,7 @@ /turf/simulated/floor/wood, /area/engineering/lower/breakroom) "gtI" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/teleporter) "gtR" = ( /obj/effect/floor_decal/borderfloor{ @@ -9145,10 +8905,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "gvx" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "cmo_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "cmo_office"; + name = "CMO office" }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/cmo) @@ -9371,8 +9130,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9473,12 +9231,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "gCr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/south) "gDl" = ( @@ -9597,11 +9350,7 @@ /area/tether/surfacebase/surface_two_hall) "gId" = ( /obj/structure/catwalk, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -9620,28 +9369,22 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "gIp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/reading_room) +"gIz" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/structure/window/basic{ dir = 1 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/centralhall) +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "gII" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/breakroom/bathroom) "gIQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9910,7 +9653,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "gTB" = ( @@ -9925,9 +9667,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/empty, -/obj/structure/window/reinforced{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "gUe" = ( @@ -9947,17 +9686,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "gUJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -9965,7 +9693,8 @@ name = "Pen 9 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "gVC" = ( @@ -10077,7 +9806,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "gZG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/bathroom) "gZM" = ( /obj/machinery/washing_machine, @@ -10103,21 +9832,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "hal" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "han" = ( @@ -10209,8 +9926,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "hdE" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10280,11 +9996,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) "hgc" = ( @@ -10381,6 +10093,15 @@ /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"hmg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "hmG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -10393,15 +10114,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) -"hmV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "hnc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -10416,9 +10128,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "hnf" = ( @@ -10440,19 +10149,6 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/old_tram) "hog" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -10460,6 +10156,8 @@ name = "Pen 1 Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "hou" = ( @@ -10504,10 +10202,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "hqA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -10518,19 +10213,10 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) "hqD" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/atmos_eva) -"hra" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "hrp" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -10592,11 +10278,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -10638,7 +10321,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "hwi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/mining) "hwk" = ( /obj/structure/cable/cyan{ @@ -10725,15 +10408,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "hAs" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_b" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "patient_room_b" - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -10745,6 +10419,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_b"; + name = "Patient B" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_b) "hBh" = ( @@ -10854,11 +10533,12 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "hFn" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/lockers) "hGy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock, /turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "hGI" = ( @@ -10876,9 +10556,6 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "hGT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/item/radio/intercom{ broadcasting = 1; frequency = 1473; @@ -11029,11 +10706,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/cyan, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -11299,9 +10972,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "hTQ" = ( @@ -11340,8 +11010,7 @@ "hUI" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -11486,11 +11155,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/storage) "iaa" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/green{ icon_state = "0-8" @@ -11526,11 +11191,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"iaN" = ( -/obj/item/storage/fancy/cigar/havana, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_two_hall) "ibj" = ( /obj/structure/table/steel, /obj/item/flashlight/lamp, @@ -11702,7 +11362,7 @@ name = "Command Substation"; req_one_access = list(10,19) }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -11729,9 +11389,7 @@ dir = 1 }, /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 5; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/white, @@ -11743,10 +11401,6 @@ /area/tether/surfacebase/medical/breakroom) "imK" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -11755,6 +11409,12 @@ /obj/landmark{ name = "lightsout" }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "imW" = ( @@ -11768,10 +11428,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "inb" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -11795,14 +11452,14 @@ "inS" = ( /obj/structure/bed/padded, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ +/obj/machinery/fire_alarm{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "inU" = ( /obj/structure/sign/nanotrasen, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/bar) "ioh" = ( /obj/effect/floor_decal/techfloor, @@ -11881,10 +11538,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "ipR" = ( @@ -11903,6 +11557,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"iqy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "iqG" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/supply, @@ -12276,13 +11939,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ +/obj/structure/cable/pink, +/obj/structure/cable/pink{ icon_state = "0-2" }, +/obj/structure/cable/pink{ + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/maintenance/substation/command) "iBd" = ( @@ -12340,15 +12003,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"iBN" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "iCc" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -12421,13 +12075,12 @@ req_access = list(5); req_one_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "iER" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "iFh" = ( @@ -12451,8 +12104,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "iFL" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/trunk{ @@ -12474,10 +12126,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/server) "iGI" = ( @@ -12533,8 +12182,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite/corner2{ @@ -12657,7 +12305,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/white, @@ -12751,7 +12398,6 @@ name = "Medical Breakroom"; sortType = "Medical Breakroom" }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "iNS" = ( @@ -12763,6 +12409,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) +"iON" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "iOU" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -12781,7 +12435,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "iPB" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/bridge/meeting_room) "iPR" = ( /obj/structure/catwalk, @@ -12811,11 +12465,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "iRG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12845,7 +12495,7 @@ /area/engineering/atmos) "iSt" = ( /obj/structure/sign/department/telecoms, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/tcommsat/entrance) "iSx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -12874,17 +12524,17 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "iTw" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/polarized/full{ - id = "wardenwindows" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "wardenwindows"; + name = "Wardens Office" }, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "iTY" = ( @@ -13082,7 +12732,7 @@ /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/lower/rnd) "jdu" = ( /obj/structure/cable/green{ @@ -13099,6 +12749,15 @@ /obj/random/action_figure, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) +"jfJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "jfO" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -13169,8 +12828,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/light_switch{ @@ -13387,9 +13045,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "joP" = ( @@ -13434,10 +13090,7 @@ /area/maintenance/lower/bar) "jra" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/table/standard, /obj/random/medical, @@ -13532,7 +13185,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "jtG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/maintenance/commandmaint) "jux" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13633,22 +13286,11 @@ name = "Pen 5 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "jxG" = ( @@ -13695,7 +13337,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, /turf/simulated/floor/wood, @@ -13791,9 +13433,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_b) "jCm" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/monitoring) "jCp" = ( @@ -13894,11 +13535,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "jGG" = ( @@ -13980,8 +13617,7 @@ /area/tether/surfacebase/outside/outside2) "jKw" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/paper_bin, @@ -14025,12 +13661,8 @@ /area/maintenance/lower/south) "jNa" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/station_map{ - pixel_y = 32 + dir = 9 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "jNW" = ( @@ -14089,13 +13721,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "jPo" = ( -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/atmos) "jQx" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -14107,18 +13737,16 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/polarized/full{ - id = "surfresleeving" - }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "surfresleeving"; + name = "Resleeving" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/resleeving) "jQW" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/uppersouthstairwell) "jRi" = ( @@ -14142,7 +13770,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "jRP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/asmaint2) "jSr" = ( /turf/simulated/open, @@ -14173,8 +13801,8 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "jUj" = ( -/turf/simulated/wall/r_wall, -/area/engineering/lower/breakroom) +/turf/simulated/wall/prepainted/science, +/area/maintenance/asmaint2) "jUu" = ( /obj/structure/table/standard, /obj/item/paper_bin, @@ -14192,7 +13820,7 @@ /area/maintenance/lower/bar) "jUU" = ( /obj/structure/closet/hydrant, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/fish_farm) "jUY" = ( /obj/structure/table/bench/wooden, @@ -14322,7 +13950,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "jXk" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/patient_c) "jYd" = ( /obj/structure/cable/green{ @@ -14456,8 +14084,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/super/critical{ - dir = 1; +/obj/machinery/power/apc/super/critical/north_mount{ name = "north bump"; pixel_y = 24 }, @@ -14611,9 +14238,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, +/obj/structure/cable/pink{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "kkT" = ( @@ -14629,9 +14259,7 @@ /obj/structure/window/basic{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "klB" = ( @@ -14684,18 +14312,8 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "knU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/armory) -"koC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "kph" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -14703,11 +14321,8 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "kpA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, -/obj/structure/cable/green{ +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/pink{ icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -14741,7 +14356,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "krG" = ( -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/tether/surfacebase/public_garden_two) @@ -14797,25 +14412,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) -"ktp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "kts" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14931,15 +14527,8 @@ /turf/simulated/floor/tiled, /area/janitor) "kxn" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "kxY" = ( @@ -14975,6 +14564,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"kyJ" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "kyL" = ( /obj/random/junk, /turf/simulated/floor, @@ -14993,7 +14588,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "kAG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/tcommsat/entrance) "kAV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -15046,10 +14641,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "kEk" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/breakroom) "kEq" = ( @@ -15212,8 +14804,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/disposalpipe/segment{ @@ -15255,8 +14846,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "kLE" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/cmo) +/turf/simulated/wall/prepainted/security, +/area/maintenance/lower/public_garden_maintenance/upper) "kMx" = ( /obj/structure/catwalk, /obj/effect/floor_decal/techfloor/orange{ @@ -15306,10 +14897,7 @@ /area/tether/surfacebase/surface_two_hall) "kNW" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -15366,22 +14954,11 @@ name = "Pen 8 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "kQk" = ( @@ -15431,12 +15008,17 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"kTy" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 +"kTv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"kTy" = ( +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -15479,20 +15061,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) -"kUM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "kVf" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, @@ -15506,11 +15074,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) "kVQ" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "kVS" = ( @@ -15624,9 +15188,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "lab" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/middlehall) "laj" = ( @@ -15765,26 +15328,25 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"lej" = ( +"ldD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/tether/surfacebase/security/interrogation) -"lez" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/machinery/camera/network/tether{ - dir = 5 - }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"lej" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/security/interrogation) "lfa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15893,10 +15455,7 @@ /obj/item/stock_parts/subspace/analyzer, /obj/item/stock_parts/subspace/analyzer, /obj/item/stock_parts/subspace/analyzer, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer) "lkK" = ( @@ -15919,11 +15478,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) "lmg" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "wardenwindows" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "wardenwindows"; + name = "Wardens Office" }, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "lnG" = ( @@ -15940,15 +15499,21 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) -"loz" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +"lot" = ( +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) +/obj/structure/window/basic{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"loz" = ( +/turf/simulated/wall/r_wall/prepainted/medical, +/area/tether/surfacebase/medical/uppersouthstairwell) "lpV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16044,9 +15609,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "ltL" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "luJ" = ( /obj/structure/closet/hydrant{ @@ -16227,10 +15790,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) "lyT" = ( @@ -16246,11 +15806,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "lzn" = ( @@ -16326,8 +15882,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "lBK" = ( -/turf/simulated/wall/r_wall, -/area/rnd/lockers) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/security/evastorage) "lCt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -16364,7 +15920,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "lFn" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/patient_b) "lFq" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -16383,15 +15939,14 @@ /area/tether/surfacebase/medical/resleeving) "lFO" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "lFQ" = ( @@ -16410,14 +15965,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"lGn" = ( -/obj/machinery/button/windowtint{ - dir = 1; - id = "meetingroom"; - pixel_x = -25 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "lGJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1; @@ -16427,10 +15974,10 @@ initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; + on = 1; pressure_checks = 2; pressure_checks_default = 2; - pump_direction = 0; - on = 1 + pump_direction = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=100;TEMP=80"; @@ -16478,7 +16025,7 @@ dir = 4; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_two) "lJr" = ( /obj/structure/railing{ @@ -16571,7 +16118,7 @@ /area/engineering/atmos/monitoring) "lLN" = ( /obj/structure/sign/securearea, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/tcommsat/entrance) "lMm" = ( /obj/structure/table/woodentable, @@ -16918,11 +16465,7 @@ /area/tether/surfacebase/medical/uppersouthstairwell) "lZP" = ( /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -16979,18 +16522,14 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "mbV" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) "mcX" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/east_stairs_two) "mdr" = ( /obj/structure/table/steel, @@ -17022,6 +16561,9 @@ /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos) +"mek" = ( +/turf/simulated/open, +/area/tether/elevator/two) "meI" = ( /obj/machinery/air_alarm{ dir = 4; @@ -17094,8 +16636,7 @@ /area/chapel/main) "mgB" = ( /obj/machinery/photocopier, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -17166,7 +16707,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "janitor_blast"; - layer = 3.3; name = "Janitorial Shutters" }, /obj/machinery/door/firedoor/border_only, @@ -17185,18 +16725,8 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "mhZ" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/outside/outside2) "miX" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/camera/network/medbay{ @@ -17223,6 +16753,9 @@ /obj/effect/floor_decal/corner/red/border/shifted{ dir = 6 }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "mkT" = ( @@ -17246,7 +16779,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "mlv" = ( @@ -17262,10 +16795,7 @@ /area/tether/surfacebase/medical/centralhall) "mmt" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17292,12 +16822,11 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "mqc" = ( @@ -17310,6 +16839,11 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, +/obj/machinery/button/windowtint{ + dir = 1; + id = "meetingroom"; + pixel_x = -25 + }, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "mqq" = ( @@ -17499,17 +17033,8 @@ name = "Pen 5 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "mwG" = ( @@ -17583,7 +17108,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "mzj" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/outfitting) "mzD" = ( /obj/structure/cable/green{ @@ -17629,11 +17154,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -17655,22 +17176,19 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "mCn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/obj/machinery/light/small, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 10 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "mCJ" = ( @@ -17682,10 +17200,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/atmos_personal, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -17720,6 +17235,24 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) +"mEa" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 5 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "mEu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -17754,8 +17287,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "mGd" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/reinforced, @@ -17824,7 +17356,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mJS" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/rdoffice) "mJW" = ( /obj/effect/floor_decal/borderfloor{ @@ -17843,19 +17375,6 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mKH" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -17866,6 +17385,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "mKS" = ( @@ -17908,7 +17429,7 @@ /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_two_hall) "mMr" = ( /obj/structure/disposalpipe/junction{ @@ -18012,15 +17533,6 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"mQF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "mQK" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -18040,11 +17552,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"mQU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_two_hall) "mRb" = ( /obj/structure/catwalk, /obj/effect/floor_decal/techfloor, @@ -18203,8 +17710,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -18322,10 +17828,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "nbL" = ( @@ -18381,7 +17884,7 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "ndx" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/reading_room) "ndZ" = ( /obj/structure/cable/cyan{ @@ -18427,14 +17930,13 @@ /obj/machinery/computer/drone_control{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) "neA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/substation/research) "neB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18445,11 +17947,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"neH" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/maintenance/lower/south) "neM" = ( /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled, @@ -18510,11 +18007,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "ngy" = ( @@ -18720,22 +18213,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "nns" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_c" - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_c"; + name = "Patient C" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_c) "nnL" = ( @@ -18782,10 +18264,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) @@ -18890,6 +18369,25 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) +"nrN" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "nrR" = ( /obj/structure/railing{ dir = 1 @@ -18992,7 +18490,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/south) "nuH" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/detective/officeb) "nuR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -19149,10 +18647,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) @@ -19190,10 +18684,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -19256,9 +18747,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "nGx" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/breakroom) "nHa" = ( @@ -19491,11 +18981,7 @@ /area/tether/surfacebase/medical/uppersouthstairwell) "nOL" = ( /obj/machinery/processor, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "nOX" = ( @@ -19520,11 +19006,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "nPL" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -19567,19 +19049,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "nRK" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -19590,6 +19059,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "nSI" = ( @@ -19638,12 +19109,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "nUB" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/pink, /turf/simulated/floor/wood, /area/bridge/meeting_room) "nVv" = ( @@ -19754,7 +19221,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "nYk" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research) "nYw" = ( /turf/simulated/floor/tiled/dark, @@ -19857,7 +19324,7 @@ /turf/simulated/floor/tiled, /area/janitor) "ocy" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/detective/officea) "ocX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -20005,33 +19472,11 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/manifold/hidden/black, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) -"ogt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "ogv" = ( /obj/machinery/light{ dir = 8 @@ -20084,11 +19529,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "oig" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20164,7 +19605,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "okP" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/outfitting) "okZ" = ( /turf/simulated/floor/tiled, @@ -20176,10 +19617,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/machinery/camera/network/command, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "omd" = ( @@ -20247,12 +19688,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"opc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/engineering/lower/breakroom) "ope" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20276,6 +19711,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) +"opu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "opH" = ( /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/segment{ @@ -20322,9 +19767,9 @@ external_pressure_bound = 140; external_pressure_bound_default = 140; icon_state = "map_vent_out"; + on = 1; pressure_checks = 0; - pressure_checks_default = 0; - on = 1 + pressure_checks_default = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=100;TEMP=80"; @@ -20400,21 +19845,12 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "ovx" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/yellow/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "owe" = ( @@ -20547,11 +19983,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "oAx" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20569,10 +20001,7 @@ /obj/machinery/light_switch{ pixel_y = 25 }, -/obj/machinery/firealarm{ - pixel_x = 5; - pixel_y = 37 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/button/remote/blast_door{ id = "armoryaccess"; name = "Armory Access"; @@ -20649,7 +20078,7 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "oEY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/examroom) "oFb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -20669,7 +20098,7 @@ /obj/structure/sign/directions/evac{ dir = 1 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_two) "oFR" = ( /obj/effect/floor_decal/borderfloor{ @@ -20853,7 +20282,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "oPf" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/public_garden_maintenance/upper) "oPN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20974,9 +20403,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "oTC" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(67) }, /obj/structure/cable/green, @@ -20987,18 +20414,11 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) -"oUl" = ( -/obj/structure/symbol/da{ - pixel_x = 32 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "oUu" = ( /obj/item/material/twohanded/baseballbat{ desc = "This bat looks very off."; - integrity_max = 500; - integrity = 500 + integrity = 500; + integrity_max = 500 }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -21054,6 +20474,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) +"oVn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "oVD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -21078,19 +20507,8 @@ /turf/simulated/open, /area/engineering/atmos) "oXE" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "oXK" = ( @@ -21166,14 +20584,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) -"pas" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "paL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 5 @@ -21366,7 +20776,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "pjh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/drone_fabrication) "pjC" = ( /obj/structure/reagent_dispensers/watertank/high, @@ -21407,6 +20817,10 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "pkL" = ( @@ -21414,7 +20828,7 @@ /area/tether/surfacebase/fish_farm) "plI" = ( /obj/structure/symbol/sa, -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/bar) @@ -21523,16 +20937,8 @@ name = "Pen 6 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "ppL" = ( @@ -21546,12 +20952,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "pqr" = ( @@ -21580,15 +20986,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "pqX" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "exam_room" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "exam_room" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "exam_room"; + name = "Exam Room Medical" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/examroom) "prH" = ( @@ -21602,7 +21004,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "psw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/readingrooms) "ptd" = ( /obj/structure/bed/chair/office/light{ @@ -21696,7 +21098,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "pwF" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/server) "pwO" = ( /obj/structure/disposalpipe/segment{ @@ -21716,7 +21118,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "pxA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/recoveryward) "pyd" = ( /obj/machinery/light/small{ @@ -21786,10 +21188,7 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "pAd" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/power/thermoregulator, @@ -21822,19 +21221,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "pBx" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -21842,6 +21228,8 @@ name = "Pen 2 Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "pBO" = ( @@ -21874,21 +21262,20 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "pBY" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/structure/cable, /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Command"; output_attempt = 0 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/plating, /area/maintenance/substation/command) "pCi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomsat) "pCm" = ( @@ -21920,30 +21307,16 @@ name = "Pen 6 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "pEd" = ( /obj/structure/table/rack, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "pEs" = ( @@ -22101,6 +21474,7 @@ /area/engineering/lower/lobby) "pLd" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "pLq" = ( @@ -22178,10 +21552,7 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/janitor) "pOC" = ( @@ -22210,7 +21581,7 @@ /turf/simulated/floor/wood, /area/engineering/lower/breakroom) "pPv" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/brig/bathroom) "pPL" = ( /obj/machinery/camera/network/medbay{ @@ -22229,10 +21600,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "pQm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) "pQr" = ( @@ -22343,8 +21712,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -22387,10 +21755,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/storage) "pWN" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/disposalpipe/segment{ dir = 4 @@ -22464,7 +21829,7 @@ /area/tcommsat/chamber) "pYv" = ( /obj/structure/sign/warning/lethal_turrets, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/tcommsat/chamber) "pYL" = ( /obj/effect/floor_decal/borderfloor{ @@ -22473,11 +21838,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -22511,6 +21872,12 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) +"qaz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "qaI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22518,6 +21885,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "qaV" = ( @@ -22543,15 +21911,12 @@ /obj/machinery/camera/network/tether{ dir = 9 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "qbU" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/outfitting) "qbX" = ( @@ -22583,9 +21948,6 @@ name = "CMO Office"; sortType = "CMO Office" }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "qcd" = ( @@ -22646,11 +22008,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "qeX" = ( @@ -22709,10 +22067,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -22730,16 +22085,8 @@ name = "Pen 8 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "qiO" = ( @@ -22817,8 +22164,7 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -22848,8 +22194,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "qpo" = ( -/turf/simulated/wall, -/area/maintenance/engineering/pumpstation) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/outside/outside2) "qpB" = ( /obj/structure/bed/padded, /obj/item/bedsheet/medical, @@ -22913,20 +22259,16 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, @@ -23157,6 +22499,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"qwy" = ( +/obj/item/storage/fancy/cigar/havana, +/obj/random/drinkbottle, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "qwX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23355,22 +22702,15 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "qHB" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/pink, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "qIe" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/southhall) "qIF" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -23511,19 +22851,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "qNK" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/structure/cable/green, @@ -23531,6 +22858,8 @@ icon_state = "16-0" }, /obj/structure/disposalpipe/up, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "qNV" = ( @@ -23575,7 +22904,7 @@ /area/tether/surfacebase/security/outfitting) "qOL" = ( /obj/structure/sign/warning/caution, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_two_hall) "qPC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23590,17 +22919,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) -"qPM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "qPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23686,7 +23004,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "qUc" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/resleeving) "qUy" = ( /obj/structure/catwalk, @@ -23761,7 +23079,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppernorthstairwell) "qYP" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/tcomsat) "qYR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -23847,9 +23165,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "rcx" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "rdr" = ( @@ -23899,8 +23216,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "reD" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/substation/medsec) +/obj/machinery/door/airlock, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) "reP" = ( /obj/item/clothing/shoes/boots/jackboots{ desc = "Very old and worn baseball cleats."; @@ -23923,11 +23241,8 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/cyan{ icon_state = "0-4" @@ -24064,9 +23379,8 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "rja" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/breakroom) "rke" = ( @@ -24075,7 +23389,6 @@ dir = 8 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/structure/bed/chair{ @@ -24101,9 +23414,7 @@ /obj/structure/window/basic{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "rkP" = ( @@ -24151,14 +23462,6 @@ "rlx" = ( /turf/simulated/mineral, /area/maintenance/readingrooms) -"rmq" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/obj/random/maintenance/research, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "rmF" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/white, @@ -24310,7 +23613,6 @@ }, /area/tcommsat/chamber) "rqQ" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ name = "Medbay Breakroom"; req_access = list(5); @@ -24322,6 +23624,7 @@ name = "Exit Button"; pixel_x = -24 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "rrk" = ( @@ -24447,7 +23750,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "rwY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/lower/lobby) "rxe" = ( /obj/structure/grille, @@ -24478,13 +23781,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - id = "atmoslockdown"; - name = "Atmospherics Lockdown"; - req_one_access = list(10,24) - }, /turf/simulated/floor/carpet, /area/engineering/lower/breakroom) +"rxJ" = ( +/obj/machinery/door/airlock/glass/atmos, +/turf/simulated/floor/tiled, +/area/engineering/lower/lobby) "rxK" = ( /obj/structure/table/woodentable, /obj/item/paper_bin, @@ -24572,6 +23874,12 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) +"rDm" = ( +/obj/structure/sign/warning/caution{ + name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" + }, +/turf/simulated/wall/prepainted/engineering/atmos, +/area/tether/surfacebase/emergency_storage/atmos) "rDp" = ( /obj/landmark/spawnpoint/job/command_secretary, /obj/structure/bed/chair/comfy/black{ @@ -24674,7 +23982,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) "rFL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/tcomfoyer) "rGc" = ( /turf/simulated/mineral/floor/cave, @@ -24746,15 +24054,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "rIT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "rJu" = ( @@ -24768,11 +24076,7 @@ /turf/simulated/floor, /area/maintenance/substation/medsec) "rJy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -24802,6 +24106,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "rLi" = ( @@ -24960,7 +24267,7 @@ }, /area/server) "rUU" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, /turf/simulated/floor/plating, @@ -24986,10 +24293,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/centralhall) "rWs" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/tcomsat) @@ -25015,18 +24319,14 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/high{ - dir = 8; +/obj/machinery/power/apc/high/west_mount{ pixel_x = -28 }, /turf/simulated/floor/tiled/techfloor, /area/server) "rWT" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/structure/cable/green{ +/obj/machinery/fire_alarm/north_mount, +/obj/structure/cable/pink{ icon_state = "2-8" }, /turf/simulated/floor/plating, @@ -25055,7 +24355,7 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "rYi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/centralhall) "rZb" = ( /turf/simulated/floor/tiled/white, @@ -25243,15 +24543,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "sfF" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -25259,7 +24550,8 @@ name = "Pen 9 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "sfQ" = ( @@ -25304,10 +24596,10 @@ /area/tether/surfacebase/surface_two_hall) "shF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "shL" = ( @@ -25368,7 +24660,9 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/main) "sjZ" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "sku" = ( @@ -25469,24 +24763,16 @@ name = "Pen 7 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) +"smB" = ( +/turf/simulated/open, +/area/tether/elevator) "snb" = ( /obj/machinery/light/small{ dir = 8 @@ -25515,7 +24801,7 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "snw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/south) "snF" = ( /obj/structure/table/steel, @@ -25532,10 +24818,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 }, @@ -25566,7 +24849,7 @@ /area/maintenance/lower/bar) "soV" = ( /obj/structure/sign/securearea, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/tcomsat) "spN" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -25585,8 +24868,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet, @@ -25695,7 +24977,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "srW" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/monitoring) "sso" = ( /obj/structure/window/reinforced{ @@ -25738,11 +25020,11 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "std" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/tcomms) "stt" = ( -/turf/simulated/wall/r_wall, -/area/engineering/lower/atmos_eva) +/turf/simulated/wall/prepainted/medical, +/area/maintenance/lower/north) "sul" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -25750,6 +25032,7 @@ /obj/structure/closet/hydrant{ pixel_x = -32 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "sum" = ( @@ -25820,11 +25103,7 @@ /area/engineering/atmos) "svv" = ( /obj/structure/catwalk, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -25959,11 +25238,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "sAb" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -26019,12 +25294,12 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "sBb" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/light/small{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "sBo" = ( @@ -26067,13 +25342,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"sCV" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "sDd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26099,9 +25367,6 @@ "sDf" = ( /obj/machinery/disposal, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -26233,17 +25498,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/pink{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"sIk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sIp" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -26271,7 +25530,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "sJN" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/bridge/bridge_hallway) "sJU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -26447,19 +25706,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"sQW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sRh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -26481,14 +25727,16 @@ /area/tether/surfacebase/reading_room) "sRz" = ( /obj/structure/symbol/gu, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "sRE" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/maintenance/lower/south) +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "cmo_office"; + name = "CMO office" + }, +/obj/effect/paint_stripe/babyblue, +/turf/simulated/floor/plating, +/area/tether/surfacebase/medical/cmo) "sRN" = ( /obj/structure/table/steel, /obj/effect/floor_decal/rust, @@ -26551,8 +25799,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 24 }, /obj/machinery/button/remote/airlock{ @@ -26575,10 +25822,7 @@ /area/tether/surfacebase/public_garden_two) "sVB" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/maintenance/lower/south) "sVL" = ( @@ -26588,18 +25832,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_two) -"sVU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sWl" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -26774,7 +26006,7 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tfp" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/janitor) "tfu" = ( /obj/effect/floor_decal/rust, @@ -26788,19 +26020,8 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/wood, /area/rnd/breakroom) -"tgb" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "tgr" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26913,7 +26134,7 @@ "tjk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, /turf/simulated/floor/tiled/dark, @@ -26952,7 +26173,7 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "tkd" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/warden) "tkq" = ( /obj/effect/floor_decal/borderfloor{ @@ -26974,11 +26195,11 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/breakroom) "tlq" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "ward_tint" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "ward_tint"; + name = "medical Ward" }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/recoveryward) "tlP" = ( @@ -27116,6 +26337,7 @@ /obj/machinery/newscaster{ pixel_y = -30 }, +/obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "tse" = ( @@ -27210,18 +26432,29 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"twl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "twA" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/command{ name = "Command Meeting Room" }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "tyK" = ( @@ -27231,15 +26464,6 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) "tzy" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "cmo_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "cmo_office" - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -27251,6 +26475,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "cmo_office"; + name = "CMO office" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/cmo) "tzY" = ( @@ -27289,22 +26518,11 @@ name = "Pen 4 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tBD" = ( @@ -27332,8 +26550,7 @@ /area/maintenance/lower/south) "tCY" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/paper_bin, @@ -27400,7 +26617,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "tIz" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/lower/rnd) "tIN" = ( /obj/structure/closet/emcloset, @@ -27425,9 +26642,6 @@ /turf/simulated/mineral, /area/tether/surfacebase/east_stairs_two) "tLN" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -27436,6 +26650,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/lobby) "tLQ" = ( @@ -27480,7 +26696,7 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "tMY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/morgue) "tNd" = ( /obj/structure/closet/secure_closet/scientist, @@ -27510,8 +26726,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -27554,10 +26769,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -27589,22 +26801,11 @@ name = "Pen 3 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tTr" = ( @@ -27680,8 +26881,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/borderfloor, @@ -27713,10 +26913,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -27762,7 +26959,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "ubC" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, /turf/simulated/floor/plating, @@ -27785,11 +26982,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "udd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "udj" = ( @@ -27798,7 +26992,6 @@ department = "CMO's Office" }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/status_display{ @@ -27861,6 +27054,15 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"ufj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "ufA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -28024,7 +27226,7 @@ /area/tcomfoyer) "umc" = ( /obj/structure/sign/poster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "umZ" = ( /obj/structure/table/steel, @@ -28080,12 +27282,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "upb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/bar) "upu" = ( @@ -28099,8 +27296,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/structure/cable/pink{ + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -28142,11 +27339,7 @@ /area/maintenance/lower/south) "utS" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -28319,8 +27512,7 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -28355,12 +27547,7 @@ /turf/simulated/shuttle/floor/voidcraft, /area/tether/surfacebase/old_shelter) "uBL" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "uBU" = ( @@ -28377,16 +27564,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "uCx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/outfitting/storage) "uCy" = ( /obj/structure/cable/green{ @@ -28443,8 +27630,7 @@ /area/maintenance/asmaint2) "uDh" = ( /obj/structure/table/rack/shelf/steel, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24; pixel_y = -8 }, @@ -28552,7 +27738,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "uEI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/uppersouthstairwell) "uER" = ( /obj/structure/table/steel, @@ -28696,7 +27882,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "uHS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/breakroom) "uHT" = ( /obj/structure/grille, @@ -28720,15 +27906,8 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"uIP" = ( -/obj/machinery/door/airlock/glass{ - name = "Atmospherics" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/lower/lobby) "uJg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/tether/surfacebase/east_stairs_two) "uJH" = ( /obj/structure/bed/chair/comfy/black{ @@ -28766,11 +27945,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -28860,6 +28036,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) +"uQj" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "uQs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -28901,10 +28084,7 @@ /obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "uQP" = ( @@ -29011,16 +28191,16 @@ /area/tether/surfacebase/medical/patient_b) "uUl" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - icon_state = "16-0" - }, /obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ + icon_state = "16-0" + }, +/obj/structure/cable/pink{ icon_state = "0-4" }, /turf/simulated/floor/plating, @@ -29036,11 +28216,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "uWx" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -29059,8 +28235,8 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "uZc" = ( -/turf/simulated/wall, -/area/vacant/vacant_bar_upper) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/north_stairs_two) "uZm" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -29121,7 +28297,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "vaI" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/staircase/secondfloor) "vaU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29232,17 +28408,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) -"vek" = ( -/obj/machinery/disposal, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) "veJ" = ( /obj/structure/table/standard, /obj/item/tape_recorder{ @@ -29328,8 +28493,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/dark, @@ -29376,6 +28540,13 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/outdoors/beach/sand/desert/indoors, /area/tether/surfacebase/fish_farm) +"viH" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "vjG" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorwhite{ @@ -29421,6 +28592,12 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) +"vkz" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "vkN" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/suit/armor/vest/alt{ @@ -29441,13 +28618,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) -"vlA" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/tether/surfacebase/surface_two_hall) "vml" = ( /obj/machinery/vending/medical{ dir = 8 @@ -29545,9 +28715,6 @@ /area/tether/surfacebase/surface_two_hall) "vpr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -29666,13 +28833,8 @@ }, /area/tether/surfacebase/surface_two_hall) "vsy" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "exam_room" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/examroom) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/outside/outside2) "vsI" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -29811,7 +28973,7 @@ /turf/simulated/floor/plating, /area/maintenance/readingrooms) "vyI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/patient_a) "vyO" = ( /obj/landmark{ @@ -29864,11 +29026,7 @@ pixel_y = -2 }, /obj/item/storage/box/evidence, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -29934,6 +29092,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"vCH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "vCS" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -29960,7 +29131,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vDa" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/lower/atmos_lockers) "vDf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -30004,10 +29175,7 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/fish_farm) "vFc" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -30023,8 +29191,8 @@ /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "vGf" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/substation/tcomms) +/turf/simulated/wall/r_wall/prepainted/science, +/area/tether/surfacebase/outside/outside2) "vGF" = ( /obj/machinery/telecomms/server/presets/service/tether, /turf/simulated/floor/tiled/dark{ @@ -30044,7 +29212,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "vHS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/lower/breakroom) "vHY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -30160,7 +29328,7 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "vMH" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/atmos) "vML" = ( /obj/effect/floor_decal/borderfloorblack/full, @@ -30176,7 +29344,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-8" }, /turf/simulated/floor/wood, @@ -30243,7 +29411,7 @@ name = "light switch "; pixel_y = 26 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/wood, @@ -30263,7 +29431,7 @@ /turf/simulated/floor, /area/maintenance/substation/research) "vQI" = ( -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/south) @@ -30309,17 +29477,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-8" }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) "vUO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "vVG" = ( /obj/effect/floor_decal/techfloor{ @@ -30490,14 +29655,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "waY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/tether/surfacebase/emergency_storage/atmos) "wbn" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_a" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_a"; + name = "Patient A" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_a) "wbx" = ( @@ -30594,6 +29759,10 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"wdy" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "wdF" = ( /obj/structure/cable{ icon_state = "2-4" @@ -30686,11 +29855,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "wgc" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "wgA" = ( @@ -30739,6 +29904,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"wje" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/yellow/bordercorner2, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "wjg" = ( /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -30989,10 +30165,10 @@ /area/maintenance/lower/south) "wtT" = ( /obj/structure/table/woodentable, -/obj/item/storage/box/cups, /obj/machinery/camera/network/command{ dir = 9 }, +/obj/item/storage/box/glasses, /turf/simulated/floor/wood, /area/bridge/meeting_room) "wuk" = ( @@ -31003,6 +30179,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) +"wut" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/atmos, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "wuu" = ( /obj/structure/ladder{ pixel_y = 16 @@ -31010,16 +30196,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"wuI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass{ - name = "Atmospherics" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/lower/lobby) "wvd" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -31126,28 +30302,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "wym" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/centralhall) +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge/bridge_hallway) "wyW" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -31258,16 +30414,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/pink{ + icon_state = "0-4" }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/structure/cable/pink{ + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -31298,7 +30450,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/substation/research) "wEh" = ( /obj/effect/floor_decal/techfloor{ @@ -31365,8 +30517,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "wFw" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31374,13 +30526,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "wFz" = ( @@ -31430,7 +30575,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "wHi" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/rnd/breakroom) "wHw" = ( /obj/machinery/turretid/stun{ @@ -31443,10 +30588,7 @@ req_access = list(61); req_one_access = list(12) }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "wHK" = ( @@ -31550,16 +30692,8 @@ name = "Pen 4 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "wLH" = ( @@ -31592,15 +30726,15 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "wMU" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "wOd" = ( @@ -31647,12 +30781,6 @@ /obj/structure/window/reinforced/polarized/full{ id = "interrogation" }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/interrogation) "wRy" = ( @@ -31681,8 +30809,10 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "wSs" = ( -/obj/effect/floor_decal/borderfloor, -/obj/structure/closet/firecloset, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "wSE" = ( @@ -31790,6 +30920,9 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) +"wVr" = ( +/turf/simulated/wall/prepainted/engineering/atmos, +/area/tether/surfacebase/surface_two_hall) "wWc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -31843,6 +30976,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"wXK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "wXZ" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -31926,7 +31065,7 @@ /turf/simulated/floor/grass, /area/maintenance/lower/south) "xbU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_two_hall) "xcj" = ( /obj/machinery/camera/network/engineering{ @@ -31965,19 +31104,6 @@ }, /turf/simulated/floor/lino, /area/tether/surfacebase/security/detective/officea) -"xdM" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "xdX" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -32001,7 +31127,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "xez" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/commandmaint) "xeM" = ( /obj/effect/floor_decal/techfloor{ @@ -32088,6 +31214,15 @@ }, /turf/simulated/open, /area/tether/surfacebase/security/middlehall) +"xiw" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "xjC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/trash, @@ -32171,16 +31306,8 @@ name = "Pen 7 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "xlT" = ( @@ -32228,10 +31355,7 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/table/rack/shelf/steel, /obj/item/hardsuit/hazard/equipped, @@ -32280,11 +31404,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "xoE" = ( @@ -32330,24 +31450,26 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_two) "xpQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/polarized/full{ - id = "wardenwindows" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "wardenwindows"; + name = "Wardens Office" }, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "xqf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -32441,18 +31563,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "xtk" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/rdoffice) "xtn" = ( @@ -32508,13 +31620,12 @@ req_access = list(); req_one_access = list(17) }, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/teleporter) "xuV" = ( @@ -32570,14 +31681,8 @@ /turf/simulated/floor, /area/maintenance/lower/north) "xxZ" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/medical/resleeving) "xyn" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -32618,11 +31723,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) "xyY" = ( @@ -32706,11 +31807,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "xDv" = ( @@ -32752,7 +31849,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "xGk" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos) "xGX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -32783,11 +31880,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/surface_two_hall) "xIu" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "surfresleeving" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "surfresleeving"; + name = "Resleeving" }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/resleeving) "xIB" = ( @@ -32808,8 +31905,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -33031,11 +32127,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -33133,10 +32225,7 @@ "xTG" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -33163,7 +32252,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "xUE" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/north) "xUL" = ( /obj/structure/table/rack/shelf/steel, @@ -33263,11 +32352,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -33278,12 +32363,6 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) "xYa" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -33294,6 +32373,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/detective) "xYr" = ( @@ -33327,7 +32408,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "xZX" = ( -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/maintenance/lower/south) "yam" = ( @@ -33339,9 +32420,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "yas" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "yat" = ( @@ -33398,9 +32477,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "ydd" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/atmos_lockers) "ydu" = ( @@ -33517,11 +32595,11 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "yge" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_b" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_b"; + name = "Patient B" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_b) "ygw" = ( @@ -33541,7 +32619,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "yhd" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/maintenance/substation/medsec) "yhw" = ( /obj/effect/floor_decal/borderfloor{ @@ -33560,24 +32638,20 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "yif" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/evidence) "yiw" = ( /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/wood, /area/engineering/lower/breakroom) "yiY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_two) "yjH" = ( /obj/structure/table/glass, @@ -33605,16 +32679,15 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "yjT" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/tcommsat/chamber) "ykk" = ( /obj/structure/morgue, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) "ykZ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/lobby) "yli" = ( @@ -47834,13 +46907,13 @@ wFz wFz wFz wFz -uNr +fKG avw avw gyr gyr avw -uNr +fKG wFz wFz wFz @@ -48028,13 +47101,13 @@ wFz wFz wFz wFz -uNr +fKG xWR hxY bwy bwy pdw -uNr +fKG wFz wFz wFz @@ -48222,13 +47295,13 @@ wFz wFz wFz wFz -uNr +fKG xWR xWR oXK oXK avw -uNr +fKG wFz wFz wFz @@ -48416,13 +47489,13 @@ wFz wFz wFz wFz -uNr +fKG xWR hxY xWR gca -uNr -uNr +qpo +fKG wFz wFz wFz @@ -48610,13 +47683,13 @@ wFz wFz wFz wFz -uNr -uNr -uNr -uNr -uNr -uNr -uNr +fKG +fKG +fKG +fKG +fKG +fKG +fKG wFz wFz wFz @@ -50801,7 +49874,7 @@ wFz wFz wFz wFz -uNr +fKG qvD nGh avw @@ -51019,7 +50092,7 @@ fHA ddf kxn iBM -vek +fHA bFc kxn oXE @@ -51194,9 +50267,9 @@ bwy bwy uiA avw -iQf -iQf -iQf +vGf +vGf +vGf avw xNR bwy @@ -51381,16 +50454,16 @@ jRP wFz wFz wFz -uNr +fKG cfE cfE cfE cfE qvD avw -iQf -iQf -iQf +vGf +vGf +vGf avw avw avw @@ -51582,9 +50655,9 @@ bwy bwy uiA avw -iQf -iQf -iQf +vGf +vGf +vGf avw mhI bwy @@ -51789,15 +50862,15 @@ vtw sdH sDf sEy -epZ +kxn ksU sDf bar -epZ +kxn nMO sDf vOw -epZ +kxn oXE euM rkD @@ -51963,7 +51036,7 @@ jRP wFz wFz wFz -uNr +fKG cfE cfE qvD @@ -52493,9 +51566,9 @@ rxh tMA fat afn -oPf -oPf -oPf +kLE +kLE +kLE kcZ oPf xcr @@ -52518,7 +51591,7 @@ xcr eUG caQ caQ -jsJ +eCd eUG eUG pwF @@ -52711,10 +51784,10 @@ cZd xcr eUG itj -edb -edb -edb -edb +mJS +mJS +mJS +mJS pwF dQO jxG @@ -52905,7 +51978,7 @@ pkL xcr eUG caQ -edb +mJS pNd tNW dkP @@ -53099,7 +52172,7 @@ viD kiI xSX caQ -edb +mJS fwL hHy tHa @@ -53293,7 +52366,7 @@ pkL xcr eUG caQ -edb +mJS mJS xtk bSx @@ -53306,9 +52379,9 @@ mJS fAy pwF pwF -jRP -jRP -jRP +jUj +jUj +jUj iQR kSm jRP @@ -53890,7 +52963,7 @@ hOW uCC qMR qMR -vaI +ewZ kFU cMm iJR @@ -54084,7 +53157,7 @@ wDC uGw mhj mhj -vaI +ewZ kFU okL gII @@ -54278,7 +53351,7 @@ hOW mhj mhj mhj -vaI +ewZ dHL oHR gII @@ -54455,8 +53528,8 @@ xdu pkL pkL xcr -jsJ -jsJ +eCd +eCd aqZ mJS mJS @@ -54472,7 +53545,7 @@ wfK cha mhj mhj -vaI +ewZ kFU dcF gII @@ -54649,8 +53722,8 @@ xdu pkL rGe xcr -jsJ -jsJ +eCd +eCd vdC xDK xSX @@ -54843,8 +53916,8 @@ xdu pkL pkL xcr -jsJ -jsJ +eCd +eCd xSX xSX xSX @@ -55037,7 +54110,7 @@ pkL pkL xcr xcr -jsJ +eCd dHP xSX xSX @@ -55206,13 +54279,13 @@ ptn tkd tkd tkd -xpQ +tkd iTw xpQ tkd sGV adY -xUE +cWY sYE sYE sYE @@ -55231,7 +54304,7 @@ pkL pkL xcr eUG -jsJ +eCd qJh kYf xSX @@ -55425,8 +54498,8 @@ uWH pkL xcr eUG -jsJ -jsJ +eCd +eCd ixU rMo rMo @@ -55582,13 +54655,13 @@ yif yif yif yif +mzj +mzj +mzj +mzj okP okP -okP -okP -okP -okP -okP +mzj mzD buj keN @@ -55619,8 +54692,8 @@ lwb xcr xcr eUG -jsJ -jsJ +eCd +eCd fEl xSX tIz @@ -55628,7 +54701,7 @@ jdi adx jdi vCa -lBK +hFn tjy oRe bbC @@ -55782,7 +54855,7 @@ nss etd cYW pqS -okP +mzj lpW pLC tkd @@ -55811,10 +54884,10 @@ cex eRZ eRZ eRZ -jsJ -jsJ -jsJ -jsJ +eCd +eCd +eCd +eCd fEl xSX tIz @@ -55822,9 +54895,9 @@ gcP qqB pHp vAK -lBK -lBK -lBK +hFn +hFn +hFn hFn hFn pHR @@ -56032,13 +55105,13 @@ uHS lvu hgc wLg -fKG -fKG -fKG +pjh +pjh +pjh hKI -fKG -fKG -fKG +pjh +pjh +pjh rRK ntX onI @@ -56207,10 +55280,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY myN @@ -56222,18 +55295,18 @@ nLB nLB lYp nwa -wHi +uHS xGk ruD -fKG -fKG +pjh +pjh nez qIK hSB lhF pVt -fKG -fKG +pjh +pjh oRy onI vMH @@ -56260,7 +55333,7 @@ vMH vMH vMH udd -udd +yas vMH bwy bwy @@ -56401,10 +55474,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY myN @@ -56427,7 +55500,7 @@ fUZ rFK jcK fWd -fKG +pjh pVC onI vMH @@ -56561,7 +55634,7 @@ nBf nVM bjU lVP -dbW +lBK uep pBu bdR @@ -56595,10 +55668,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY aGQ @@ -56621,7 +55694,7 @@ xnE bWc oFb fWd -fKG +pjh laP onI vMH @@ -56746,13 +55819,13 @@ cfE bwy bwy bwy -okP +mzj iop xSQ aLv xKQ kae -okP +mzj wro ivV iwZ @@ -56789,16 +55862,16 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL -aGQ +waY lzn lFQ lay -stt +cpH mrT rfw lyh @@ -56815,7 +55888,7 @@ uHz jxa bRO mgD -fKG +pjh rPW onI onI @@ -56949,7 +56022,7 @@ uCx uCx iBd brX -dbW +lBK hPN pBu kNW @@ -56988,11 +56061,11 @@ qCo qCo nng ltL -aGQ +waY feQ dEX mwu -stt +cpH xjZ qXE vvb @@ -57009,7 +56082,7 @@ jap jap aEr wXZ -fKG +pjh uhr ntX onI @@ -57172,21 +56245,21 @@ ceV eUG eUG eUG -eUG -eUG -eUG -jsJ +xbU +xbU +xbU +xbU xbU jNa -omd -omd -tav +kYp +kYp +kYp wSs aGQ hfj tyK gHk -stt +cpH uQw dRf xxC @@ -57203,7 +56276,7 @@ rcx rcx rcx pjh -fKG +pjh xGk xGk vKx @@ -57366,22 +56439,22 @@ mhp eUG eUG eUG -eUG -eUG -eUG -eUG xbU -eyw -rEB +ufj +kYp +kYp +kYp +axF +nlg sjZ -hgt -mQF -aGQ -aGQ +nlg +xyY +rDm +chq aUV -aGQ -stt -stt +chq +cpH +cpH hqD hqD xfW @@ -57518,9 +56591,9 @@ bwy bwy bwy bwy -uNr -uNr -uNr +vsy +vsy +vsy knU uCx ucp @@ -57558,19 +56631,19 @@ hKp xSX kIy qvW -eUG -eUG -eUG -eUG -jsJ -jsJ +eCd +eCd xbU -mMl +osn +oVn +auT +auT +auT auT +jfJ nlg -vRc -dev -eCd +xyY +ykZ hTt eZL hLM @@ -57712,8 +56785,8 @@ bwy bwy bwy bwy -uNr -uNr +vsy +vsy knU knU uCx @@ -57751,21 +56824,21 @@ xSX wcp kYf kIy -rmq -jsJ -jsJ -jsJ -jsJ -jsJ dik -xSX -mQU +eCd +eCd +xbU osn +nmC +hgt +gnx +rEB nlg -chC -eCd -lRz -paL +dtU +nlg +xyY +ykZ +vfT asR etH kmq @@ -57905,9 +56978,9 @@ bwy bwy bwy bwy -uNr -uNr -uNr +mhZ +mhZ +mhZ knU vML hnv @@ -57945,21 +57018,21 @@ mqq fHS mWI dHb -mWI -mWI -oUl -mWI -mWI -mWI vAK -xSX +eCd +eCd xbU -iBN -nlg -hmf +osn +nmC +eBq +bXq +xiw +gnx +gnx +gnx +wXK ykZ -lRz -qdR +vfT asR vqA phS @@ -58099,9 +57172,9 @@ bwy bwy bwy bwy -uNr -uNr -uNr +mhZ +mhZ +mhZ knU gTI vpr @@ -58129,7 +57202,7 @@ xUE ivp yiY btS -yiY +uZc neM fFu sVL @@ -58139,21 +57212,21 @@ xSX vqk xSX kIy -xSX -jsJ -jsJ -xbU -xbU -xbU -xbU -xbU +eCd +eCd +eCd xbU -koC -dDb -hra -ykZ -lRz -vFZ +hmg +ldD +uQj +dwA +dwA +fsv +fsv +dwA +dwA +dev +vfT asR fNh kmq @@ -58291,13 +57364,13 @@ bwy bwy bwy bwy -cWY -cWY -cWY -cWY -cWY -cWY qUc +qUc +qUc +qUc +qUc +qUc +xxZ knU clQ iMu @@ -58323,7 +57396,7 @@ chi hTx yiY btS -yiY +uZc neM nFz wWD @@ -58333,21 +57406,21 @@ xSX vuJ xSX kIy -xSX -jsJ +epZ jdR -iaN -xbU -ryd +qwy xbU -ryd -rvO -hmV -hRJ -hmf -ykZ -eAI -fPs +osn +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +paL asR rel mhk @@ -58383,18 +57456,18 @@ onI wMT vMH uhr -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa vMH wFz wFz @@ -58485,7 +57558,7 @@ bwy bwy bwy bwy -cWY +qUc lZs mRr mRr @@ -58531,17 +57604,17 @@ xbU xbU xbU xbU -xbU -tgb -xbU -xbU -xbU -pas -qPM -aqv -eCd -mjL -fPs +osn +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +qdR asR rel dJg @@ -58577,18 +57650,18 @@ vMH vMH vMH uhr -uZc +cFa dFL dFL eCb dFL -uZc +cFa cfY eBn cfY lYP cfY -uZc +cFa wFz wFz wFz @@ -58679,7 +57752,7 @@ bwy bwy bwy bwy -cWY +qUc gZM bWs agn @@ -58725,17 +57798,17 @@ kYp rEx uAp sul -kYp -sIk -rEx -kYp -lez axF -hRJ -nlg -uIP -ctj -fPs +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +qdR cTh yeM ndZ @@ -58771,7 +57844,7 @@ ffO uhr jPo uhr -uZc +cFa eBn eBn eBn @@ -58782,7 +57855,7 @@ lYP eBn eBn eBn -uZc +cFa wFz bwy bwy @@ -58873,7 +57946,7 @@ bwy bwy bwy bwy -cWY +qUc mTT vVG xQR @@ -58918,18 +57991,18 @@ ceR fpm fpm fpm -fpm -fpm -fpm -fpm -fpm scQ fpm wmR -xdM -ykZ -ogt -fPs +xyY +dwA +mek +mek +mek +mek +dwA +lRz +vFZ xRC vfT fLk @@ -58965,18 +58038,18 @@ aIP uEH vMH vMH -uZc +cFa oig qcm qcm dCy -uZc +cFa cfY eBn cfY eBn unR -uZc +cFa wFz bwy bwy @@ -59067,11 +58140,11 @@ bwy bwy bwy bwy -cWY -cWY -cWY -cWY -cWY +qUc +qUc +qUc +qUc +qUc qeX qUc tMY @@ -59082,10 +58155,10 @@ xgg oIx uDw tMY -reD -reD -reD -reD +yhd +yhd +yhd +yhd xUE xUE gId @@ -59112,17 +58185,17 @@ ifz ifz ifz ifz -ifz -ifz -ifz -ifz -ifz klm yib -sQW -sVU -wuI -kUM +hRJ +vRc +dwA +dwA +dwA +dwA +dwA +dwA +mjL xqf pKJ eob @@ -59159,18 +58232,18 @@ hBE shQ vMH nLj -uZc +cFa yaX lYP eBn tty -uZc +cFa eBn eBn lYP lYP eBn -uZc +cFa wFz bwy bwy @@ -59262,20 +58335,20 @@ bwy bwy bwy bwy -cWY +qUc jbP kyn kJr caS iHP -bYv +tMY aJt aJt aJt aJt hhb mUW -bYv +tMY sDV mXM qjc @@ -59306,21 +58379,21 @@ eYy eYy eYy eYy -eYy -eYy -eWN -eYy -eYy -vlA -vaB -vzK +viH +fXt +hRJ +kyJ +kYp +kYp +kYp +kYp mCn -eCd -ktp +rxJ +vfT ovx wFw hal -bdU +vfT rwY eMx wGC @@ -59353,7 +58426,7 @@ asf uhr vMH nLj -uZc +cFa lYP eBn eBn @@ -59364,7 +58437,7 @@ wFS qcm wFS auh -uZc +cFa wFz bwy bwy @@ -59462,14 +58535,14 @@ boi ubW lti syC -bYv +tMY ykk ykk ykk ykk scm ocX -bYv +tMY bNa rJu hWj @@ -59500,22 +58573,22 @@ jSr jSr jSr jSr -jSr -jSr -tNg -jSr -jSr wnY -vaB -vzK -hmf +fXt +kTv +fpm +fpm +fpm +fpm +vCH +auz +iON +vkz +gis +twl +qaz +gku vHS -rja -rja -hxl -rja -rja -jUj vpR pQc agl @@ -59547,18 +58620,18 @@ uhr uhr vMH nLj -uZc +cFa xKK vIC nwy wqy -uZc +cFa eBn eBn aGJ eBn lYP -uZc +cFa wFz wFz wFz @@ -59663,7 +58736,7 @@ xuV mHR cXO nqy -bYv +tMY deL xOY okq @@ -59689,27 +58762,27 @@ jSr jSr jSr jSr -iPB -iPB -ejq -iPB -iPB -ejq -iPB -iPB +jSr +jSr +jSr jSr jSr wnY -vaB +gIz +iqy +iqy +lot +lot +yib vzK nzi +wut +fSE +mEa +nrN +dBJ +wje vHS -fkB -nYw -qrM -kUL -lAb -jUj qJc dWG hZP @@ -59741,18 +58814,18 @@ vMH vMH vMH vMH -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa wFz wFz wFz @@ -59850,14 +58923,14 @@ ubW qUG rKy kVS -bYv +tMY lVr lVr lVr bfv cAS hlj -bYv +tMY gwW xOY dZF @@ -59884,26 +58957,26 @@ jSr jSr jSr iPB -dnw -vmF -sCV -lGn -vmF -ibB +iPB +ejq iPB iPB -tNg -keO +ejq +iPB +iPB +iPB +fQu +gcD vaB vzK hmf vHS -yiw -eYk -dfG -hzI -ixR -jUj +rja +rja +hxl +rja +rja +vHS vpR pQc nyi @@ -60038,20 +59111,20 @@ bwy bwy bwy bwy -cWY +qUc hQV lFq kto xLE npv -bYv +tMY uWx oqc oqc eSs iCx bgP -bYv +tMY oMK qsC jsn @@ -60083,7 +59156,7 @@ www pkE mqd voF -vmF +ibB lMm ejq tNg @@ -60091,13 +59164,13 @@ wnY vaB vzK hmf -rja -ewg -hto -evx -tiX -opc -jUj +vHS +fkB +nYw +qrM +kUL +lAb +vHS vpR pQc gDl @@ -60232,20 +59305,20 @@ bwy bwy bwy bwy -cWY -cWY +qUc +qUc xIu iNC -cWY +qUc xIu -bYv -bYv -bYv -bYv +tMY +tMY +tMY +tMY fXL -bYv -bYv -bYv +tMY +tMY +tMY eks eks eks @@ -60265,7 +59338,7 @@ jtG uUl lxt msy -sJN +wym tvV etY imW @@ -60285,13 +59358,13 @@ wnY vaB vzK hmf -rja -qYR -hnf -rxB -uoh -pPd -jUj +vHS +yiw +eYk +dfG +hzI +ixR +vHS vcA ddx iiV @@ -60426,7 +59499,7 @@ bwy bwy bwy bwy -gIp +fHF nhE rPZ ujr @@ -60456,10 +59529,10 @@ pBp nlg dTM jtG -mhZ +wMU rXQ tIN -sJN +wym dwE ngD ppL @@ -60480,12 +59553,12 @@ vaB vzK hmf rja -gtw -hto -evx -tiX -gtw -jUj +qYR +hnf +rxB +uoh +pPd +vHS eMx eMx eMx @@ -60620,7 +59693,7 @@ bwy bwy bwy bwy -gIp +fHF nhZ krf hht @@ -60632,7 +59705,7 @@ etm iLJ azo fmp -xxZ +uBq uBq dtz lfa @@ -60645,13 +59718,13 @@ hJZ hJZ hTQ hJZ -hJZ +cGZ pBp nlg dTM jtG wDl -rUU +rXQ sJN sJN arm @@ -60673,18 +59746,18 @@ keO vaB vzK mqr -vHS -cLg -gtw -dwC +rja gtw +hto +evx +tiX gtw -jUj +vHS rWU qLA sPG rWU -qpo +eAU sDd sPJ xGk @@ -60814,14 +59887,14 @@ bwy bwy bwy bwy -gIp +fHF ihq bZe jnR vrc lVn krf -cGZ +vCf eBr krf xhM @@ -60858,7 +59931,7 @@ vMY bvC nUB itT -vmF +wdy eDR iPB iPB @@ -60868,12 +59941,12 @@ vaB vzK hmf vHS -uSl -vZz -xrj -kur -llZ -jUj +cLg +gtw +dwC +gtw +gtw +vHS lyX eRg quR @@ -61009,8 +60082,8 @@ bwy bwy bwy fHF -wym -wym +fHF +fHF rYi gBv qYu @@ -61062,12 +60135,12 @@ vaB vzK trY vHS +uSl +vZz +xrj +kur +llZ vHS -vHS -vHS -vHS -vHS -jUj xnd omD cuS @@ -61254,19 +60327,19 @@ jSr wnY vaB vzK -gwt -dPs -ryd -xbU -tLs -tLs -tLs +hmf +wVr +wVr +wVr +uJg +uJg +uJg eAU itk dSc itk itk -qpo +eAU oUO rwV xGk @@ -61395,15 +60468,15 @@ bwy bwy bwy bwy -kLE -kLE -kLE ehM ehM -kLE -kLE -kLE -kLE +ehM +sRE +ehM +ehM +ehM +ehM +ehM jgU xUY yfo @@ -61448,9 +60521,9 @@ jSr wnY vaB vzK -vCB -xbU -xbU +gwt +dPs +ryd xbU tLs tLs @@ -61589,7 +60662,7 @@ bwy bwy bwy bwy -kLE +ehM udj mgB boY @@ -61597,7 +60670,7 @@ fMT nHa cbB jsv -kLE +ehM mBX epk hdO @@ -61628,7 +60701,7 @@ gtI sJN sJN sJN -xez +jtG sBb nty xez @@ -61836,7 +60909,7 @@ tNg keO vaB vzK -xyY +vCB xbU uHT mcX @@ -62053,7 +61126,7 @@ rTQ mcX fkn tUS -vQI +snw tOr nLD tUJ @@ -62066,7 +61139,7 @@ feb snw std std -vGf +std qYP bNJ wKu @@ -62365,7 +61438,7 @@ bwy bwy bwy bwy -kLE +ehM kbV pSV iLT @@ -62373,7 +61446,7 @@ oAx gCe qLl rBx -kLE +ehM vjG vCf uGA @@ -62559,15 +61632,15 @@ bwy bwy bwy bwy -kLE -kLE -kLE -kLE -kLE -kLE -kLE -kLE -kLE +ehM +ehM +ehM +ehM +ehM +ehM +ehM +ehM +ehM xtn krf aeZ @@ -62824,8 +61897,8 @@ ewU qSs qSw tfp -mcX -mcX +bYv +bYv mcX fkn uth @@ -62998,7 +62071,7 @@ nlg nhR gHy cYz -gnx +opu gnx juK xbU @@ -63177,23 +62250,23 @@ xbU edR xbU xbU -xbU -xbU +bXq +bXq xbU czY xHD snw -sRE -sRE +xZX +xZX snw dja snw sXA snw snw -sRE +xZX snw -sRE +xZX snw snw snw @@ -63383,7 +62456,7 @@ snw dIa tOr tOr -sRE +xZX tOr qYg tBD @@ -63548,8 +62621,8 @@ uEI uEI wvk uEI -uEI -uEI +loz +loz uEI uEI liF @@ -63570,10 +62643,10 @@ dox dZO fah mSY -sRE +xZX rLi tOr -sRE +xZX cVP swP eRG @@ -63946,7 +63019,7 @@ fah fah fah fah -chq +fah fah fah fah @@ -63958,7 +63031,7 @@ fZR khH fah bqJ -sRE +xZX tOr cmK ioL @@ -64347,15 +63420,15 @@ fah fah lxu snw -sRE -sRE +xZX +xZX snw tOr pmb rrk snw -neH -sRE +xZX +xZX snw snw snw @@ -64896,12 +63969,12 @@ oEY oEY oEY oEY -vsy +pqX rDF oEY tlq gvE -ewZ +tlq pxA pxA pxA @@ -64985,7 +64058,7 @@ eQR eQR eQR eQR -ndx +gIp mDr cug lxj @@ -65296,8 +64369,8 @@ xay eUc pxA vpG -xUE -xUE +stt +stt arf rMt rMt @@ -65960,7 +65033,7 @@ wzp ndx ndx qIe -bXq +pQm qIe qIe jJe @@ -66235,7 +65308,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza bwy @@ -66279,14 +65352,14 @@ wFC ydu fah ooX -vEo +reD vEo nkd nxW nkd vEo nkd -rrk +aUm tOr rrk tOr @@ -66429,7 +65502,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza bwy @@ -66623,7 +65696,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza rEf @@ -66675,15 +65748,15 @@ pYe vEo vEo snw -aUm -aUm +gCr +gCr snw -aUm -aUm -aUm +gCr +gCr +gCr snw -aUm -aUm +gCr +gCr snw jJe jJe @@ -66753,7 +65826,7 @@ bwy qBZ xWR mAy -uNr +fKG vFJ vFJ vFJ @@ -66817,7 +65890,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza tzY @@ -66848,10 +65921,10 @@ jwq biO pxA fah -loz -loz -loz -loz +upb +upb +upb +upb fah fah avw @@ -66947,7 +66020,7 @@ bwy qBZ xza xWR -uNr +fKG vFJ vFJ vFJ @@ -67011,7 +66084,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza tzY @@ -67141,7 +66214,7 @@ bwy azT wCU xza -uNr +fKG vFJ vFJ vFJ @@ -67205,7 +66278,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza kdB @@ -67335,7 +66408,7 @@ bwy azT wCU wCU -uNr +fKG vFJ vFJ jOP @@ -67399,7 +66472,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza kdB @@ -67529,7 +66602,7 @@ bwy qBZ xza xWR -uNr +fKG vFJ cFv jOP @@ -67593,7 +66666,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza tzY @@ -67723,7 +66796,7 @@ bwy qBZ xza mAy -uNr +fKG vFJ jOP jOP @@ -67787,7 +66860,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza kdB @@ -67917,7 +66990,7 @@ bwy azT xza wCU -uNr +fKG jOP jOP jOP @@ -67981,7 +67054,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza kdB @@ -68111,7 +67184,7 @@ bwy azT wCU wCU -uNr +fKG cFv jOP vFJ @@ -68175,7 +67248,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza tzY @@ -68305,7 +67378,7 @@ bwy qBZ xza mAy -uNr +fKG jOP jOP cFv @@ -68369,7 +67442,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza kdB @@ -68499,10 +67572,10 @@ bwy qBZ wCU wCU -uNr +fKG xWR jOP -uNr +fKG vFJ vFJ vFJ @@ -68563,7 +67636,7 @@ tXE tXE wFz wFz -uNr +fKG xza mAy kdB @@ -68693,10 +67766,10 @@ bwy azT wCU xza -uNr +fKG xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -68757,7 +67830,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza kdB @@ -68887,10 +67960,10 @@ bwy azT wCU mAy -uNr +fKG xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -68951,7 +68024,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza tzY @@ -69081,10 +68154,10 @@ bwy azT xza wCU -uNr +fKG xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -69145,7 +68218,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza kdB @@ -69275,10 +68348,10 @@ bwy azT wCU wCU -uNr +fKG xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -69339,7 +68412,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza xBw @@ -69472,7 +68545,7 @@ xWR nIT xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -69533,7 +68606,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza bwy @@ -69663,10 +68736,10 @@ bwy bwy wCU mAy -uNr -uNr -uNr -uNr +fKG +fKG +fKG +fKG vFJ vFJ vFJ @@ -69727,7 +68800,7 @@ tXE tXE wFz wFz -uNr +fKG xza mAy bwy @@ -69857,7 +68930,7 @@ bwy bwy xza xWR -uNr +fKG vFJ vFJ vFJ @@ -70051,7 +69124,7 @@ oro fTn xza mAy -uNr +fKG vFJ vFJ vFJ diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm index 95179af08d..e886355e32 100644 --- a/maps/tether/levels/surface3.dmm +++ b/maps/tether/levels/surface3.dmm @@ -9,10 +9,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /obj/effect/floor_decal/borderfloor/corner2{ @@ -46,6 +43,20 @@ dir = 4 }, /area/tether/surfacebase/security/lobby) +"aaC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "aaP" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, @@ -129,7 +140,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "acY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_three) "ade" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -188,22 +199,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) "adK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/general) +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "adP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -223,20 +230,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "adV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "surfsurgery2" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "surfsurgery2"; + name = "surfsurgery2" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/surgery2) "ael" = ( @@ -255,14 +259,20 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "aeK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aeX" = ( @@ -282,6 +292,15 @@ }, /turf/simulated/open, /area/tether/surfacebase/public_garden_three) +"afv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "afz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -304,11 +323,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" @@ -320,11 +335,7 @@ /area/tether/surfacebase/medical/chemistry) "afT" = ( /obj/structure/flora/pottedplant/unusual, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/camera/network/research{ dir = 1 }, @@ -336,7 +347,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/bar) "agp" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -419,7 +430,7 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "aji" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics) "ajq" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -522,11 +533,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "amn" = ( @@ -797,7 +804,7 @@ dir = 8 }, /turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "asJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -847,7 +854,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "atk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -862,10 +869,7 @@ "atH" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -929,37 +933,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "avK" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ icon_state = "0-2" }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) -"avT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "awe" = ( /obj/machinery/door/airlock{ id_tag = "barbackdoor"; @@ -977,16 +956,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/bar_backroom) "awl" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "robo_resleeving" - }, -/obj/structure/window/reinforced/polarized{ - id = "robo_resleeving" +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/plating, -/area/rnd/robotics/resleeving) +/turf/simulated/floor/plating/eris/under, +/area/shuttle/tourbus/general) "awn" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -1024,7 +1003,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ id = "kitchen2"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -1032,6 +1010,19 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"ayH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "azs" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -1210,21 +1201,8 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aDh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/breakroom) +/turf/simulated/wall/prepainted/command, +/area/bridge) "aDw" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -1238,7 +1216,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "aDG" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -1361,9 +1339,7 @@ /area/library) "aGP" = ( /obj/structure/sign/deck/third, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "aGV" = ( /obj/structure/disposalpipe/segment{ @@ -1449,7 +1425,7 @@ /area/rnd/xenobiology/xenoflora_storage) "aIi" = ( /obj/structure/sign/nanotrasen, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aIw" = ( /obj/item/stool/padded, @@ -1534,8 +1510,11 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment/backstage) +/area/tether/surfacebase/entertainment/stage) "aKU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1546,7 +1525,7 @@ /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "aKY" = ( /obj/structure/toilet{ dir = 8 @@ -1584,21 +1563,24 @@ /obj/item/radio/phone, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"aLR" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aMa" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"aMc" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/shuttle_pad) "aMw" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/disposalpipe/segment, @@ -1672,18 +1654,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"aOg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/storage) "aOp" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -1718,13 +1688,7 @@ /turf/simulated/floor/plating, /area/rnd/research_storage) "aPp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/research_storage) "aQm" = ( @@ -1748,7 +1712,7 @@ dir = 5 }, /obj/machinery/door/firedoor{ - dir = 8 + dir = 1 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -1960,6 +1924,10 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"aVN" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/hallway/primary/port) "aVY" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -1982,10 +1950,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aYv" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, @@ -2035,7 +2000,7 @@ /obj/item/clothing/under/swimsuit/stripper/cowbikini, /obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "aZR" = ( /obj/structure/table/woodentable, /turf/simulated/floor/tiled, @@ -2132,15 +2097,6 @@ /obj/item/flashlight/lamp/green, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) -"bce" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/hallway/lower/third_south) "bcm" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -2190,7 +2146,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "bdb" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/freezer) "bdc" = ( /obj/effect/floor_decal/borderfloorblack/corner, @@ -2280,6 +2236,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "bfR" = ( @@ -2303,7 +2262,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "bgt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 @@ -2585,7 +2544,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "bor" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -2617,11 +2576,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "bpc" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -2722,7 +2678,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "brA" = ( /turf/simulated/open, /area/rnd/staircase/thirdfloor) @@ -2742,14 +2698,12 @@ }, /obj/machinery/button/windowtint{ id = "hop_office"; - layer = 3.3; pixel_x = 22; pixel_y = -25 }, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "hop_office_desk"; - layer = 3.3; name = "Desk Privacy Shutter"; pixel_x = 6; pixel_y = -29 @@ -2760,7 +2714,6 @@ /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "hop_line"; - layer = 3.3; name = "Line Shutters"; pixel_x = -6; pixel_y = -29 @@ -2768,9 +2721,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "bsL" = ( -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -2814,19 +2765,13 @@ /turf/simulated/floor/grass, /area/hydroponics) "bto" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "bua" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/sign/department/bar, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "but" = ( @@ -2899,7 +2844,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "bvC" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2936,7 +2881,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "bwH" = ( /obj/machinery/biogenerator, /obj/effect/floor_decal/borderfloor{ @@ -2944,27 +2889,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"bwS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/uppernorthstairwell) "bxs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2991,11 +2915,7 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "bxG" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -3007,7 +2927,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "bxM" = ( /obj/structure/toilet{ dir = 8 @@ -3082,23 +3002,8 @@ /turf/simulated/floor/wood, /area/library) "bAz" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) +/turf/simulated/open, +/area/tether/elevator/two) "bAK" = ( /obj/structure/bed/chair/sofa/brown/left{ dir = 1 @@ -3134,7 +3039,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "bBs" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/camera/network/civilian, @@ -3200,7 +3105,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "bCr" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3257,7 +3162,7 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/tether) "bDc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment) "bDq" = ( /obj/machinery/light{ @@ -3266,26 +3171,16 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "bEK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; +/obj/machinery/door/blast/regular{ density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 + icon_state = "pdoor0"; + id = "surfbriglockdown"; + name = "Security Blast Doors"; + opacity = 0 }, -/obj/structure/window/reinforced, -/turf/simulated/wall, -/area/tether/surfacebase/medical/storage) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) "bEO" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -3346,7 +3241,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "bFS" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/servicebackroom) "bGd" = ( /obj/structure/shuttle/engine/propulsion, @@ -3376,11 +3271,7 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "bGK" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3411,10 +3302,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bIu" = ( @@ -3456,7 +3344,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "bKj" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ @@ -3513,7 +3401,7 @@ req_one_access = list(47,55) }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1382; master_tag = "xenobiology_airlock_control"; name = "Xenobiology Access Control"; @@ -3638,7 +3526,7 @@ dir = 8; pixel_x = 10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) "bPe" = ( /obj/item/radio/intercom{ @@ -3647,10 +3535,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"bPN" = ( -/obj/machinery/camera/network/command, -/turf/simulated/floor/tiled/dark, -/area/bridge) "bPV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3671,34 +3555,25 @@ /area/rnd/staircase/thirdfloor) "bQJ" = ( /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "bRe" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "bRh" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "draama"; - name = "Mystery Window" +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "DRAMATIC"; + name = "Dramatic Blast Door" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/machinery/door/blast/shutters{ dir = 2; id = "Druma"; - layer = 3.3; name = "Entertainment Shutters" }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "bRo" = ( @@ -3777,7 +3652,7 @@ /obj/structure/sign/directions/evac{ dir = 1 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research) "bUr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3796,9 +3671,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "bVs" = ( @@ -3822,6 +3695,25 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) +"bWf" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "bWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, @@ -3843,11 +3735,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "bWI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3882,15 +3770,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"bXt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) "bXu" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3930,15 +3809,8 @@ /turf/simulated/floor/tiled, /area/rnd/research) "bXW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/wall/prepainted/command, +/area/tether/surfacebase/security/iaa/officecommon) "bYc" = ( /turf/simulated/mineral, /area/tether/surfacebase/outside/outside3) @@ -4031,6 +3903,15 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) +"caX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/pool) "caY" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -4054,22 +3935,9 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"cbM" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "ccd" = ( /obj/machinery/media/jukebox, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -4158,17 +4026,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) -"cfz" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "robo_resleeving" - }, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized{ - id = "robo_resleeving" - }, -/turf/simulated/floor/plating, -/area/rnd/robotics/resleeving) "cfG" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -4186,7 +4043,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "cfT" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -4252,12 +4109,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "cgW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "chg" = ( @@ -4275,7 +4131,7 @@ icon_state = "32-2" }, /turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "chQ" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -4302,7 +4158,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "cil" = ( /obj/structure/table/reinforced, /obj/item/stamp/internalaffairs, @@ -4340,7 +4196,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "ciT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -4362,12 +4218,21 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "cjB" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/robotics) +"ckf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "ckA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4420,7 +4285,7 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "cmJ" = ( /obj/structure/railing{ dir = 4 @@ -4466,25 +4331,6 @@ /obj/structure/bed/chair/sofa/black/left, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"cow" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/blue/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "cox" = ( /obj/machinery/vending/security{ dir = 4 @@ -4506,6 +4352,26 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"coV" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/camera/network/tether, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "cqo" = ( /obj/structure/table/woodentable, /obj/item/paper_bin{ @@ -4515,6 +4381,25 @@ /obj/item/pen, /turf/simulated/floor/carpet, /area/library) +"crl" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "crm" = ( /obj/machinery/light/small{ dir = 4 @@ -4529,6 +4414,22 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"crP" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "csz" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -4547,9 +4448,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "csR" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -4558,26 +4461,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "csX" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/regular/open{ - dir = 2; + dir = 4; id = "DRAMATIC"; name = "Dramatic Blast Door" }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "draama"; - name = "Mystery Window" - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/machinery/door/blast/shutters{ dir = 4; id = "Druma"; - layer = 3.3; name = "Entertainment Shutters" }, /turf/simulated/floor/plating, @@ -4598,6 +4490,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ctR" = ( @@ -4727,7 +4623,7 @@ /area/tether/surfacebase/security/iaa) "cvO" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "cwf" = ( /obj/item/radio/intercom{ @@ -4851,17 +4747,9 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"czh" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) +"cyt" = ( +/turf/simulated/wall/prepainted, +/area/hallway/primary/port) "czk" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -4958,11 +4846,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "cBK" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/l3closet/scientist, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -5040,8 +4924,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "cCS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5054,7 +4941,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "cDs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5101,7 +4988,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "cER" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5147,10 +5034,10 @@ pixel_y = -25 }, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "cFE" = ( /obj/structure/railing, /obj/structure/railing{ @@ -5202,11 +5089,7 @@ /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/dropper, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5242,15 +5125,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "cKJ" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_office) "cLd" = ( @@ -5298,15 +5174,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "cOo" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) +/turf/simulated/wall/prepainted/civilian, +/area/tether/surfacebase/shuttle_pad) "cOu" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -5409,22 +5278,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"cUn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "cUJ" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -5436,10 +5289,24 @@ dir = 9 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "cUT" = ( /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"cUW" = ( +/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/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "cVd" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable{ @@ -5513,7 +5380,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "cWU" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -5602,19 +5469,11 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "cZx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "daa" = ( @@ -5658,13 +5517,8 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "dbs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/chemistry) "dbu" = ( @@ -5731,15 +5585,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"dcc" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "dcB" = ( /obj/structure/table/marble, /obj/item/flame/candle, @@ -5788,11 +5633,10 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "ddu" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -5870,14 +5714,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"diq" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/command{ - name = "Bridge"; - req_access = list(19) +"dia" = ( +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ + scrub_id = "atrium" }, -/turf/simulated/floor/tiled/dark, -/area/bridge) +/turf/simulated/floor/tiled/techmaint, +/area/hallway/primary/fore) "diK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5971,22 +5813,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) -"dlI" = ( -/obj/effect/floor_decal/corner/blue/diagonal, -/obj/effect/floor_decal/corner/blue/diagonal{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) "dmb" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -6010,7 +5836,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dnb" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -6025,8 +5851,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "dnq" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -6071,6 +5896,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 5 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "dof" = ( @@ -6083,7 +5909,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "dox" = ( /obj/structure/closet/athletic_mixed, /obj/machinery/status_display{ @@ -6281,6 +6107,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) +"duG" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/storage) "duJ" = ( /obj/machinery/conveyor{ dir = 1; @@ -6341,10 +6174,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "dwU" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "dxa" = ( @@ -6354,9 +6184,6 @@ /obj/effect/floor_decal/corner_oldtile/green/full, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) -"dxd" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/medical/chemistry) "dyf" = ( /obj/machinery/vending/fitness{ dir = 4 @@ -6393,28 +6220,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "dyJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/wall, -/area/tether/surfacebase/medical/storage) +/turf/simulated/wall/r_wall/prepainted/command, +/area/crew_quarters/captain) "dyN" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -6450,7 +6257,6 @@ dir = 4 }, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -6472,7 +6278,7 @@ /obj/structure/closet/hydrant{ pixel_y = -32 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/shuttle_pad) "dAj" = ( /obj/structure/table/woodentable, @@ -6540,6 +6346,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"dBm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "dBH" = ( /obj/machinery/botany/editor, /obj/effect/floor_decal/borderfloor{ @@ -6653,9 +6467,6 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "dDO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -6664,6 +6475,8 @@ name = "Freezer Shutters"; opacity = 0 }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/freezer) "dEh" = ( @@ -6684,13 +6497,13 @@ /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) "dEL" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_breakroom) "dEU" = ( /obj/structure/sign/directions/evac{ dir = 8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lobby) "dFg" = ( /obj/machinery/door/firedoor, @@ -6701,25 +6514,6 @@ dir = 4 }, /area/hallway/lower/third_south) -"dFK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "dHm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6763,7 +6557,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dHM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -6799,7 +6593,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dIC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6830,8 +6624,11 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dJf" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6891,8 +6688,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa/officecommon) "dLp" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/security/lobby) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/shuttle_pad) "dLw" = ( /obj/structure/bed/chair/sofa/brown/left, /turf/simulated/floor/carpet/sblucarpet, @@ -6930,7 +6729,7 @@ req_one_access = list(47,55) }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1382; master_tag = "xenobiology_airlock_control"; name = "Xenobiology Access Control"; @@ -6940,14 +6739,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "dMn" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/workshop) -"dMz" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) "dMR" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -6959,12 +6752,9 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dNs" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) @@ -6990,6 +6780,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) +"dPz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "dPO" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -7032,7 +6832,7 @@ /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "dRa" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -7056,16 +6856,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"dRA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "dRD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7133,7 +6923,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "dSP" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -7180,11 +6970,7 @@ /area/tether/surfacebase/public_garden_three) "dUV" = ( /obj/structure/table/standard, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/item/defib_kit/loaded, /obj/item/stack/nanopaste, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -7207,11 +6993,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7275,7 +7057,6 @@ "dXS" = ( /obj/machinery/button/windowtint{ id = "draama"; - layer = 3.3; name = "Mystery Window Tint Control"; pixel_x = 3; pixel_y = -29; @@ -7295,8 +7076,10 @@ }, /obj/item/stool/padded, /obj/landmark/spawnpoint/job/entertainer, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, /turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment/backstage) +/area/tether/surfacebase/entertainment/stage) "dXU" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4; @@ -7336,6 +7119,21 @@ /obj/item/beach_ball, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"dYS" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "dZl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7403,6 +7201,23 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +"eaC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "eaP" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled, @@ -7418,8 +7233,7 @@ /area/rnd/robotics/resleeving) "ebD" = ( /obj/structure/flora/pottedplant/unusual, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorblack{ @@ -7452,14 +7266,16 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) +"eez" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/barbackmaintenance) "eeA" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -7500,7 +7316,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "egD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7542,27 +7358,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ehm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "eho" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -7572,6 +7367,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"ehy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ehG" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -7582,29 +7383,19 @@ /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) "eiz" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/sign/signnew/secure, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "32-4" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) +"eiE" = ( +/turf/simulated/wall/prepainted, +/area/hallway/primary/fore) "eiK" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) @@ -7646,10 +7437,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/clean, @@ -7704,6 +7492,15 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +"ena" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "enf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7783,9 +7580,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -7894,6 +7688,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "erZ" = ( @@ -7937,17 +7732,14 @@ /area/tether/surfacebase/security/iaa/officecommon) "etf" = ( /obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 10 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, -/obj/structure/sign/directions/evac{ - dir = 1; - pixel_y = -32 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -8009,7 +7801,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "euX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8054,7 +7846,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/item/reagent_containers/food/condiment/small/saltshaker{ @@ -8450,7 +8241,7 @@ /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/upperhall) "eGZ" = ( /obj/structure/disposalpipe/segment{ @@ -8532,15 +8323,6 @@ "eKA" = ( /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) -"eLe" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/research) "eLl" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -8554,31 +8336,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"eLm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) +/area/hallway/primary/fore) "eLL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -8621,7 +8379,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "eMK" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8689,7 +8447,6 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/effect/floor_decal/borderfloorwhite/corner2, @@ -8700,6 +8457,9 @@ req_access = list(5); req_one_access = list(5) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "eOL" = ( @@ -8710,7 +8470,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "eOO" = ( -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -8718,14 +8477,14 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hos_office"; + name = "hos_office" + }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "ePT" = ( @@ -8735,7 +8494,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "eQc" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/xenobiology/xenoflora) "eQn" = ( /obj/machinery/door/firedoor/glass, @@ -8807,7 +8566,7 @@ }, /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "eRX" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -8849,12 +8608,27 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"eST" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "eTd" = ( /obj/machinery/vending/cigarette{ dir = 4 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "eTA" = ( /obj/structure/bed/chair{ dir = 8 @@ -8935,8 +8709,6 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "eUY" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -8948,24 +8720,20 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "eVl" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_stairs) "eVA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_first_aid) "eVS" = ( /obj/structure/cable/green{ @@ -9017,8 +8785,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -9042,7 +8809,7 @@ pixel_x = 30 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "eXn" = ( /obj/machinery/vending/hydronutrients{ dir = 8 @@ -9090,7 +8857,7 @@ /area/rnd/xenobiology/xenoflora_storage) "eZH" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research_storage) "faf" = ( /obj/machinery/camera/network/civilian, @@ -9111,6 +8878,9 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/general) +"faK" = ( +/turf/simulated/wall/prepainted, +/area/hallway/primary/starboard) "fbf" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -9133,8 +8903,7 @@ /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) "fbU" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/grass, @@ -9173,6 +8942,21 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"feZ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ffs" = ( /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) @@ -9189,11 +8973,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "ffW" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -9257,11 +9037,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -9391,6 +9167,22 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"flb" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "flc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -9413,6 +9205,15 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) +"fmD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "fmQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -9543,7 +9344,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "ftd" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "ftn" = ( /obj/structure/disposalpipe/segment, @@ -9643,7 +9444,7 @@ dir = 8 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -9685,8 +9486,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "fxy" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/stool/padded, @@ -9710,12 +9510,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "fxY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/admin) "fyE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/library) "fyM" = ( @@ -9735,11 +9534,7 @@ "fyW" = ( /obj/structure/table/standard, /obj/item/toy/plushie/purple_fox, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 28 @@ -9780,17 +9575,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "fAs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/wall/prepainted, +/area/crew_quarters/panic_shelter) "fAU" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 10 @@ -9833,25 +9619,10 @@ /obj/effect/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"fBy" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "fBE" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/techfloor, @@ -9899,18 +9670,9 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "fDu" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/bottlegreen, +/turf/simulated/floor/plating, /area/tether/surfacebase/servicebackroom) "fDw" = ( /obj/effect/floor_decal/borderfloor, @@ -9952,6 +9714,17 @@ "fEa" = ( /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) +"fEb" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "fEg" = ( /obj/landmark/spawnpoint/job/entertainer, /obj/structure/bed/chair/wood, @@ -9961,10 +9734,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "fEn" = ( @@ -9996,19 +9766,10 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_three_hall) "fFk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/topairlock) "fFS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/uppersouthstairwell) "fFT" = ( /obj/structure/cable/green{ @@ -10029,23 +9790,15 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "fGn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) "fGZ" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "fHk" = ( @@ -10058,11 +9811,7 @@ /turf/simulated/floor/wood, /area/library) "fHx" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10090,10 +9839,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/crate, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -10147,7 +9893,6 @@ pixel_y = -5 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/effect/floor_decal/spline/plain{ @@ -10225,7 +9970,7 @@ /area/tether/surfacebase/medical/lobby) "fKZ" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/lobby) "fLp" = ( /obj/structure/cable/green{ @@ -10275,11 +10020,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "fMM" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/light, /obj/structure/cable/green, /turf/simulated/floor/tiled, @@ -10294,11 +10035,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "fNn" = ( @@ -10320,7 +10057,7 @@ /area/tether/surfacebase/security/iaa/officea) "fNp" = ( /obj/machinery/newscaster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "fNr" = ( /obj/structure/closet{ @@ -10504,15 +10241,14 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "fPY" = ( /obj/structure/sink{ pixel_y = 24 @@ -10536,15 +10272,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "fQR" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "fQS" = ( @@ -10745,10 +10479,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "fXg" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "robo_resleeving" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "robo_resleeving"; + name = "robo_resleeving" }, /turf/simulated/floor/plating, /area/rnd/robotics/resleeving) @@ -10793,7 +10526,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "fXX" = ( /obj/item/bee_pack, /obj/item/honey_frame, @@ -10827,7 +10560,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "fYm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/triumph/surfacebase/sauna) "fYt" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -10875,6 +10608,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"fZp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "fZu" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -10955,6 +10700,28 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) +"gbq" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "geu" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10983,13 +10750,19 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass, /area/hydroponics) +"ggC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "ghk" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Medbay Storage"; req_access = list(5); req_one_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "ghn" = ( @@ -11069,7 +10842,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "gjp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/maintenance/commandmaint) "gjx" = ( /obj/effect/floor_decal/borderfloor, @@ -11080,12 +10853,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "gjP" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11107,8 +10879,7 @@ /area/tether/surfacebase/security/briefingroom) "gjZ" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -11157,7 +10928,6 @@ "gmU" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/item/paper_bin, @@ -11177,10 +10947,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "gns" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) @@ -11234,7 +11001,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "goh" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/spline/plain{ @@ -11250,8 +11017,11 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) +"gpp" = ( +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "gpz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/command, /area/tether/surfacebase/security/iaa/officea) "gpC" = ( /obj/structure/cable/green{ @@ -11292,11 +11062,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"gqL" = ( -/turf/simulated/wall{ - can_open = 1 - }, -/area/tether/surfacebase/surface_three_hall) "gqR" = ( /obj/machinery/light{ dir = 8 @@ -11314,6 +11079,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "grq" = ( @@ -11337,6 +11105,22 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) +"grE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "gsJ" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -11361,10 +11145,10 @@ /obj/structure/sign/directions/evac{ dir = 1 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_shop) "gtb" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/iaa/officecommon) "gtl" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -11409,24 +11193,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "guv" = ( -/obj/effect/floor_decal/corner/blue/diagonal, -/obj/effect/floor_decal/corner/blue/diagonal{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology/xenoflora_storage) "guH" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -11441,7 +11209,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "gvk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -11475,10 +11243,7 @@ pixel_x = -2; pixel_y = -1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light_switch{ pixel_x = 12; pixel_y = -24 @@ -11550,22 +11315,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"gwU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/general) "gxg" = ( /obj/structure/extinguisher_cabinet{ dir = 4; @@ -11677,53 +11426,27 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) -"gzU" = ( -/obj/structure/cable{ +"gzG" = ( +/obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lobby) +"gzU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 6 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gAM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) +/obj/structure/sign/department/biblio, +/turf/simulated/wall/prepainted/civilian, +/area/library) "gCz" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -11734,10 +11457,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/lathe/autolathe, /turf/simulated/floor/tiled, /area/rnd/research) @@ -11764,35 +11484,26 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "gDK" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) -"gEo" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/structure/window/reinforced/polarized{ - id = "draama"; - name = "Mystery Window" +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "gEL" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/warning{ @@ -11820,26 +11531,8 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "gGi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/uppernorthstairwell) "gGG" = ( @@ -11902,6 +11595,11 @@ /obj/machinery/light, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) +"gJC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "gJU" = ( /turf/simulated/wall, /area/hallway/lower/third_south) @@ -11929,11 +11627,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -11943,26 +11637,10 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "gKL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/storage) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "gLd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11979,12 +11657,14 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "gLt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/pool) "gLT" = ( @@ -12013,12 +11693,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "gMY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -12050,10 +11725,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "gNC" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/table/standard, /obj/item/wheelchair, @@ -12153,7 +11825,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "gRV" = ( /obj/structure/grille, /obj/structure/railing{ @@ -12250,16 +11922,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"gUb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/area/hallway/primary/starboard) "gUs" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/foodcart, @@ -12301,7 +11964,7 @@ /obj/item/towel/random, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "gWY" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/structure/catwalk, @@ -12321,11 +11984,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12349,9 +12008,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "gXO" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) "gXX" = ( @@ -12367,7 +12024,7 @@ /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/lightgrey/bordercorner2, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "gXZ" = ( /obj/machinery/light_switch{ pixel_y = 25 @@ -12375,24 +12032,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "gYg" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "gYk" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -12464,6 +12108,9 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "haq" = ( @@ -12482,11 +12129,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "haH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12670,15 +12313,17 @@ dir = 8 }, /obj/random/soap, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"hfu" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "hfy" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research/researchdivision) "hha" = ( /obj/effect/floor_decal/corner/mauve{ @@ -12690,7 +12335,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "hhK" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/hop) "hhO" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -12699,7 +12344,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/structure/flora/pottedplant/unusual, +/obj/structure/closet/secure_closet/medical_wall/anesthetics, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "hip" = ( @@ -12715,11 +12360,7 @@ /area/rnd/xenobiology/xenoflora_storage) "hjV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12772,11 +12413,8 @@ /obj/structure/table/glass, /obj/item/packageWrap, /obj/item/hand_labeler, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -12816,9 +12454,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"hlG" = ( -/turf/simulated/wall, -/area/rnd/research) "hmR" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -12852,19 +12487,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "hoE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/briefingroom) "hpn" = ( @@ -12881,10 +12504,7 @@ /area/crew_quarters/panic_shelter) "hpp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -12924,6 +12544,10 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 30 }, +/obj/machinery/airlock_sensor/phoron/airlock_interior{ + pixel_x = -25 + }, +/obj/map_helper/airlock/sensor/int_sensor, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "hqJ" = ( @@ -13015,6 +12639,20 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"hty" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "htH" = ( /obj/machinery/air_alarm{ dir = 1; @@ -13064,7 +12702,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "hvp" = ( /obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13074,12 +12712,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) -"hvH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/rnd/robotics) "hvT" = ( /turf/unsimulated/wall/planetary/virgo3b, /area/tether/surfacebase/outside/outside3) @@ -13115,7 +12747,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "hxW" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/medsec_maintenance) "hxY" = ( /obj/structure/table/glass, @@ -13163,34 +12795,23 @@ /turf/simulated/floor/grass, /area/hydroponics) "hyt" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lobby) "hzl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/upperhall) +/turf/simulated/floor/tiled/dark, +/area/bridge) "hzG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_office) "hzM" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "hAe" = ( @@ -13200,16 +12821,6 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) -"hAi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/servicebackroom) "hAs" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -13263,6 +12874,25 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"hCm" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/air_alarm{ + pixel_y = 28 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "hCH" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/floor_decal/industrial/warning{ @@ -13277,8 +12907,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "hDI" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -13309,20 +12938,12 @@ /obj/structure/sign/directions/evac{ dir = 8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "hGm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/sign/botany, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "hGp" = ( @@ -13376,8 +12997,7 @@ /area/tether/surfacebase/security/iaa/officea) "hIU" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/rust, @@ -13478,8 +13098,7 @@ dir = 4 }, /obj/random/cutout, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/lino, @@ -13695,14 +13314,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "hRE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "hRM" = ( @@ -13772,7 +13391,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "hUV" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -13789,6 +13408,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"hVA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "hVU" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -13834,7 +13468,7 @@ icon_state = "2-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "hXb" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/warning{ @@ -13927,17 +13561,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "hYN" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/librarypubliccomp, /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/library) "hZJ" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_office) "iaA" = ( /obj/structure/bookcase, @@ -13947,9 +13578,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "ibh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "ibj" = ( @@ -14002,27 +13632,15 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Internal Affairs" }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) -"icv" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_main) "icz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -14059,8 +13677,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "idP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -14068,7 +13684,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/lobby) "idX" = ( @@ -14125,7 +13741,7 @@ dir = 1; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/library) "ifN" = ( /obj/structure/bed/chair/comfy/brown{ @@ -14232,8 +13848,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "ijD" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/medical/admin) +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology/xenoflora) "ijK" = ( /obj/structure/table/glass, /obj/machinery/door/window/westright{ @@ -14271,7 +13887,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -14292,11 +13907,8 @@ /turf/simulated/floor/grass, /area/hydroponics) "iku" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -14342,41 +13954,9 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) -"ime" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/uppernorthstairwell) "imm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment/stage) -"imA" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_two" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "imL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14471,8 +14051,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -14491,11 +14070,7 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "ipc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light{ dir = 4 }, @@ -14566,11 +14141,8 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "iqT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -14579,7 +14151,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "irb" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -14689,8 +14261,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -14803,21 +14374,6 @@ "iwC" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) -"iwI" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "ixe" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -14830,6 +14386,26 @@ dir = 1 }, /turf/simulated/floor/tiled, +/area/hallway/primary/fore) +"ixf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ixs" = ( /obj/machinery/light{ @@ -14852,10 +14428,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "ixH" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -15044,21 +14617,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) -"iEl" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/rnd/research) "iEZ" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "iFf" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/item/radio/intercom{ pixel_y = -24 }, @@ -15087,21 +14651,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "iFF" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) "iGh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/turf/simulated/wall/r_wall/prepainted/science, +/area/crew_quarters/panic_shelter) "iGD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -15116,9 +14672,9 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "iGE" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/pool) "iGJ" = ( /obj/machinery/light/small{ @@ -15182,15 +14738,31 @@ pixel_x = -5 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "iIV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) +"iIW" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "iJx" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -15212,7 +14784,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "iKi" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/smartfridge/chemistry, @@ -15280,19 +14852,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "iLn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/breakroom) "iLJ" = ( @@ -15307,10 +14867,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "iLO" = ( @@ -15320,6 +14877,16 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) +"iMe" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "iMv" = ( /obj/structure/bed/chair/comfy/brown, /obj/landmark/spawnpoint/job/head_of_personnel, @@ -15332,6 +14899,24 @@ /obj/structure/grille, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_three_hall) +"iNu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "iNx" = ( /obj/structure/railing, /obj/structure/cable/orange{ @@ -15369,11 +14954,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/pool) "iOe" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -15430,6 +15011,21 @@ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "iPt" = ( @@ -15450,7 +15046,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -15462,26 +15057,8 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"iQo" = ( -/obj/structure/grille, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/hos) "iQH" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) "iRo" = ( /obj/machinery/shower{ @@ -15515,26 +15092,48 @@ /obj/effect/floor_decal/corner/mauve/bordercorner, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"iRN" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "iRQ" = ( /obj/machinery/door/window{ + dir = 4; name = "Dealer's Seat" }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) +"iRU" = ( +/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/padded, +/obj/item/towel/random, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "iSb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) +"iSf" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "iSj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -15564,13 +15163,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "iTb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, /obj/structure/cable/green, /obj/machinery/door/blast/regular{ density = 0; @@ -15579,6 +15171,7 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "iTu" = ( @@ -15686,8 +15279,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) "iVt" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -15715,11 +15307,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -15763,8 +15351,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "iWl" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -15776,11 +15362,11 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "iWM" = ( @@ -15799,6 +15385,9 @@ /obj/structure/bed/chair{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/bridge) "iXl" = ( @@ -15820,12 +15409,8 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "iXC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/workshop) "iXH" = ( @@ -15836,8 +15421,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "iYv" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/cafe, @@ -15853,7 +15437,7 @@ /area/tether/surfacebase/shuttle_pad) "jbl" = ( /obj/item/radio/intercom, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) "jbw" = ( /obj/structure/frame/computer, @@ -15887,6 +15471,18 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"jbX" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "jco" = ( /obj/structure/table/gamblingtable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -15903,6 +15499,14 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"jcG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "jdy" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15914,15 +15518,8 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "jdA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "jdP" = ( @@ -15975,10 +15572,7 @@ /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "jeM" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/vending/loadout/accessory, /obj/machinery/air_alarm{ dir = 8; @@ -16016,7 +15610,6 @@ }, /obj/machinery/door/blast/shutters{ id = "kitchen2"; - layer = 3.3; name = "Kitchen Shutters" }, /turf/simulated/floor/tiled/white, @@ -16034,7 +15627,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "jga" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/recreation_area) "jgu" = ( /obj/structure/table/woodentable, @@ -16077,6 +15670,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/captain) +"jie" = ( +/turf/simulated/wall/prepainted/medical, +/area/hallway/primary/starboard) "jis" = ( /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ @@ -16102,14 +15698,10 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "jiE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; id = "tourbus_windows"; name = "Shuttle Blast Doors"; @@ -16118,8 +15710,27 @@ /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) "jjc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/upperhall) +"jjy" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "jjJ" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/tiled, @@ -16219,29 +15830,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"jlF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/uppernorthstairwell) "jlJ" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -16254,7 +15842,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "jlL" = ( /obj/structure/table/steel, /obj/item/electronic_assembly/large/default, @@ -16285,6 +15873,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/machinery/oxygen_pump/mobile/anesthetic, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "jmk" = ( @@ -16304,7 +15893,7 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "jmm" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/portables_connector{ @@ -16360,18 +15949,19 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"jps" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"jqi" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, -/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "jqH" = ( @@ -16394,7 +15984,7 @@ icon_state = "2-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "jrd" = ( /obj/structure/sign/directions/medical{ dir = 1; @@ -16411,7 +16001,7 @@ dir = 1; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_three_hall) "jrv" = ( /obj/structure/bed/chair/sofa/brown/right{ @@ -16420,10 +16010,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) "jrG" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -16446,7 +16033,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -16486,25 +16072,11 @@ /obj/landmark/spawnpoint/job/entertainer, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) -"jsx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "jsD" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) "jsE" = ( -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -16512,10 +16084,10 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hos_office"; + name = "hos_office" }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "jsM" = ( @@ -16616,11 +16188,11 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "jvD" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "medbayfoyer" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "medbayfoyer"; + name = "medbayfoyer" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) "jvH" = ( @@ -16748,6 +16320,7 @@ dir = 10 }, /obj/machinery/computer/timeclock/premade/west, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "jAf" = ( @@ -16762,7 +16335,7 @@ /area/tether/surfacebase/security/iaa) "jAF" = ( /obj/item/radio/intercom, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "jAH" = ( /turf/simulated/floor/carpet, @@ -16771,15 +16344,12 @@ /turf/simulated/wall, /area/crew_quarters/bar) "jBg" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/orange, /turf/simulated/floor/tiled, /area/teleporter/departing) "jBw" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_shop) "jBy" = ( /obj/structure/disposalpipe/segment, @@ -16797,13 +16367,9 @@ pixel_x = -25 }, /turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment) +/area/tether/surfacebase/entertainment/stage) "jBR" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -16858,23 +16424,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"jDg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "jDv" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -17015,11 +16565,8 @@ dir = 6 }, /obj/landmark/spawnpoint/job/librarian, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -17041,16 +16588,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"jJl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/xenobiology/xenoflora) "jJJ" = ( /obj/structure/table/woodentable, /obj/item/storage/box/sinpockets, @@ -17068,7 +16605,7 @@ "jJP" = ( /obj/structure/lattice, /turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "jJW" = ( /obj/structure/window/reinforced{ dir = 1 @@ -17131,10 +16668,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "jMd" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "jMs" = ( @@ -17150,12 +16684,7 @@ pixel_y = -7; report_danger_level = 0 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 23; - pixel_y = 13 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppernorthstairwell) @@ -17176,8 +16705,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -17213,20 +16741,6 @@ }, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) -"jOp" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "jPj" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -17291,7 +16805,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "jQd" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -17355,15 +16869,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "jSJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/pool) +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/medical/surgery2) "jTh" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -17387,9 +16894,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "jUo" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "jUv" = ( @@ -17461,8 +16966,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/wood, @@ -17668,9 +17172,6 @@ /obj/machinery/computer/arcade, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"kbY" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/surgery2) "kcx" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17691,8 +17192,7 @@ /turf/simulated/floor/tiled, /area/rnd/research) "kdK" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -17735,7 +17235,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -17760,7 +17259,7 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "khE" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/tether/surfacebase/surface_three_hall) "khZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, @@ -17781,6 +17280,33 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"kio" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) +"kiy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "kiG" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 8; @@ -17847,7 +17373,7 @@ }, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "kmv" = ( /obj/structure/cable{ icon_state = "2-8" @@ -17861,12 +17387,7 @@ /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "kmR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa) "knh" = ( @@ -17888,10 +17409,7 @@ "knX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -17918,7 +17436,7 @@ pixel_y = -32 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "koO" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -17932,17 +17450,10 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "koV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "surfsurgery2" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, -/area/tether/surfacebase/medical/surgery2) +/area/tether/surfacebase/surface_three_hall) "kpb" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/techfloor, @@ -17986,6 +17497,18 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) +"kpP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "kpV" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -18048,8 +17571,6 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "krJ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -18061,14 +17582,14 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "ksc" = ( @@ -18106,7 +17627,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_three_hall) "ktH" = ( /obj/machinery/door/airlock/security{ @@ -18182,6 +17703,15 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"kwu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "kwQ" = ( /obj/structure/closet/hydrant{ pixel_y = -32 @@ -18243,13 +17773,22 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "kAn" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge) +"kAD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "kBl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18298,7 +17837,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "kCo" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/bar_backroom) "kCv" = ( /obj/machinery/holopad, @@ -18447,30 +17986,6 @@ /obj/structure/table/marble, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"kHp" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) "kIa" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -18496,6 +18011,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"kJa" = ( +/turf/simulated/wall/prepainted/civilian, +/area/hallway/lower/third_south) "kJi" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -18573,7 +18091,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "kLX" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/recreation_area_restroom) "kMf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -18608,6 +18126,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "kOG" = ( @@ -18627,7 +18148,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "kPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18707,8 +18228,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "kTj" = ( /obj/machinery/conveyor_switch/oneway{ id = "serviceblock2" @@ -18800,6 +18324,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "kWx" = ( @@ -18835,6 +18360,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/bar) +"kXp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "kXv" = ( /obj/machinery/door/airlock/maintenance/common, /obj/effect/floor_decal/industrial/warning{ @@ -18888,7 +18421,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "kYr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19009,8 +18542,8 @@ /turf/simulated/floor/tiled, /area/rnd/research) "laF" = ( -/turf/simulated/wall/r_wall, -/area/rnd/research_storage) +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/surface_three_hall) "laX" = ( /obj/machinery/vending/coffee{ dir = 8 @@ -19226,11 +18759,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -19238,7 +18767,7 @@ /turf/simulated/floor/tiled, /area/rnd/research) "lig" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/breakroom) "lih" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19292,6 +18821,18 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) +"lkI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "lkX" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19384,6 +18925,7 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/glass/polarized{ + dir = 8; id_tint = "saunatint"; name = "Sauna" }, @@ -19415,9 +18957,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "loy" = ( -/obj/structure/curtain/open, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/bar) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/cafeteria) "loG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19461,7 +19002,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "lpk" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -19494,7 +19035,7 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/research) "lqw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) "lqB" = ( /obj/structure/cable/green{ @@ -19509,15 +19050,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "lqG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "lqQ" = ( @@ -19567,9 +19101,6 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "lsn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -19581,6 +19112,8 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/lobby) "lsK" = ( @@ -19612,8 +19145,7 @@ /turf/simulated/floor/wood, /area/library) "lsY" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -19643,9 +19175,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(67) }, /obj/effect/floor_decal/borderfloorwhite, @@ -19730,6 +19260,12 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "lwr" = ( @@ -19766,11 +19302,7 @@ /obj/item/pizzavoucher, /obj/item/moneybag, /obj/item/inflatable_duck, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/item/gun/ballistic/revolver/capgun, /obj/item/gun/ballistic/revolver/capgun, /obj/item/toy/cultsword, @@ -19837,7 +19369,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "lyc" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -19846,11 +19378,11 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) "lAa" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/vacant/vacant_shop) "lAH" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/chemistry) "lCf" = ( /obj/structure/cable/green{ @@ -19890,7 +19422,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "lCS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/command, /area/tether/surfacebase/security/iaa) "lDx" = ( /turf/simulated/floor/tiled/monotile, @@ -19952,11 +19484,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/table/glass, /obj/item/storage/box/cups{ pixel_x = 7; @@ -20060,7 +19588,7 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "lHA" = ( /obj/machinery/recharge_station, /obj/effect/floor_decal/industrial/warning/corner{ @@ -20080,7 +19608,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "lIm" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 5 @@ -20165,11 +19693,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "lJy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20182,8 +19706,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "lJJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -20237,6 +19760,15 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) +"lLC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "lMd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor/tiled/monotile, @@ -20250,8 +19782,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "lME" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-2" @@ -20263,12 +19793,13 @@ layer = 3.1; name = "Colony Directo's Shutters" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "lMF" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -20365,7 +19896,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "lRV" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -20376,13 +19907,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "lSR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "lTa" = ( /obj/machinery/light/small{ dir = 1 @@ -20441,11 +19969,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_stairs) "lUN" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /turf/simulated/floor/wood, @@ -20504,6 +20029,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) +"lWD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "lWG" = ( /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ @@ -20571,6 +20105,9 @@ /obj/machinery/atm{ pixel_x = -32 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) "lYH" = ( @@ -20591,7 +20128,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "lZn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20771,7 +20308,7 @@ dir = 4 }, /turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mdZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20829,10 +20366,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "mgr" = ( @@ -20850,7 +20384,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mgB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20899,9 +20433,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "mit" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research/researchdivision) "miz" = ( @@ -20959,9 +20492,9 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mjp" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/command, /area/tether/surfacebase/security/iaa/officeb) "mjC" = ( /obj/structure/disposalpipe/segment, @@ -20982,6 +20515,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) +"mkv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "mkH" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -21039,16 +20588,11 @@ /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) "mmL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ id = "secreet"; - name = "Tintable Window" + name = "Game Room" }, -/obj/machinery/door/firedoor/glass, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/barbackmaintenance) "mnm" = ( @@ -21059,7 +20603,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mnI" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/item/radio/intercom{ @@ -21078,7 +20622,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "mow" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, @@ -21089,10 +20633,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"mpF" = ( -/obj/structure/sign/department/biblio, -/turf/simulated/wall, -/area/library) "mpY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -21133,28 +20673,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"mra" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 24 - }, -/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 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "mrW" = ( /obj/structure/bed/chair{ dir = 1 @@ -21189,30 +20707,27 @@ /turf/simulated/floor/reinforced, /area/tether/surfacebase/shuttle_pad) "mst" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/wood, +/area/tether/surfacebase/barbackmaintenance) "msB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "msR" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain, @@ -21224,6 +20739,9 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"mtC" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/hallway/lower/third_south) "mtS" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -21364,11 +20882,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "mwD" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -21389,15 +20903,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) -"mxc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/research_storage) "mxe" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -21420,11 +20925,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/rnd/research_storage) "mxM" = ( @@ -21446,6 +20947,21 @@ }, /turf/simulated/floor/wood, /area/shuttle/tourbus/general) +"myC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "mAk" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -21471,7 +20987,7 @@ pixel_x = -22; pixel_y = 22 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/surgeryroom2) "mBn" = ( /obj/machinery/computer/power_monitor{ @@ -21549,13 +21065,12 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mDF" = ( /obj/structure/bed/chair/wood{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -21572,29 +21087,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"mDR" = ( -/obj/structure/grille, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/hos) "mEK" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, @@ -21613,8 +21107,6 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "mFf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-2" @@ -21625,6 +21117,8 @@ layer = 3.1; name = "Colony Directo's Shutters" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "mFM" = ( @@ -21726,7 +21220,7 @@ /area/crew_quarters/panic_shelter) "mIe" = ( /obj/structure/sign/greencross, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lobby) "mIg" = ( /obj/structure/disposalpipe/segment, @@ -21740,11 +21234,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "mIt" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -21777,6 +21267,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "mKp" = ( @@ -21832,7 +21323,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "mKW" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/resleeving) "mLa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21842,7 +21333,7 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "mLg" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -21866,7 +21357,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "mLF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "mLT" = ( /obj/structure/cable/green{ @@ -21914,13 +21405,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"mMi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) "mMQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21936,12 +21420,20 @@ /turf/simulated/floor/water/pool, /area/crew_quarters/pool) "mNm" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/southhall) +/obj/machinery/station_map{ + pixel_y = 32 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "mNt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/bed/chair/office/dark, @@ -22254,7 +21746,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -22262,25 +21753,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) -"mVM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "mWf" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -22295,55 +21767,22 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"mWU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "mXn" = ( /obj/structure/closet/firecloset, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) "mXz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) +/turf/simulated/wall/r_wall/prepainted, +/area/vacant/vacant_shop) "mXI" = ( /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "mYh" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_breakroom) +/area/hallway/lower/third_south) "mYz" = ( /obj/machinery/atmospherics/component/unary/engine{ dir = 1 @@ -22426,18 +21865,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research) -"naX" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment/stage) "nbe" = ( /obj/structure/table/glass, /obj/item/material/ashtray/plastic, @@ -22446,7 +21877,7 @@ pixel_x = 24 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "nbf" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -22496,10 +21927,10 @@ /turf/simulated/floor/carpet, /area/library) "ncI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/surgery1) "ncQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/triage) "ndk" = ( /obj/item/flame/candle, @@ -22595,6 +22026,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"nfL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ngq" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor, @@ -22655,10 +22102,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -22766,11 +22210,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -22822,12 +22262,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nno" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) "nnu" = ( @@ -22983,6 +22418,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) +"nrV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "nrZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23050,33 +22498,18 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "nsR" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "booth_one" - }, -/obj/structure/window/reinforced/polarized{ - id = "booth_two" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/tinted/full/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "ntb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + icon_state = "2-4" }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "ntl" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -23092,8 +22525,12 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "ntv" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -23137,7 +22574,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) "nvE" = ( /obj/machinery/light{ @@ -23175,9 +22612,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "nvV" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "nwl" = ( /obj/structure/sign/poster{ @@ -23201,11 +22636,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "nwN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -23411,7 +22842,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "nBq" = ( /obj/structure/table/rack, /obj/random/maintenance/research, @@ -23444,19 +22875,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "nCh" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/sign/signnew/secure, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_north_airlock) "nCP" = ( @@ -23488,15 +22911,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "nDe" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "nEA" = ( @@ -23599,18 +23015,12 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "nGW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "nHh" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23630,11 +23040,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "nHQ" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/air_alarm{ dir = 1; pixel_y = -25 @@ -23696,7 +23102,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "nIz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) "nIF" = ( /obj/structure/cable/green{ @@ -23760,6 +23166,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"nJJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "nKi" = ( /obj/structure/table, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -23834,13 +23252,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"nLZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) "nMb" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -24000,10 +23411,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "nPA" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -24019,15 +23427,16 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nQz" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /obj/structure/closet/firecloset, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nQQ" = ( @@ -24037,11 +23446,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "nQW" = ( @@ -24054,7 +23459,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "nRX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24136,7 +23541,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "nUx" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -24151,12 +23556,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "nUF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "nUU" = ( @@ -24348,15 +23748,8 @@ /turf/simulated/floor/wood, /area/library) "obH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/security/briefingroom) "obJ" = ( /obj/machinery/vending/sovietsoda{ dir = 8 @@ -24397,8 +23790,11 @@ /obj/machinery/atm{ pixel_y = 30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "ocI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -24439,15 +23835,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"ocU" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/southhall) "odo" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -24522,6 +23909,26 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"oeS" = ( +/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/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ofn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24570,7 +23977,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "ogT" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/mechbay) "ogU" = ( /obj/machinery/washing_machine, @@ -24636,12 +24043,7 @@ /turf/simulated/floor/tiled, /area/rnd/research) "ois" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) "oiU" = ( @@ -24657,10 +24059,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ojn" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "iaar" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "iaar"; + name = "iaar" }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officeb) @@ -24710,11 +24111,7 @@ /obj/machinery/camera/network/research{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "okn" = ( @@ -24734,6 +24131,10 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, +/obj/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/phoron/airlock_exterior{ + pixel_x = 25 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/topairlock) "okA" = ( @@ -24745,9 +24146,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "okC" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cafeteria) "okS" = ( @@ -24828,7 +24227,7 @@ dir = 4 }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1392; master_tag = "xenobiology_north_airlock_control"; name = "Xenobiology Access Control"; @@ -24857,19 +24256,38 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "onk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officecommon) +"ono" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ons" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"onA" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "onT" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora_storage) "oos" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ @@ -24878,7 +24296,7 @@ /turf/simulated/wall/shull, /area/shuttle/tourbus/general) "ooR" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/library) "opb" = ( /obj/structure/table/marble, @@ -24894,8 +24312,7 @@ /obj/structure/closet/medical_wall{ pixel_y = 35 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/storage/firstaid/regular, @@ -24913,8 +24330,11 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "opJ" = ( /obj/structure/bed/chair, /turf/simulated/floor/tiled/techfloor, @@ -24962,15 +24382,8 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "orl" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_breakroom) "orE" = ( @@ -24983,6 +24396,25 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) +"osl" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "osB" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -25003,11 +24435,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "osD" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25067,7 +24495,7 @@ dir = 10; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "oua" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25096,7 +24524,7 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "ovU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research) "owc" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -25106,9 +24534,6 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "owg" = ( @@ -25242,7 +24667,6 @@ /obj/structure/sign/department/medbay{ pixel_x = -32 }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/glass/polarized{ @@ -25251,6 +24675,7 @@ name = "Medbay Airlock"; req_one_access = list(5) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "oAH" = ( @@ -25397,6 +24822,25 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"oDX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "oEg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -25448,10 +24892,12 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "oFU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "oFZ" = ( @@ -25522,15 +24968,22 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "oIl" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "oIn" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 5; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/extinguisher_cabinet{ @@ -25585,12 +25038,9 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "oKk" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -25647,7 +25097,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "oLJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25726,7 +25176,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "oNi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) "oNq" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -25789,7 +25239,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "oPH" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -25810,10 +25260,10 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "oPP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/southhall) "oPU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/storage) "oQa" = ( /obj/machinery/photocopier, @@ -26011,7 +25461,7 @@ /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) "oVB" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/shuttle_pad) "oVJ" = ( /obj/machinery/air_alarm{ @@ -26062,7 +25512,7 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "oXM" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment/backstage) "oYg" = ( /obj/structure/table/reinforced, @@ -26125,15 +25575,13 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 5 - }, /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "oZC" = ( @@ -26205,11 +25653,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "pbg" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/orange{ icon_state = "0-4" @@ -26224,20 +25669,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) "pbQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/outside/outside3) "pcg" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/crew_quarters/bar) "pcu" = ( @@ -26247,24 +25683,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) -"pcI" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "booth_one" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "pcK" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -26408,7 +25829,7 @@ }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "pfL" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -26469,11 +25890,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -26570,11 +25987,9 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "pjB" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/panic_shelter) "pjL" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -26586,8 +26001,6 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -26600,6 +26013,8 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "pjN" = ( @@ -26627,7 +26042,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "pkj" = ( /obj/structure/table/glass, /obj/machinery/recharger, @@ -26703,7 +26118,7 @@ /obj/structure/sign/directions/evac{ dir = 1 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment) "pmZ" = ( /obj/machinery/bodyscanner{ @@ -26785,7 +26200,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "ppg" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -26839,7 +26254,7 @@ }, /obj/machinery/light, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "ppW" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -26856,11 +26271,8 @@ /obj/structure/bed/chair/wheelchair{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -26879,37 +26291,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "pqK" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/hydroponics/cafegarden) "prj" = ( /turf/simulated/floor/grass, /area/hydroponics) "prs" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_south_airlock) -"pru" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/shuttle_pad) -"prv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "prB" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -26961,9 +26350,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -27003,7 +26390,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "ptF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_three_hall) "ptJ" = ( /obj/effect/floor_decal/borderfloor, @@ -27100,10 +26487,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "pwx" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -27131,7 +26515,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "pyA" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -27190,8 +26574,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "pAF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ dir = 4; @@ -27205,6 +26587,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "pAH" = ( @@ -27362,20 +26746,9 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "pDC" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "pDG" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -27506,6 +26879,10 @@ name = "HoP Line Shutters"; opacity = 0 }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "pGm" = ( @@ -27668,11 +27045,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "pNf" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) "pNh" = ( @@ -27712,6 +27085,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) +"pOp" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "pOF" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -27742,12 +27118,37 @@ /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"pPC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "pPF" = ( /obj/structure/table/woodentable, /obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) +"pPL" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "pPW" = ( /obj/structure/railing{ dir = 1 @@ -27836,6 +27237,19 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"pRf" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "pRx" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -27867,15 +27281,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) -"pTs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/research_storage) "pTP" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -27893,12 +27298,9 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "pVi" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "pVm" = ( @@ -27941,21 +27343,11 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 9 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"pWq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ +/obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "pWy" = ( /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled/dark, @@ -28020,8 +27412,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "pXe" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/table/woodentable, @@ -28340,13 +27731,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_storage) "qgL" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "qhk" = ( @@ -28371,18 +27756,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"qhL" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "qhV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28417,11 +27790,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) "qix" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -28433,11 +27803,7 @@ dir = 1; pixel_y = 24 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -28499,11 +27865,7 @@ "qkn" = ( /obj/structure/bed/chair/comfy, /obj/machinery/camera/network/civilian, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "qkA" = ( @@ -28583,7 +27945,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -28597,6 +27958,17 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"qlX" = ( +/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 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "qlY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -28606,7 +27978,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/general) "qmz" = ( -/obj/structure/grille, /obj/structure/cable/green, /obj/machinery/door/blast/regular{ density = 0; @@ -28615,10 +27986,10 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced/polarized/full{ - id = "sec_processing" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "sec_processing"; + name = "sec_processing" }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/surfacebase/security/processing) "qnf" = ( @@ -28637,11 +28008,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "qnw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/teleporter/departing) "qny" = ( /obj/structure/sign/redcross, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_first_aid) "qnH" = ( /obj/machinery/door/firedoor, @@ -28707,8 +28078,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "qqq" = ( -/turf/simulated/wall, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/wall/r_wall/prepainted/command, +/area/crew_quarters/heads/hop) "qqu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -28731,7 +28102,7 @@ name = "Xenobiology North Airlock" }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1392; master_tag = "xenobiology_north_airlock_control"; name = "Xenobiology Access Control"; @@ -28789,25 +28160,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "qsE" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) -"qtf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_hallway) "qty" = ( /obj/machinery/air_alarm{ dir = 1; @@ -28825,11 +28181,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "qub" = ( @@ -28840,6 +28192,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"qul" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "qux" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -29020,7 +28381,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "qyl" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_stairs) "qyH" = ( /obj/structure/disposalpipe/segment{ @@ -29120,7 +28481,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "qCH" = ( /obj/structure/bed/chair/bay/shuttle{ dir = 1 @@ -29131,7 +28492,7 @@ /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "qCJ" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "qDj" = ( @@ -29296,7 +28657,7 @@ /area/crew_quarters/pool) "qKA" = ( /obj/machinery/photocopier, -/obj/machinery/firealarm{ +/obj/machinery/fire_alarm{ pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -29315,17 +28676,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"qLn" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "qLy" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -29408,7 +28758,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "qOl" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/rnd/research_storage) "qOH" = ( /obj/effect/floor_decal/borderfloorwhite, @@ -29481,17 +28831,11 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "qRK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/workshop) +/turf/simulated/wall/prepainted/civilian, +/area/triumph/surfacebase/sauna) "qSA" = ( /obj/structure/sign/department/chapel, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_shop) "qTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -29594,6 +28938,18 @@ /area/crew_quarters/bar) "qUG" = ( /obj/machinery/door/firedoor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qUY" = ( @@ -29619,7 +28975,7 @@ /turf/simulated/floor/plating, /area/shuttle/tourbus/general) "qVC" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge) "qVG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -29628,6 +28984,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) +"qWc" = ( +/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/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "qWg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -29732,6 +29106,21 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) +"qZH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "qZR" = ( /obj/structure/flora/pottedplant/subterranean, /obj/effect/floor_decal/borderfloorblack{ @@ -29766,6 +29155,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) "raD" = ( @@ -29815,7 +29205,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rcn" = ( /obj/machinery/air_alarm{ dir = 8; @@ -29826,6 +29216,17 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"rcv" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "rcJ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29856,7 +29257,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rdd" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -29876,14 +29277,9 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "rdR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "red" = ( /obj/structure/table/gamblingtable, /obj/item/storage/pill_bottle/dice_nerd, @@ -29931,11 +29327,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -30057,12 +29449,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "rhs" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) "rhH" = ( @@ -30077,25 +29467,6 @@ "ria" = ( /turf/simulated/floor/lino, /area/crew_quarters/bar) -"rjb" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/command{ - dir = 1; - name = "Bridge"; - req_access = list(19) - }, -/obj/machinery/door/blast/regular{ - closed_layer = 10; - density = 0; - icon_state = "pdoor0"; - id = "bridge blast"; - layer = 1; - name = "Bridge Blast Doors"; - opacity = 0; - open_layer = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/bridge) "rjS" = ( /obj/structure/table/glass, /obj/machinery/light_switch{ @@ -30119,11 +29490,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -30138,13 +29505,17 @@ /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "rkU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, /turf/simulated/floor/tiled, @@ -30162,11 +29533,7 @@ pixel_y = 3 }, /obj/item/radio, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light_switch{ pixel_x = 12; pixel_y = 25 @@ -30235,13 +29602,13 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "rpW" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 }, /obj/structure/sign/double/barsign, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) "rqi" = ( /obj/structure/window/reinforced{ @@ -30299,7 +29666,7 @@ /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "rrx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/civilian, /area/hydroponics) "rrA" = ( /obj/structure/bed/chair/office/light, @@ -30329,14 +29696,13 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "rtw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics/cafegarden) "rtZ" = ( @@ -30357,7 +29723,7 @@ pixel_x = -32 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rub" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -30365,12 +29731,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/library) -"rut" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/crew_quarters/kitchen) "ruv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -30475,13 +29835,9 @@ pixel_x = -22 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rwS" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -30515,15 +29871,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/rnd/research_storage) -"rxn" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "rxv" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -30768,10 +30115,9 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "rIK" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "iaal" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "iaal"; + name = "iaal" }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officea) @@ -30827,7 +30173,7 @@ pixel_x = 27 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "rJU" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -30952,7 +30298,7 @@ }, /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "rNx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -30993,6 +30339,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/medical_stand/anesthetic, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "rPr" = ( @@ -31017,28 +30364,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"rPD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "rPL" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -31146,11 +30471,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "rRU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research) +"rRX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "rSM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31184,7 +30514,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rTL" = ( /obj/structure/dispenser/oxygen, /obj/effect/floor_decal/industrial/warning{ @@ -31384,7 +30714,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "rYB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -31395,23 +30725,15 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "rYO" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "booth_two" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_two" +/obj/structure/curtain/open, +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) "rZa" = ( /obj/structure/cable/green{ @@ -31441,6 +30763,25 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"rZE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "rZS" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) @@ -31633,7 +30974,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "sge" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_storage) "sgg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31730,7 +31071,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "shY" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -31862,11 +31203,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "skn" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/hos) "sku" = ( /obj/structure/sign/xenobio, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) "skw" = ( /obj/structure/table/standard, @@ -31887,11 +31228,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -32038,7 +31375,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "srA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/processing) "srL" = ( /obj/machinery/door/firedoor/glass, @@ -32071,11 +31408,7 @@ /area/rnd/outpost/xenobiology/outpost_hallway) "srY" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -32105,8 +31438,11 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "stz" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -32124,9 +31460,6 @@ /turf/simulated/floor/grass, /area/hydroponics) "suh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "suk" = ( @@ -32171,7 +31504,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) +"svu" = ( +/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/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "svR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -32182,11 +31529,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -32229,7 +31572,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "sxq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -32314,7 +31657,7 @@ /area/tether/surfacebase/surface_three_hall) "szw" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_three) "sAa" = ( /obj/machinery/door/firedoor/glass, @@ -32362,8 +31705,7 @@ "sBe" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -32448,6 +31790,22 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) +"sDD" = ( +/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/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "sDF" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -32647,11 +32005,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "sKc" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -32673,7 +32027,7 @@ /obj/structure/closet/hydrant{ pixel_y = 32 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/shuttle_pad) "sKQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -32783,11 +32137,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"sMZ" = ( -/obj/structure/grille, -/obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, -/area/hallway/lower/third_south) "sNk" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, @@ -32822,18 +32171,11 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "sPr" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "hop_office" - }, -/obj/structure/cable/green{ - dir = 1 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hop_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hop_office"; + name = "hop_office" }, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "sPw" = ( @@ -32945,7 +32287,7 @@ /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "sQL" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "sRl" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -32974,8 +32316,7 @@ /area/hallway/lower/third_south) "sRy" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/white, @@ -33026,9 +32367,14 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "sTA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/padded, +/obj/item/towel/random, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "sTU" = ( /obj/machinery/button/remote/blast_door{ id = "freezer"; @@ -33041,11 +32387,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -33085,6 +32427,13 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) +"sWC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "sWJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -33146,7 +32495,7 @@ /obj/item/reagent_containers/food/drinks/cans/waterbottle, /obj/machinery/light, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "sZw" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 @@ -33167,7 +32516,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "taq" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/borderfloor{ @@ -33294,7 +32643,7 @@ /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/shuttle_pad) "tcL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research/testingrange) "tcS" = ( /obj/machinery/light{ @@ -33344,7 +32693,7 @@ /area/rnd/research/testingrange) "tec" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "teF" = ( /obj/structure/filingcabinet, @@ -33354,6 +32703,10 @@ /obj/machinery/holopad, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"teO" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "teQ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -33407,14 +32760,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) -"thn" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "saunatint" - }, -/turf/simulated/floor/plating, -/area/triumph/surfacebase/sauna) "thQ" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -33531,6 +32876,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tnk" = ( @@ -33550,7 +32896,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tno" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -33614,7 +32960,7 @@ }, /obj/machinery/light, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tpu" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 5 @@ -33670,9 +33016,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tqE" = ( @@ -33700,23 +33043,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "trH" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_main) "tst" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -33751,12 +33083,14 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tud" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -33789,7 +33123,7 @@ /area/tether/surfacebase/cafeteria) "tvr" = ( /obj/machinery/newscaster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) "tvs" = ( /obj/structure/railing, @@ -33866,8 +33200,7 @@ dir = 4; pixel_x = -22 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/flora/pottedplant/stoutbush, @@ -33884,6 +33217,9 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "txP" = ( @@ -33892,14 +33228,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) -"txY" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_hallway) "tyA" = ( /obj/structure/table/steel, /obj/fiftyspawner/steel, @@ -33921,11 +33249,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "tzD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "tAn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33985,6 +33311,10 @@ dir = 5 }, /obj/structure/disposalpipe/segment, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tBR" = ( @@ -34004,8 +33334,6 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "tCk" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -34016,7 +33344,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "tCm" = ( @@ -34036,6 +33364,9 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/hydroponics) +"tCR" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "tDK" = ( /obj/machinery/computer/atmos_alert{ dir = 8 @@ -34158,16 +33489,6 @@ /obj/machinery/ion_engine, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) -"tHu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) "tHF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -34269,7 +33590,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "tKt" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/surgeryroom2) "tKw" = ( /obj/structure/disposalpipe/segment, @@ -34323,10 +33644,25 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/tether) +"tLw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "tLK" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(); req_one_access = list(11,67) }, @@ -34376,13 +33712,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) -"tMF" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) "tMI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -34439,7 +33768,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tOf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -34468,9 +33797,8 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "tOO" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "tOP" = ( @@ -34518,7 +33846,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "tPI" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) "tPS" = ( /obj/effect/floor_decal/borderfloor{ @@ -34598,15 +33926,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"tRx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "tRN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -34618,7 +33937,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "tRQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/bar) "tRV" = ( /obj/effect/floor_decal/borderfloor{ @@ -34667,7 +33986,7 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "tTd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -34705,6 +34024,9 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"tTD" = ( +/turf/simulated/floor/plating, +/area/hallway/primary/fore) "tUp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -34717,6 +34039,20 @@ }, /turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) +"tUP" = ( +/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/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "tUX" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -34741,11 +34077,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "tVj" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "robo_surg" - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "tVF" = ( @@ -34793,7 +34126,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tWo" = ( /obj/structure/closet/crate/bin, /turf/simulated/floor/wood, @@ -34919,30 +34252,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"tYN" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "tYY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -34957,7 +34266,6 @@ /area/tether/surfacebase/topairlock) "tZe" = ( /obj/structure/shuttle/window, -/obj/structure/grille, /turf/simulated/shuttle/plating/airless, /area/shuttle/tether) "tZk" = ( @@ -35114,7 +34422,7 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "ucY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/library/study) "ucZ" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -35123,8 +34431,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -35176,10 +34483,7 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "ufw" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -35198,11 +34502,7 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "ufJ" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -35226,7 +34526,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "ugQ" = ( /obj/machinery/air_alarm{ alarm_id = "pen_nine"; @@ -35271,13 +34571,10 @@ /turf/simulated/floor/grass, /area/hydroponics) "uih" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/crew_quarters/captain) "uim" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -35289,7 +34586,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "uin" = ( /obj/item/stool/padded, /obj/machinery/holoposter{ @@ -35383,11 +34680,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -35492,21 +34785,15 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "unp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, +/turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "unR" = ( /obj/structure/bed/chair{ @@ -35583,7 +34870,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "upx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -35684,7 +34971,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "uqV" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/hydroponics) "urk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -35757,13 +35044,9 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "usd" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -35840,7 +35123,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) "uuk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -35951,18 +35234,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) "uyz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/barrestroom) -"uyO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/servicebackroom) "uyW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -36118,15 +35391,8 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "uDV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) "uDZ" = ( @@ -36186,25 +35452,9 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/outpost/xenobiology/outpost_decon) -"uFq" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "booth_one" - }, -/obj/structure/window/reinforced/polarized{ - id = "booth_two" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "uFr" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) "uGX" = ( /turf/simulated/floor/water/deep/pool, @@ -36231,7 +35481,7 @@ /area/rnd/outpost/xenobiology/outpost_hallway) "uIv" = ( /obj/machinery/newscaster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_breakroom) "uIy" = ( /obj/structure/cable/green{ @@ -36246,7 +35496,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "uIN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -36349,8 +35599,7 @@ /obj/machinery/camera/network/medbay{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24; pixel_y = -8 }, @@ -36384,6 +35633,28 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 28 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"uKP" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/camera/network/tether{ + dir = 1 + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uLM" = ( @@ -36437,7 +35708,7 @@ icon_state = "1-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "uMw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -36470,7 +35741,7 @@ dir = 8; pixel_x = 10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_breakroom) "uNE" = ( /obj/structure/table/bench/wooden, @@ -36539,6 +35810,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/surgeryroom2) +"uQE" = ( +/obj/structure/grille, +/obj/structure/railing, +/turf/simulated/floor/tiled/techmaint, +/area/hallway/primary/fore) "uQH" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ @@ -36562,8 +35838,11 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/camera/network/tether, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "uRH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -36593,11 +35872,31 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "uSt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) +"uSB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "uSK" = ( /obj/machinery/door/airlock{ id_tag = "bathroomlock17"; @@ -36614,7 +35913,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "uTj" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/chemistry) "uTk" = ( /turf/simulated/shuttle/floor/black, @@ -36684,7 +35983,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -36789,6 +36087,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uYD" = ( @@ -36811,10 +36110,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "uZM" = ( @@ -36883,6 +36179,15 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"vcu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "vcz" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -36930,7 +36235,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "vdV" = ( /obj/machinery/optable, /obj/machinery/oxygen_pump/anesthetic{ @@ -37033,8 +36338,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "vgh" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/borderfloor{ @@ -37062,10 +36366,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28; +/obj/machinery/power/apc/west_mount{ req_access = list(); req_one_access = list(11,67) }, @@ -37123,13 +36424,12 @@ dir = 8; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment) "viC" = ( /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -37151,7 +36451,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "vjk" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -37161,7 +36461,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "vkE" = ( /obj/structure/table/steel, /obj/item/paper_bin{ @@ -37197,11 +36497,8 @@ /turf/simulated/floor/wood, /area/library) "vmd" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -37211,7 +36508,7 @@ "vmJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "vmO" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -37265,7 +36562,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "vnI" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/borderfloor, @@ -37299,8 +36596,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"vqr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "vqw" = ( /obj/structure/curtain/open, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) "vrb" = ( @@ -37331,31 +36642,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) -"vtr" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/shuttle_pad) "vud" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "hop_office" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ - dir = 1 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hop_office" +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hop) +/turf/simulated/floor/plating/eris/under, +/area/shuttle/tourbus/cockpit) "vuf" = ( /obj/structure/table/marble, /obj/effect/floor_decal/corner/grey/diagonal, @@ -37380,6 +36677,12 @@ /obj/structure/bed/chair/sofa/brown/left, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) +"vuW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "vvl" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -37497,11 +36800,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "vzq" = ( @@ -37539,11 +36838,7 @@ /area/crew_quarters/heads/hop) "vzP" = ( /obj/structure/table/woodentable, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light/small{ dir = 1 }, @@ -37582,26 +36877,8 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "vBf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) "vBN" = ( @@ -37613,8 +36890,7 @@ dir = 4 }, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/camera/network/civilian{ @@ -37640,7 +36916,7 @@ /area/rnd/outpost/xenobiology/outpost_north_airlock) "vCM" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_breakroom) "vCX" = ( /obj/structure/disposalpipe/segment{ @@ -37741,11 +37017,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -37813,6 +37085,27 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"vGn" = ( +/obj/structure/disposalpipe/segment, +/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/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "vGG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -37845,17 +37138,6 @@ }, /turf/simulated/floor/wood, /area/library) -"vHn" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_two_ex" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "vHt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -37918,6 +37200,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "vJD" = ( @@ -37925,7 +37210,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "vJL" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -37952,14 +37237,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "vKj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -37971,7 +37250,8 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) "vKk" = ( @@ -38105,9 +37385,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "vNK" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/hallway/lower/third_south) "vOL" = ( @@ -38181,11 +37459,7 @@ /obj/item/lightreplacer, /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -38203,6 +37477,9 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) +"vRi" = ( +/turf/simulated/open, +/area/tether/elevator) "vRx" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -38248,17 +37525,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vRG" = ( -/obj/machinery/station_map{ - pixel_y = 32 +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "vRI" = ( @@ -38318,7 +37595,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "vSZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/lobby) "vTc" = ( /obj/effect/floor_decal/borderfloor, @@ -38371,6 +37648,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) +"vTN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "vTX" = ( /obj/structure/bed/chair/wood{ dir = 4 @@ -38424,19 +37714,6 @@ }, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) -"vVx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall, -/area/tether/surfacebase/medical/storage) "vVO" = ( /obj/machinery/door/window/westright{ req_one_access = list(35,28) @@ -38576,7 +37853,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "vXj" = ( /obj/structure/toilet{ dir = 8 @@ -38626,6 +37903,24 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"vXY" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "vYa" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -38663,7 +37958,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "wan" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -38827,11 +38122,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "wdG" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -38946,10 +38238,7 @@ /turf/simulated/wall/shull, /area/shuttle/tourbus/general) "wiD" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) @@ -38995,8 +38284,7 @@ /obj/random/maintenance/medical, /obj/random/maintenance/clean, /obj/random/junk, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/techfloor{ @@ -39036,13 +38324,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) -"wkI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/crew_quarters/pool) "wlz" = ( /obj/structure/table/standard, /obj/item/toy/plushie/coffee_fox, @@ -39058,7 +38339,7 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "wlQ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/bridge_hallway) "wmp" = ( /obj/effect/floor_decal/spline/plain{ @@ -39066,15 +38347,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"wmP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "wmQ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -39137,29 +38409,37 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "woS" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, -/area/crew_quarters/recreation_area) +/area/rnd/outpost/xenobiology/outpost_hallway) "woW" = ( /obj/machinery/door/airlock/multi_tile/glass{ id_tag = "MedbayTriage"; name = "Medbay Airlock"; req_one_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "wpb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "DRAMATIC"; + name = "Dramatic Blast Door" + }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "Druma"; + name = "Entertainment Shutters" + }, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, -/area/crew_quarters/recreation_area) +/area/tether/surfacebase/entertainment) "wpq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -39345,7 +38625,7 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "wwu" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -39391,7 +38671,6 @@ pixel_y = -5 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 27 }, /turf/simulated/floor/tiled/dark, @@ -39437,8 +38716,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -39465,6 +38743,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "wyd" = ( @@ -39479,7 +38760,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -39512,20 +38792,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "iaar"; + name = "iaar" + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) -"wyL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) "wyP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -39542,7 +38814,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "wyT" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -39592,7 +38864,7 @@ /area/rnd/outpost/xenobiology/outpost_stairs) "wAK" = ( /obj/machinery/oxygen_pump/anesthetic, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/surgery2) "wAO" = ( /obj/machinery/light, @@ -39658,19 +38930,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "wCJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "wCO" = ( @@ -39826,21 +39086,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "wEu" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/techfloor_grid, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "wEA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -39864,7 +39112,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "wGd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -40008,19 +39256,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"wMQ" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "booth_one" - }, -/obj/structure/window/reinforced/polarized{ - id = "booth_two" - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "wNv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40068,7 +39303,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -40159,16 +39393,15 @@ /turf/simulated/floor, /area/bridge/bridge_hallway) "wRT" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "saunatint" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "saunatint"; + name = "saunatint" }, /turf/simulated/floor/plating, /area/triumph/surfacebase/sauna) "wSi" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) "wSx" = ( /obj/structure/disposalpipe/segment{ @@ -40184,19 +39417,10 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "wTy" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_two" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) +/turf/simulated/wall/prepainted/civilian, +/area/tether/surfacebase/north_stairs_three) "wUb" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -40272,16 +39496,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "wVV" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -40348,7 +39569,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "wXY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/surgeryroom1) "wZv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -40393,7 +39614,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "xaf" = ( /obj/structure/sign/nosmoking_1{ pixel_x = 32 @@ -40412,11 +39633,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "xag" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -40526,7 +39743,7 @@ /obj/item/clothing/under/swimsuit/stripper/captain, /obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "xfq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -40572,18 +39789,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"xgL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xhp" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -40626,12 +39831,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "xiL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "xiZ" = ( @@ -40651,7 +39855,7 @@ /obj/structure/curtain/open/shower, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "xjq" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -40756,8 +39960,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/techfloor, @@ -40776,11 +39979,23 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "xnO" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) @@ -40792,7 +40007,6 @@ }, /obj/machinery/door/blast/shutters{ id = "kitchen2"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/structure/cable/green{ @@ -40972,11 +40186,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "xsC" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/camera/network/medbay{ @@ -41089,8 +40308,7 @@ dir = 8; pixel_x = -12 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -41187,8 +40405,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/status_display{ @@ -41214,23 +40431,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) -"xyG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/camera/network/tether, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xyK" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -41239,7 +40439,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "xyZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -41254,17 +40454,6 @@ dir = 1 }, /area/tether/surfacebase/shuttle_pad) -"xzF" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "xzG" = ( /obj/structure/bed/chair/office/dark, /obj/machinery/button/remote/blast_door{ @@ -41342,7 +40531,7 @@ dir = 8; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment/backstage) "xBW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -41351,9 +40540,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "xCi" = ( @@ -41376,6 +40562,9 @@ dir = 4 }, /obj/structure/disposalpipe/junction, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xCJ" = ( @@ -41395,7 +40584,7 @@ dir = 8; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lobby) "xCK" = ( /obj/structure/railing{ @@ -41405,11 +40594,7 @@ /area/tether/surfacebase/outside/outside3) "xCM" = ( /obj/structure/table/standard, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -41434,10 +40619,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) "xDq" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cafeteria) "xDt" = ( @@ -41502,6 +40684,28 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) +"xGb" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "xGi" = ( /obj/structure/table/steel, /obj/effect/floor_decal/borderfloor{ @@ -41521,10 +40725,7 @@ pixel_x = 28 }, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "xGm" = ( @@ -41564,7 +40765,7 @@ dir = 1; pixel_y = -4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "xHR" = ( /obj/structure/bed/chair{ @@ -41581,26 +40782,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"xHU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xIc" = ( /obj/effect/shuttle_landmark{ base_area = /area/tether/surfacebase/shuttle_pad; @@ -41634,11 +40815,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/air_alarm{ dir = 8; pixel_x = 24 @@ -41670,7 +40847,7 @@ pixel_x = -32 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "xIU" = ( /obj/structure/closet/secure_closet/hop2, /turf/simulated/floor/tiled, @@ -41714,10 +40891,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "xKc" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -41780,14 +40954,8 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "xKF" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one_ex" - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "xKJ" = ( @@ -41831,11 +40999,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "xLS" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "xMN" = ( @@ -41883,13 +41047,30 @@ /area/rnd/robotics) "xOd" = ( /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) +"xOe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "xOq" = ( /obj/structure/railing{ dir = 4 @@ -41912,38 +41093,24 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"xPq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/cockpit) "xPD" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/research_storage) +"xPN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "xQe" = ( /obj/machinery/light_switch{ pixel_y = 25 @@ -42020,7 +41187,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "xRh" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -42073,15 +41240,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) -"xRZ" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "xSf" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -42117,7 +41275,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "xSZ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/botanystorage) "xTf" = ( /turf/simulated/floor/tiled/freezer, @@ -42145,12 +41303,6 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass, /area/hydroponics) -"xUY" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/rnd/robotics) "xVm" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -42172,7 +41324,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "xVK" = ( /obj/machinery/air_alarm{ dir = 1; @@ -42246,6 +41398,21 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) +"xXs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "xXz" = ( /obj/machinery/papershredder, /obj/machinery/air_alarm{ @@ -42255,7 +41422,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "xYd" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/hallway/lower/third_south) "xYk" = ( /obj/effect/floor_decal/borderfloor{ @@ -42303,6 +41470,16 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) +"xZh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "xZr" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -42361,11 +41538,15 @@ /area/tether/surfacebase/medical/lobby) "yaJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/bridge) "yaQ" = ( @@ -42447,18 +41628,15 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "yeu" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "surfsurgery2" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "surfsurgery1"; + name = "surfsurgery1" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/surgery1) "yeM" = ( @@ -42472,21 +41650,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "yeV" = ( -/obj/effect/floor_decal/corner/blue/diagonal, -/obj/effect/floor_decal/corner/blue/diagonal{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted/command, /area/tether/surfacebase/surface_three_hall) "ygq" = ( /obj/structure/bed/chair{ @@ -42516,11 +41680,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "yhk" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ icon_state = "0-2" }, @@ -42562,7 +41722,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "yja" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/barbackmaintenance) "yjc" = ( /obj/machinery/atmospherics/portables_connector, @@ -42575,15 +41735,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "yjJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) "ykw" = ( @@ -42635,19 +41788,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"yli" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/servicebackroom) +/area/hallway/primary/starboard) "ylC" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -58994,14 +58135,14 @@ eGm eGm eGm eGm -pWq +nUF acY gXn gXn gXn gJl acY -tHu +nUF eGm eGm eGm @@ -59187,16 +58328,16 @@ eGm eGm eGm eGm -pWq -uSt +nUF +nUF bBs lmj bGG bGG bGG mnI -uSt -tHu +nUF +nUF eGm eGm eGm @@ -59380,8 +58521,8 @@ eGm eGm eGm eGm -pWq -uSt +nUF +nUF uNE bGG hGp @@ -59390,8 +58531,8 @@ eYA vwj bGG uNE -uSt -tHu +nUF +nUF eGm eGm eGm @@ -59590,7 +58731,7 @@ acY rdR rdR rdR -ptF +eiE eGm eGm eGm @@ -59767,7 +58908,7 @@ eGm eGm eGm eGm -pbQ +nUF gXn bGG hGp @@ -59784,7 +58925,7 @@ uSt asD eQZ mdi -mMi +rdR eGm eGm eGm @@ -59961,7 +59102,7 @@ eGm eGm eGm eGm -pbQ +nUF bGG bGG qkm @@ -59978,7 +59119,7 @@ dUJ mnm jPV mjl -mMi +rdR eGm eGm eGm @@ -60012,23 +59153,23 @@ eGm eGm eGm iQH -qtf -qtf -qtf +woS +woS +woS bPa -pNf +woS iQH iQH -pNf +woS iQH iQH -pNf +woS bPa iQH -pNf +woS iQH iQH -pNf +woS iQH wSi sku @@ -60155,7 +59296,7 @@ eGm eGm eGm eGm -pbQ +nUF gXn bGG xiZ @@ -60171,8 +59312,8 @@ bGG uSt xyK xVw -pIo -mMi +qlX +rdR eGm eGm eGm @@ -60364,9 +59505,9 @@ gbb acY acY sZZ -mQZ -pIo -mMi +lLC +qlX +rdR eGm eGm eGm @@ -60544,8 +59685,8 @@ eGm eGm eGm eGm -ntb -uSt +nUF +nUF uNE qkm dSp @@ -60554,13 +59695,13 @@ hQd dSp jgM uNE -uSt -gUb -ptF -jCY -mQZ -pIo -mMi +nUF +nUF +eiE +aaC +sWC +cUW +rdR eGm eGm eGm @@ -60739,21 +59880,21 @@ eGm eGm eGm eGm -ntb -uSt +nUF +nUF gNa jXN dSp oxE fHk qUf -uSt -iGh +nUF +nUF eGm -ptF -jCY -mQZ -pIo +eiE +grE +csF +svu iGE nno nno @@ -60767,7 +59908,7 @@ nno iGE iGE iGE -jSJ +nno eGm eGm eGm @@ -60792,19 +59933,19 @@ dsq nCh vWQ oNi -txY +woS iQH iQH -txY +woS iQH iQH -txY +woS iQH iQH -txY +woS iQH iQH -txY +pNf iQH wSi sku @@ -60934,20 +60075,20 @@ eGm eGm eGm eGm -ntb +nUF acY mwD dSp oxE ief acY -iGh +nUF eGm eGm -ptF +eiE jCY -mQZ -pIo +lLC +qlX iGE kSa cyk @@ -60961,7 +60102,7 @@ koO xHR pXd qKt -wkI +nno eGm eGm eGm @@ -61129,18 +60270,18 @@ eGm eGm eGm eGm -pbQ +nUF wKN vTp xwD sxw -nLZ +nUF eGm eGm eGm -ptF +eiE rNu -mQZ +lLC ppS iGE goh @@ -61323,19 +60464,19 @@ eGm eGm eGm eGm -pbQ +nUF hjX uxR afh uKN -nLZ +nUF eGm -ptF -ptF -ptF -jCY -mQZ -pIo +eiE +eiE +eiE +mkv +lLC +qlX iGE eGl jhF @@ -61347,8 +60488,8 @@ ylC ylC ylC qnf -xsp -aak +vcu +sTA iGE eGm eGm @@ -61393,7 +60534,7 @@ dOV xCK tZk tZk -mYh +orl pPF oGX wKf @@ -61518,18 +60659,18 @@ eGm eGm eGm acY -gUb -gUb -gUb -gUb +nUF +nUF +nUF +nUF acY eGm -ptF -fET -nFz +eiE +dia +uQE mgr -mQZ -pIo +lLC +qlX iGE fKu nCP @@ -61541,7 +60682,7 @@ uGX uGX uGX def -xsp +fmD koz iGE eGm @@ -61587,7 +60728,7 @@ dOV xCK tZk tZk -mYh +orl raW lCl kDF @@ -61718,12 +60859,12 @@ eGm eGm eGm eGm -ptF -ptF -ptF +eiE +eiE +eiE jCY -mQZ -pIo +lLC +qlX iGE fEl nCP @@ -61735,9 +60876,9 @@ uGX uGX uGX def -xsp -aak -wkI +kio +iRU +nno eGm eGm eGm @@ -61917,7 +61058,7 @@ chu vde poQ svq -pIo +qlX iGE gaD nCP @@ -61931,7 +61072,7 @@ uGX def xsp iYo -wkI +nno eGm eGm eGm @@ -61955,7 +61096,7 @@ oNi jlw sqA iUp -oNi +tPI tcL tcL tcL @@ -61989,8 +61130,8 @@ ftd ftd ftd ftd -icv -icv +trH +trH sge sge sge @@ -62111,7 +61252,7 @@ gpz gpz wVQ hUG -fVH +cUW iGE swW sfv @@ -62123,9 +61264,9 @@ mqX uGX uGX def -xsp -aak -wkI +lkI +sTA +nno eGm eGm eGm @@ -62305,7 +61446,7 @@ wxz rIK lZk rYq -pIo +qlX fGn sch mOE @@ -62511,8 +61652,8 @@ iXH iXH iXH oWp -xsp -aak +nJJ +iRU iGE eGm eGm @@ -62523,7 +61664,7 @@ eGm eGm eGm eGm -qRK +iXC eDq nlp oIR @@ -62717,7 +61858,7 @@ eGm eGm eGm eGm -qRK +iXC aVY aBU aVv @@ -62901,7 +62042,7 @@ mMS wxR xsp aak -wkI +nno eGm eGm eGm @@ -62911,7 +62052,7 @@ eGm eGm eGm eGm -qRK +iXC aVY xDw wKZ @@ -63080,7 +62221,7 @@ rxv rxv icq tNs -mQZ +lLC kYg fGn sch @@ -63095,7 +62236,7 @@ iUE aCO lwe jpm -wkI +nno eGm eGm eGm @@ -63275,7 +62416,7 @@ eDm rav nQW pyq -ptJ +rcv fGn phm fDc @@ -63287,9 +62428,9 @@ oCZ oCZ eIH oCZ -oCZ +jbX krE -wkI +nno eGm eGm eGm @@ -63299,7 +62440,7 @@ eGm eGm eGm eGm -qRK +iXC qYQ bWr njK @@ -63481,7 +62622,7 @@ pjS pjS fgV nUb -nUb +caX qKd iGE eGm @@ -63493,7 +62634,7 @@ eGm eGm eGm eGm -qRK +iXC cBT hAe pia @@ -63662,7 +62803,7 @@ wyx tmP ojn ixe -mQZ +lLC lRG iGE jjJ @@ -63687,7 +62828,7 @@ eGm eGm eGm eGm -qRK +iXC jlL tyA vNz @@ -63844,8 +62985,8 @@ jjc jjc eGm eGm -gtb -gtb +bXW +bXW ktH mwl mjp @@ -63856,12 +62997,12 @@ cil urA ojn ixe -mQZ +lLC gjx jga jga kal -woS +jUo jUo jga jga @@ -64035,10 +63176,10 @@ eGm wCJ cdW cdW -hzl +wCJ eGm eGm -gtb +bXW tKN oUs esZ @@ -64050,7 +63191,7 @@ nAv lnJ ojn ixe -mQZ +lLC mDw jga dox @@ -64070,7 +63211,7 @@ lGR nsK kLX eGm -pTs +aPp rUN mec gTd @@ -64229,7 +63370,7 @@ eGm wCJ cdW cdW -hzl +wCJ eGm eGm onk @@ -64244,9 +63385,9 @@ rwX wwA mjp efK -mQZ -ptJ -wpb +lLC +rcv +jUo vng fJn sWW @@ -64254,9 +63395,9 @@ sWW sWW dsW jga -jCY -uAE -ptJ +vTN +kpP +fEb kLX dRa svR @@ -64414,12 +63555,12 @@ eCd dOV lig lig -aDh -aDh +iLn +iLn lig lig -aDh -aDh +iLn +iLn lig ibF tvs @@ -64440,7 +63581,7 @@ mjp ssL msB eLl -wpb +jUo vng fJn saM @@ -64449,7 +63590,7 @@ sWW rLQ jga euI -uAE +kpP goa kLX srU @@ -64458,11 +63599,11 @@ mlK mCi kLX ebZ -pTs +aPp cyg -laF -mxc -laF +qOl +xPD +qOl ugX aPa eZH @@ -64620,7 +63761,7 @@ fBe jjc eGm eGm -gtb +bXW jrG tst xYT @@ -64629,12 +63770,12 @@ baD mBG jjc jJP -ixt -gqL +tTD +eiE ixe -szv -ptJ -wpb +kwu +rcv +jUo pou oGT sII @@ -64652,30 +63793,30 @@ kLX kLX kLX ebZ -laF -mxc -laF +qOl +xPD +qOl lYH -laF +qOl rxk xPD ovU -hlG +ovU rRU rRU aNo -eLe +naT rRU -hlG +ovU hfy eGb hfy aji aji aji -hvH +cjB atk -hvH +cjB aji tVj buX @@ -64826,16 +63967,16 @@ jjc jjc jjc atb -mQZ -ptJ -wpb +lLC +rcv +jUo hNm xnN rAh atT tqE rQN -wpb +jUo kAc rsS gXX @@ -64846,7 +63987,7 @@ emv dBV kLX ebZ -laF +qOl cfV oAM ddX @@ -64864,7 +64005,7 @@ rRU jDv qEF nin -hvH +cjB ihU pbe mPJ @@ -65020,8 +64161,8 @@ hKU dCm iTb ixe -mQZ -ptJ +lLC +rcv fYm fYm fYm @@ -65030,8 +64171,8 @@ lnO fYm fYm fYm -lHP -rsS +oKU +ayH cCP kLX kLX @@ -65214,7 +64355,7 @@ sGG wqG iTb ixe -mQZ +lLC toN fYm aoi @@ -65227,19 +64368,19 @@ fYm dMR rsS mWf -kTG -kTG +qZH +qZH pTP xIP xab -ptF +cyt ebZ xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU oKJ @@ -65252,7 +64393,7 @@ rRU rUm uBv alz -hvH +cjB dRD bLy okS @@ -65417,23 +64558,23 @@ mVp mqy ioa ioa -thn +wRT qrK hWS viJ -quY -quY -quY +vuW +vuW +vuW bgf fXS lSR qKD xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU liW @@ -65602,32 +64743,32 @@ jqH grq iTb cWI -mQZ +lLC dof -thn +wRT oVf hEs hEs dnv jsD ioa -thn +wRT loZ bCo bJR rJK guH jlJ -uAE +kpP bvv -mMi +aVN eGm xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU mcx @@ -65636,7 +64777,7 @@ hLU aTi abl xTg -hlG +ovU gTl rZl gzn @@ -65770,7 +64911,7 @@ tZk tZk eCd dOV -iQo +jsE kBT biu fMk @@ -65796,9 +64937,9 @@ sfU fEA iTb cWI -mQZ +lLC dof -thn +wRT qUY oCa oCa @@ -65806,22 +64947,22 @@ hwy jsD czU fYm -kLX -kLX +fYm +fYm pfB -kLX -kLX +fYm +fYm pjT -kiZ +fZp bvv -ptF +cyt eGm xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU gCz @@ -65830,7 +64971,7 @@ pDh lhr xOF pYM -hlG +ovU pDv hQK jVq @@ -65964,7 +65105,7 @@ tZk tZk eCd dOV -iQo +jsE aeX aeX cDH @@ -65990,9 +65131,9 @@ jjc jjc jjc aDw -mQZ +lLC dof -thn +wRT qUY oCa oCa @@ -66004,11 +65145,11 @@ bww iqT uMd xfd -kLX +fYm lHP -kiZ +fZp bvv -mMi +cyt eGm xYd nvV @@ -66018,13 +65159,13 @@ rZS aGP nvV ovU -iEl +rRU nzV naT -hlG +ovU wNL xxk -hlG +ovU nBx fgY kwQ @@ -66042,7 +65183,7 @@ ogT txP sXR bkm -awl +fXg eGm eGm eGm @@ -66184,9 +65325,9 @@ xdQ xiE jjc cWI -mQZ +lLC dof -thn +wRT mmE aGv aGv @@ -66198,32 +65339,32 @@ gVl vmJ mLa aZM -kLX +fYm dna -kiZ +fZp bvv -mMi -eGm -gJU -gJU -gJU +cyt +pbQ +xYd +xYd +mNm vRG qUG oIl nQz -hlG +ovU dXD hha uUq -hlG -hlG +ovU +ovU bTM -hlG +ovU mit gwF mit aji -xUY +cjB hrH aji ogT @@ -66236,7 +65377,7 @@ ogT qAc ghn pbi -awl +fXg eGm eGm eGm @@ -66352,7 +65493,7 @@ tZk tZk eCd dOV -iQo +jsE mcm aeX xJf @@ -66378,30 +65519,30 @@ qoC fYO jjc vnr -szv +kwu koF fYm -thn wRT -fYm -fYm -fYm -fYm -fYm +wRT +qRK +qRK +qRK +qRK +qRK kmn -sTA +its cUL sYI -kLX -oKU -saK +fYm +qWc +vqr ntl -ptF -eGm -eGm -eGm -gJU -mra +vXY +flb +xGb +flb +jjy +pXZ pXZ qpO kNe @@ -66430,7 +65571,7 @@ ogT gXm raD wux -awl +fXg eGm eGm eGm @@ -66572,31 +65713,31 @@ aAI vIi jjc uim -szv -ptJ +kwu +rcv mLF fID yef -mLF +wTy xmn ckD hAs -mLF +wTy wvZ cmk lHr roN -kLX +fYm ocA -kiZ -bvv -mMi -eGm -eGm -eGm -bce -prv -cbM +kiy +xPN +xZh +kXp +jcG +nmQ +nmQ +nmQ +oMt oFU xtM oua @@ -66624,7 +65765,7 @@ ogT nPA ilA gsJ -awl +fXg eGm eGm eGm @@ -66740,7 +65881,7 @@ tZk tZk eCd dOV -iQo +jsE aeX aeX vch @@ -66750,14 +65891,14 @@ aeX wuK skn kni -kni +obH qXw -kni -kni +obH +obH gXO gXO rhs -kni +obH tMU xtX vWs @@ -66766,7 +65907,7 @@ soK lGw eGW cWI -mQZ +lLC mDw mLF ssc @@ -66775,24 +65916,24 @@ sAa bNt hLT mGO -mLF +wTy dSJ iIJ iIJ xjn -kLX +fYm uRE -uAE -bvv -mMi -eGm -eGm -eGm -bce -xyG -jsx +xXs +dYS +tLw +jqi +oDX +pPL +rZE +pXZ +pXZ fvy -odE +vGn mMd odE wDK @@ -66818,7 +65959,7 @@ ogT pWy del eby -cfz +fXg eGm eGm eGm @@ -66934,7 +66075,7 @@ tZk tZk eCd dOV -iQo +jsE ixZ aeX lXI @@ -66951,7 +66092,7 @@ gjP gSM gSM eBk -kni +obH jUv vRK vSZ @@ -66960,33 +66101,33 @@ tLW vSZ vSZ cWI -szv -ptJ +kwu +rcv mLF pVi jwJ -mLF +wTy szw -mLF -mLF -mLF -ptF -ptF -ptF -ptF -kLX +wTy +wTy +wTy +fYm +fYm +fYm +fYm +fYm dIO -uAE +xXs bvv -ptF -eGm -eGm -eGm -gJU -mVM +xYd +xYd +dBm +mtC +coV +rkU rkU etf -ucY +kJa ucY ucY ucY @@ -67013,12 +66154,12 @@ mKW mKW mKW mKW -aMc -aMc +fGZ +fGZ oVB oVB -aMc -aMc +fGZ +fGZ oVB eGm eGm @@ -67129,12 +66270,12 @@ tZk eCd dOV skn -mDR -mDR +jsE +jsE skn skn -mDR -mDR +jsE +jsE skn skn vcA @@ -67145,7 +66286,7 @@ gnm qub unR jct -kni +obH kWn uIN lxc @@ -67154,8 +66295,8 @@ uou xjq idP cWI -szv -ptJ +kwu +rcv xYX ybN cPg @@ -67169,18 +66310,18 @@ cFx dEh ptF nrO -lHP -uAE +sDD +xXs iGD -ptF -gJU -gJU -gJU -gJU -xHU -rkU -iwI -ucY +xYd +gpp +ggC +tCR +tCR +pOp +pOp +tCR +tCR rhH jIV kVB @@ -67213,7 +66354,7 @@ sxj clX clX uww -pru +fGZ eGm eGm eGm @@ -67339,7 +66480,7 @@ kPZ qcH gQS knX -kni +obH cCG bnm mwt @@ -67363,18 +66504,18 @@ dgz ixt ptF nav -lHP -uAE +sDD +xXs bvv -ptF -gJU -gJU -pJQ -sMZ -rPD -xgL +xYd +gpp +ggC +tCR bAz -ucY +bAz +bAz +bAz +tCR kFH oRO jPA @@ -67407,7 +66548,7 @@ dUy dUy dUy sDa -pru +fGZ eGm eGm eGm @@ -67533,7 +66674,7 @@ qHD hWH unR pkL -kni +obH mwz uIN iVh @@ -67560,15 +66701,15 @@ ptF kSN opq nUm -ptF -gJU -gJU -gJU -gJU -ehm -jps -cUn -ucY +xYd +xYd +dBm +tCR +bAz +bAz +bAz +bAz +tCR suk vQT pXe @@ -67592,9 +66733,9 @@ apy gMY gMY kFx -gwU -gwU -gwU +jiE +jiE +jiE kFx rNN xKJ @@ -67727,14 +66868,14 @@ kPZ qcH unR dvp -kni +obH bsL sgl cLp eCh bqu kaB -idP +bEK mPw mQZ jbP @@ -67756,13 +66897,13 @@ gqY osB kTG wyc -pTP -kTG -dFK -jDg -mWU -fBy -ucY +eST +tCR +bAz +bAz +bAz +bAz +tCR ucY oYS ucY @@ -67795,7 +66936,7 @@ kFx wix dUy sDa -pru +fGZ eGm eGm eGm @@ -67912,7 +67053,7 @@ eGm eGm eGm eGm -kni +obH kXU hTk nad @@ -67921,7 +67062,7 @@ ael fxp unR dvp -kni +obH jBR dZl teQ @@ -67935,28 +67076,28 @@ quY iHe iHe nWd -asJ -asJ +iMe +nrV asJ asJ pvn -asJ +iMe aUe iHe iHe iHe -iHe +qul xCs -iHe -iHe -iHe -iHe -iHe -tRx -wmP -rxn -fBy -fyE +kAD +gJC +lWD +ixf +tCR +bAz +bAz +bAz +bAz +tCR lrz nRX wyX @@ -67975,7 +67116,7 @@ vTc vNK bRe dUy -xPq +vud ulb qCH tLK @@ -67989,7 +67130,7 @@ pvw kFx dUy sDa -pru +fGZ eGm eGm eGm @@ -68106,7 +67247,7 @@ eGm eGm eGm eGm -kni +obH qXh bHH bHH @@ -68115,7 +67256,7 @@ uUz wCO bHH paU -kni +obH tby dPO peq @@ -68129,28 +67270,28 @@ mep djL djL djL -djL -djL +nfL +iNu djL djL dKc -djL +nfL jPj dYm dYm dYm -dYm -dYm +uSB +gbq oZj iOW gzU -avT -avT -avT -cow -pAa -tYN -mpF +xOe +tCR +tCR +tCR +tCR +tCR +tCR dbL blA ncd @@ -68162,14 +67303,14 @@ sKQ lsP irW asn -mpF +gAM xgo kFC pzX -gJU +xYd pfN dUy -xPq +vud cXk jOc kmv @@ -68193,13 +67334,13 @@ eGm eGm eGm eGm -fEn -fEn -fEn +fFk +fFk +fFk akS dCa -fEn -fEn +fFk +fFk eGm tZk tZk @@ -68300,48 +67441,48 @@ eGm eGm eGm eGm -kni -kni -kni -kni -kni -kni -kni -kni -kni -kni +obH +obH +obH +obH +obH +obH +obH +obH +obH +obH vSZ vSZ vSZ rgE eTH ldD -dLp +vSZ egD uAE pIo -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -qVC -rjb +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ qVC +feZ +ehy gDK -gDK -tMF -quL +eaC +eaC +eaC xnO aeK uIO @@ -68377,7 +67518,7 @@ wUb kFx dUy sDa -pru +fGZ eGm eGm eGm @@ -68387,13 +67528,13 @@ eGm eGm eGm eGm -fEn +fFk xFl aiC tYY urJ jvn -fEn +fFk eGm eGm tZk @@ -68511,10 +67652,10 @@ rUO vSZ vSZ fKZ -cWI -uAE -pIo -uih +iIW +dPz +fVH +dyJ xMO cvC uih @@ -68530,13 +67671,13 @@ qix bPe rXR qVC -bPN -qVC -sHq -sHq -jiB -quL -szv +feZ +hfu +afv +rRX +rRX +rRX +pAa hRE tcx uOF @@ -68557,7 +67698,7 @@ rBT vNK bRe dUy -adK +awl fSk oej nmZ @@ -68571,7 +67712,7 @@ laf kFx dUy sDa -pru +fGZ eGm eGm eGm @@ -68581,13 +67722,13 @@ eGm eGm eGm eGm -fEn +fFk yhk iNx neW xLb pPW -fEn +fFk eGm eGm dPd @@ -68708,7 +67849,7 @@ nFz uEQ uAE pIo -uih +dyJ jid eUA cxl @@ -68724,15 +67865,15 @@ dVF lRy okn qVC -fza -qVC -sHq -sHq -jiB -quL +aLR +hVA +bWf +osl +crP +crl szv icz -mpF +gAM vlQ xnw aMK @@ -68748,10 +67889,10 @@ ooR ezc woF ioy -gJU +xYd shm dUy -adK +awl pSE qyS twj @@ -68775,17 +67916,17 @@ qnw qnw eGm eGm -fEn -fEn -fEn +fFk +fFk +fFk odx hoA -fEn -fEn -fEn -fEn -fEn -fEn +fFk +fFk +fFk +fFk +fFk +fFk dOV xCK tZk @@ -68902,7 +68043,7 @@ hyt eox uAE pIo -uih +dyJ gvI bxM uih @@ -68915,16 +68056,16 @@ wsX ifN oTS rYh +aDh +aDh qVC qVC qVC -diq -qVC qVC qVC qVC -vFf -szv +ono +onA adP ooR ooR @@ -68966,20 +68107,20 @@ fAU qDj iLO aZw -fEn -fEn -fEn -fEn +fFk +fFk +fFk +fFk fEn hqw uqp huc cXA -fEn +fFk tMf fhw iRo -fEn +fFk dOV xCK tZk @@ -69096,9 +68237,9 @@ hyt wWp kiZ fDw -uih -uih -uih +dyJ +dyJ +dyJ uih uih uih @@ -69109,7 +68250,7 @@ erZ pKk erZ apS -qVC +aDh gmU usS fza @@ -69160,7 +68301,7 @@ fbr apD jWP dnq -fEn +fFk bvr wEA uAe @@ -69173,7 +68314,7 @@ nkA tMf tMf tMf -fEn +fFk dOV xCK tZk @@ -69267,7 +68408,7 @@ bYs eGm eGm eGm -gAM +vBf vBf vBf ncQ @@ -69330,7 +68471,7 @@ tRQ oDC woF xpt -gJU +xYd bhB dUy dUy @@ -69354,20 +68495,20 @@ tVF apD jWP mGX -fEn +fFk hsb mbJ seJ -fEn -fEn +fFk +fFk nIU egR -fEn -fEn +fFk +fFk bws whS lOu -fEn +fFk dOV xCK tZk @@ -69461,7 +68602,7 @@ bYs eGm eGm eGm -vKj +vBf nvE qdY umH @@ -69497,7 +68638,7 @@ lME lME lME pAF -qVC +aDh rQs fza fza @@ -69514,8 +68655,8 @@ hLj ukm oXM oXM -bDc -imm +ooR +ooR tRQ pYp cwN @@ -69548,11 +68689,11 @@ fbr cLd eJF jBg -fEn +fFk ozv lem mRU -fEn +fFk bUS mKy uOa @@ -69561,7 +68702,7 @@ tqV shK iGJ eap -fEn +fFk dOV uVU tZk @@ -69652,7 +68793,7 @@ tZk xhW bYs bYs -ime +gGi gGi gGi ncQ @@ -69675,9 +68816,9 @@ wUr ons ewm hyt -ylZ -kiZ -pIo +hCm +myC +tUP gjp vCX wlQ @@ -69693,7 +68834,7 @@ kDq ffs agx xAH -fza +hzl fza ivT stW @@ -69742,20 +68883,20 @@ oCL kZp kpz eci -fEn -fEn +fFk +fFk vMR qBq -fEn +fFk rTL nrd wDg gvA -fEn -fEn -fEn -fEn -fEn +fFk +fFk +fFk +fFk +fFk dOV dOV xCK @@ -69846,7 +68987,7 @@ eCd dOV bYs bYs -bwS +gGi cHD cHD ncQ @@ -69895,7 +69036,7 @@ gvZ pjL vFf kiZ -mDw +uKP oXM jeM cgs @@ -69912,7 +69053,7 @@ tRQ xYk jXM rRQ -gJU +xYd fGZ fGZ oVB @@ -69944,13 +69085,13 @@ oPP oPP tGr bZH -fzf -fzf +loy +loy wwM mZG nAf -fzf -fzf +loy +loy dOV xCK tZk @@ -70040,7 +69181,7 @@ eCd dOV bYs bYs -bwS +gGi tjn tEa ncQ @@ -70066,10 +69207,10 @@ lsn xRh saK bcW +yeV +yeV khE -khE -khE -hhK +qqq hhK hhK hhK @@ -70079,7 +69220,7 @@ hhK hhK hhK hhK -qVC +aDh mSL iXd xyZ @@ -70138,13 +69279,13 @@ lIJ iDb tDV lIJ -fzf +loy pdv pGm pGm pGm fWG -fzf +loy dOV xCK tZk @@ -70234,7 +69375,7 @@ eCd dOV dOV dOV -bwS +gGi cHD uoL vKj @@ -70263,7 +69404,7 @@ pIo lRV mKp mQd -hhK +qqq qbk rld mcH @@ -70273,7 +69414,7 @@ qKA xXz nja eaP -qVC +aDh rlr sWP xyZ @@ -70305,11 +69446,11 @@ dQg jPH fGZ xBW -gme -oKx -gme -mjb -mjb +dLp +adK +dLp +gKL +ntb wiQ mjb gme @@ -70428,7 +69569,7 @@ wcw bYs bYs bYs -bwS +gGi uvB oIn ncQ @@ -70444,7 +69585,7 @@ hEQ ccI bfh gOY -ygY +gzG fKO fTJ hUc @@ -70457,7 +69598,7 @@ pIo net rYo vTh -hhK +qqq rVr iMv mqH @@ -70475,10 +69616,10 @@ fza wHu nER krJ -vFf -uAE -lCG -kHp +ono +saK +hty +bRh mCW mgD baa @@ -70486,7 +69627,7 @@ rLf hdG epX suh -naX +gYg rQu qEy mCW @@ -70526,7 +69667,7 @@ oih lIJ piA lIJ -fzf +loy gXZ wJt iub @@ -70622,7 +69763,7 @@ wcw bYs bYs bYs -bwS +gGi uvB nJl ncQ @@ -70651,7 +69792,7 @@ pIo lRV dHP mkH -hhK +qqq mVi jAH mNV @@ -70672,7 +69813,7 @@ iWl vFf uAE lCG -kHp +bRh koS qEy nLv @@ -70684,11 +69825,11 @@ xKk sLb qEy jsq -gEo +bRh qTX woF rBT -gJU +xYd oVB oVB oVB @@ -70720,7 +69861,7 @@ oPP shN sPw nZp -fzf +loy fJH vaz sXc @@ -70816,10 +69957,10 @@ wcw bYs bYs bYs -bwS +gGi uvB uvB -eLm +vKj kCR qlx ibT @@ -70830,10 +69971,10 @@ vRF wch fPk sBe -dxd +uTj iKi -dxd -dxd +uTj +uTj qAA tVS lAH @@ -70845,7 +69986,7 @@ pIo lRV lRV kpt -hhK +qqq xIU dWC dWC @@ -70866,7 +70007,7 @@ qVC vFf uAE lCG -kHp +bRh qEy qEy qEy @@ -70878,11 +70019,11 @@ qEy qEy qEy qEy -gEo +bRh qTX woF iCu -gJU +xYd lLy hqJ oVB @@ -70914,7 +70055,7 @@ oPP lIJ piA lIJ -fzf +loy aRe vaz sXc @@ -71010,7 +70151,7 @@ wcw bYs bYs bYs -bwS +gGi iVE cPW woW @@ -71024,13 +70165,13 @@ wwU aFf qkA rzV -dxd +uTj hYr oSf qhk qaJ sLi -dxd +uTj fET nFz oho @@ -71038,17 +70179,17 @@ kiZ pIo lRV aon -lRV -hhK -hhK +pRf +qqq +qqq +sPr +sPr +sPr +sPr +sPr sPr -vud -vud -vud -vud -vud gjh -hhK +qqq khE ixt qVC @@ -71060,7 +70201,7 @@ jiB quL uAE lCG -kHp +bRh cch jgu jgu @@ -71072,14 +70213,14 @@ fEg jgu jgu knh -gEo +bRh qTX woF rBT -gJU -gJU -gJU -gJU +xYd +xYd +xYd +xYd bor clX clX @@ -71104,11 +70245,11 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ -fzf +loy avK woN sXc @@ -71204,7 +70345,7 @@ wcw bYs bYs bYs -bwS +gGi hjV jMs mJF @@ -71224,9 +70365,9 @@ mAq bXl ohV qOH -dxd -ptF -ptF +uTj +laF +laF xsb wMM pIo @@ -71270,7 +70411,7 @@ bDc hUV qbK dbu -vNK +mYh lff lff vNK @@ -71288,8 +70429,8 @@ oVB mTf oVB oVB -aMc -aMc +fGZ +fGZ oVB eGm eGm @@ -71298,7 +70439,7 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ @@ -71398,12 +70539,12 @@ dPd scG bYs bYs -jlF -kbY -kbY -kbY +gGi +jSJ +jSJ +jSJ adV -kbY +jSJ lgG ncI yeu @@ -71412,7 +70553,7 @@ yeu ncI gZZ eOI -dxd +uTj hcG ohV fuc @@ -71421,24 +70562,24 @@ qoB xzG xZS pZi -bGk -kiZ -pIo +oeS +dPz +fVH lRV dHP lRV iDZ hhK tbv -guv -dlI -dlI -dlI -yeV +koV +koV +koV +koV +koV pGk hhK -khE -khE +yeV +yeV qVC oZC qVC @@ -71450,21 +70591,21 @@ uAE lCG bDc pmy -csX -csX +wpb +wpb bDc qBj csX dTD bDc -csX -csX +wpb +wpb bDc bDc pwx rGq xso -vNK +mYh lff lff vNK @@ -71593,7 +70734,7 @@ eGm scG bYs dPd -koV +adV exK xdt skw @@ -71636,7 +70777,7 @@ qLy wWG ljm aAs -sQl +iSf sQl sQl tkV @@ -71658,7 +70799,7 @@ nMb dAN sjh lQF -vNK +mYh lff lff vNK @@ -71679,7 +70820,7 @@ oVB tpC jtT bwd -pru +fGZ eGm eGm eGm @@ -71787,7 +70928,7 @@ eGm kFF bYs dPd -kbY +jSJ xCM aHg rCl @@ -71800,15 +70941,15 @@ cEG ncI sar iVt -dxd +uTj hsO cTu gSS fhU bHT -dxd -ptF -ptF +uTj +laF +laF uay dhE mQk @@ -71816,7 +70957,7 @@ nvP nvP nvP siH -pkN +ena pkN pkN tHF @@ -71873,7 +71014,7 @@ efG bNY jtT opJ -pru +fGZ eGm eGm eGm @@ -71981,7 +71122,7 @@ dPd kFF bYs dPd -kbY +jSJ wAK pCU oFZ @@ -71994,15 +71135,15 @@ tAV ncI uBz ilW -dxd +uTj oDf afS hKh cJs vyj -dxd +uTj fUX -ptF +laF bGk szv kuE @@ -72067,14 +71208,14 @@ oVB aIH jtT opJ -pru +fGZ eGm eGm eGm eGm eGm eGm -ocU +ois lIJ piA lIJ @@ -72175,7 +71316,7 @@ dPd kFF bYs dPd -koV +adV baW uCE mSa @@ -72188,26 +71329,26 @@ vdV ncI bhx lMk -dxd -dxd -dxd -dxd -dxd -dxd -khE +uTj +uTj +uTj +uTj +uTj +uTj +jie gRf -ptF +jie vXa -wFZ +ckf rSX -khE +faK tzD -pjB +fAs neE -pjB +fAs gsY pVR -mst +pVR ptF gRV jrd @@ -72222,28 +71363,28 @@ lqw nPb lqw tOO -rut +tOO xiL lqw xiL lqw -jAO -jAO -jAO +qsE +qsE +qsE cgW ibh bua cgW ibh -jAO -jAO +qsE +qsE lcB kiG jAO -jAO -jAO -jAO -jAO +qsE +qsE +qsE +qsE dUy pvN pvN @@ -72268,11 +71409,11 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ -fzf +loy tvl ivi sXc @@ -72369,7 +71510,7 @@ eGm kFF bYs dPd -koV +adV bNQ psg cVv @@ -72392,11 +71533,11 @@ rtZ xQS fPS ciO -szv +pPC gLd rwK eTd -pjB +fAs hRM mHM qSA @@ -72436,8 +71577,8 @@ dIC ktl qjW aSq -jAO -jAO +qsE +qsE dUy dUy dUy @@ -72452,8 +71593,8 @@ tHn kdQ klz oVB -vtr -vtr +fGZ +fGZ oVB eGm eGm @@ -72466,7 +71607,7 @@ oPP lIJ piA lIJ -fzf +loy pGm ivi sXc @@ -72562,13 +71703,13 @@ eGm eGm wcw bYs -dyJ -kbY -kbY -kbY -kbY -kbY -kbY +lqG +jSJ +jSJ +jSJ +jSJ +jSJ +jSJ ncI ncI ncI @@ -72581,7 +71722,7 @@ aZj aZj wBv siX -nSF +teO rdb uIy cCS @@ -72596,9 +71737,9 @@ gjZ jBw pDy pDy -lAa +jBw dmb -lAa +jBw lAa pFk eHz @@ -72627,16 +71768,16 @@ bFp wpz sga vwQ -jAO -jAO -jAO -jAO -jAO -oVB -oVB -oVB -oVB -oVB +qsE +qsE +qsE +qsE +qsE +cOo +cOo +cOo +cOo +cOo oVB oVB oVB @@ -72660,7 +71801,7 @@ oPP shN sPw nZp -fzf +loy fJH ivi sXc @@ -72756,7 +71897,7 @@ dPd eGm kFF bYs -bEK +lqG avu bjO uXv @@ -72784,7 +71925,7 @@ gTZ ddf eWW nbe -pjB +fAs tGv fun cev @@ -72823,7 +71964,7 @@ jbS lLi yja vun -noU +eez lYy noU jNp @@ -72854,7 +71995,7 @@ oPP ijp piA lIJ -fzf +loy gXZ mxi iub @@ -72950,7 +72091,7 @@ tZk eGm kFF bYs -bEK +lqG iSZ xIm nUc @@ -72981,7 +72122,7 @@ pjB pjB pjB wfD -jBw +mXz wVo aLn wIR @@ -73017,7 +72158,7 @@ pwv sjv mTb byv -byv +mst iIV uaC uQi @@ -73044,7 +72185,7 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ @@ -73144,7 +72285,7 @@ tZk tZk kFF bYs -gKL +lqG tFl hBf sDe @@ -73154,7 +72295,7 @@ bmE hsL qTV snx -hsL +duG imL rha caI @@ -73238,17 +72379,17 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ -fzf +loy gqr oHq rAX obJ jNQ -fzf +loy dOV xCK tZk @@ -73338,7 +72479,7 @@ tZk tZk eCd bYs -gKL +lqG eet hou tRu @@ -73348,7 +72489,7 @@ eun nUc nUc adu -vVx +unp olW fWV uMB @@ -73436,13 +72577,13 @@ oPP lIJ piA lIJ -fzf -fzf -fzf -fzf -fzf -fzf -fzf +loy +loy +loy +loy +loy +loy +loy dOV xCK tZk @@ -73532,7 +72673,7 @@ tZk tZk eCd bYs -gKL +lqG iSZ nUc nUc @@ -73547,7 +72688,7 @@ jhw wbQ kcM uMw -dMz +nlx nlx rOz fxY @@ -73726,7 +72867,7 @@ tZk tZk eCd bYs -gKL +lqG pRx uVb kBG @@ -73921,28 +73062,28 @@ tZk eCd bYs lqG -aOg -aOg -aOg -aOg -aOg +lqG +lqG +lqG +lqG +lqG oPU oPU oPU oPU oPU -ijD -ijD -ijD -ijD -ijD -ijD -ijD -ijD +fxY +fxY +fxY +fxY +fxY +fxY +fxY +fxY eQc cOu eQc -pjB +iGh ktJ lmA hbO @@ -74021,7 +73162,7 @@ qTN oPP jPP jPP -mNm +ois dOV biw tZk @@ -74121,22 +73262,22 @@ bYs bYs dPd dPd -onT +guv xLS cBN eiR -onT +guv hRu vgg mkR fBW yiU tdp -onT +guv otb lpk jwU -pjB +iGh wrI oEG hbO @@ -74215,7 +73356,7 @@ oPP oPP jPP jPP -mNm +ois dOV xCK tZk @@ -74315,22 +73456,22 @@ bYs bYs bYs dPd -onT +guv cwf pWX tns -onT +guv fnK hXb sRl hCH vpN gEL -onT +guv taq vcz fpW -pjB +iGh dVr nsl tYC @@ -74509,22 +73650,22 @@ scG bYs bYs dPd -onT +guv iwu ozw eZy -onT +guv iwu eiR utB irb eiR eiR -onT +guv bmh vcz eWa -pjB +iGh wDv pYn fuT @@ -74569,9 +73710,9 @@ fxG kLu kLu pcg -jAO -jAO -jAO +qsE +qsE +qsE uyz uyz uyz @@ -74703,7 +73844,7 @@ wcw bYs bYs dPd -onT +guv fnK aHd hYE @@ -74718,13 +73859,13 @@ oYs wUf ksc kdK -eQc -eQc -eQc -eQc -eQc -eQc -pjB +ijD +ijD +ijD +ijD +ijD +ijD +iGh wDv uSg rrx @@ -74902,13 +74043,13 @@ pDC aUW pDC onT -onT -onT -onT +guv +guv +guv but -onT -onT -onT +guv +guv +guv wnG vcz rqu @@ -74918,7 +74059,7 @@ dBH ctR sBJ wWq -eQc +ijD rrx rrx rrx @@ -74951,8 +74092,8 @@ ria ria ajK ria -jAO -jAO +qsE +qsE faf eEc eEc @@ -75102,7 +74243,7 @@ bzg ofn oaE aHM -onT +guv pea vcz lLp @@ -75146,13 +74287,13 @@ oME juI xxp fUk -jAO -pcI +qsE +vqw +vqw vqw -pcI nsR rYO -loy +rYO rYO uyz wuB @@ -75296,7 +74437,7 @@ jQd aSf dXU eWA -onT +guv pea dli bbg @@ -75306,7 +74447,7 @@ bbg bbg psA cWU -jJl +jdA prj ibQ bsX @@ -75339,12 +74480,12 @@ dlx opb pTk urz -jAO -jAO +qsE +qsE kWN jUH jUH -wMQ +nsR sGo sGo wqp @@ -75490,7 +74631,7 @@ iOA lWj gtl qgC -onT +guv vEE iuy nyB @@ -75500,7 +74641,7 @@ lLp hck kDm jdA -bXW +jdA prj bes prj @@ -75528,17 +74669,17 @@ mGk lRD xWE kCo +xKF +xKF +xKF +xKF +xKF qsE qsE -qsE -qsE -qsE -qsE -iRN rgt dcB lIH -wMQ +nsR jTz lgD bAK @@ -75684,7 +74825,7 @@ kqR tBR oSE ral -onT +guv xCi iuy lLp @@ -75693,7 +74834,7 @@ biA lLp rrA oWK -jJl +jdA xhR prj wQV @@ -75728,15 +74869,15 @@ dOV dOV dOV dOV -czh +xKF dLw ouU jrv -wMQ +nsR vuQ uHp iVo -imA +xKF dOV dOV dOV @@ -75878,7 +75019,7 @@ jmm pvf oSE vvl -onT +guv gig lwr sKX @@ -75887,7 +75028,7 @@ tvQ uDD mLY rDi -jJl +jdA uSd kev lgu @@ -75913,7 +75054,7 @@ kqq bdb bqs vOS -hAi +fDu dOV dOV dOV @@ -75922,15 +75063,15 @@ kvC kvC szm dOV -jOp xKF xKF xKF -uFq -vHn -vHn -vHn -wTy +xKF +xKF +xKF +xKF +xKF +xKF dOV eLO kvC @@ -76081,7 +75222,7 @@ xhp lLp rrA oWK -jJl +jdA uSd prj wQV @@ -76092,10 +75233,10 @@ prj hyk uhL fJV -qqq +bFS aoO -qqq -qqq +bFS +bFS pqK pqK pqK @@ -76107,7 +75248,7 @@ bdb bdb iku rLN -hAi +fDu dOV biw kvC @@ -76266,7 +75407,7 @@ jmm lqQ bLf txh -onT +guv pea tiw lLp @@ -76275,7 +75416,7 @@ lLp lLp iRw rvP -jJl +jdA rQI prj ikm @@ -76286,10 +75427,10 @@ lal hxw qFU prj -qqq +bFS oEm eaa -dcc +fDu bOj mkj duJ @@ -76298,10 +75439,10 @@ omX frL mUu eQx -dRA +fDu eaa fuz -hAi +fDu dOV xCK tZk @@ -76453,14 +75594,14 @@ dOV dOV dOV bYs -onT +guv dyy hip vyD nlz tMg fgp -onT +guv dzs tiw ygy @@ -76468,34 +75609,34 @@ tXm lLp lLp siU -jdA +nGW eQc -bXt -wyL +xSZ +yjJ bBD -wyL +yjJ xSZ yjJ bMg -mXz +yjJ lWr yjJ -qqq +bFS bsT bqs -qLn -xzF -qhL +fDu +fDu +fDu kTj uVA uVA xts fDu -xzF -xRZ +fDu +fDu bqs maE -hAi +fDu dOV xCK tZk @@ -76647,14 +75788,14 @@ kvC kvC szm bYs -onT -onT -onT -onT -onT +guv +guv +guv +guv +guv wEu -onT -onT +guv +guv xCi lLp lLp @@ -76662,9 +75803,9 @@ lLp lLp lLp usi -jJl +nGW dOV -obH +uDV oqa eGZ ugQ @@ -76674,7 +75815,7 @@ hLZ kaq jko oRr -qqq +bFS vKs rFM kBl @@ -76689,7 +75830,7 @@ wwG wwG wwG jCu -hAi +fDu dOV xCK tZk @@ -76848,7 +75989,7 @@ gWY gWY tuh bYs -jJl +nGW kFn hTs qIn @@ -76856,9 +75997,9 @@ csz xrg hLe bwH -jJl +nGW dOV -obH +uDV aDG iNJ fxy @@ -76868,8 +76009,8 @@ qYU qZj nyb mEK -qqq -qqq +bFS +bFS oVJ bqs bqs @@ -77042,28 +76183,28 @@ rnj qWk lxQ bYs -fFk -fAs -fAs -fAs -fAs -fAs -fAs -fAs +nGW +nGW +nGW +nGW +nGW +nGW +nGW +nGW nGW dOV -obH +uDV xvH nLY kvq -cOo +yjJ fXX qYU nZm vDg sGB ddu -qqq +bFS qkn mxM ykO @@ -77076,7 +76217,7 @@ cOU pAw jJJ lFD -uyO +fDu dOV dOV xCK @@ -77246,30 +76387,30 @@ dOV dOV dOV dOV -obH +uDV gyl aIw hAD -cOo +yjJ oML qYU gxR wwu qYU bhO -qqq -qqq bFS -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli +bFS +bFS +fDu +fDu +fDu +fDu +fDu +fDu +fDu +fDu +fDu +fDu bFS dOV biw @@ -77440,11 +76581,11 @@ kvC kvC ail dOV -obH +uDV nTo aIw sKb -cOo +yjJ uiX qYU vzy @@ -77453,7 +76594,7 @@ usU oSY fWO mOi -obH +uDV dOV dOV dOV @@ -77634,11 +76775,11 @@ tZk tZk eCd dOV -obH +uDV tPS bKH euf -cOo +yjJ nTo qYU qYU @@ -77647,7 +76788,7 @@ qYU lPs lPs aMa -obH +uDV dOV biw kvC @@ -77829,9 +76970,9 @@ tZk eCd dOV uDV -yjJ -yjJ -yjJ +uDV +uDV +uDV xSZ icV rgg @@ -77841,7 +76982,7 @@ gMB gMB gMB akk -obH +uDV dOV xCK tZk @@ -78027,14 +77168,14 @@ dOV dOV dOV uDV -yjJ -yjJ -yjJ -yjJ -yjJ -yjJ -yjJ -yjJ +uDV +uDV +uDV +uDV +uDV +uDV +uDV +uDV xSZ dOV xCK diff --git a/maps/tether/levels/underdark.dmm b/maps/tether/levels/underdark.dmm index fe8813fbe1..0682c61267 100644 --- a/maps/tether/levels/underdark.dmm +++ b/maps/tether/levels/underdark.dmm @@ -117,11 +117,8 @@ /obj/structure/cable/green{ icon_state = "0-10" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) diff --git a/maps/triumph/engines/burn.dmm b/maps/triumph/engines/burn.dmm index 1c84d310c8..d0c94327b2 100644 --- a/maps/triumph/engines/burn.dmm +++ b/maps/triumph/engines/burn.dmm @@ -1,10 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "as" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "ay" = ( @@ -281,8 +278,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -353,10 +349,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "nN" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -551,8 +544,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, diff --git a/maps/triumph/engines/fission.dmm b/maps/triumph/engines/fission.dmm index c05f2dd9a9..ac0339e3b2 100644 --- a/maps/triumph/engines/fission.dmm +++ b/maps/triumph/engines/fission.dmm @@ -183,11 +183,7 @@ name = "Powernet Sensor - Engine Output"; name_tag = "Engine Output" }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "hO" = ( @@ -202,8 +198,7 @@ /area/engineering/engine_room) "hS" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -294,7 +289,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -327,7 +321,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterVent"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/reinforced, @@ -340,8 +333,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -401,8 +393,7 @@ /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techmaint, @@ -459,7 +450,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -555,7 +545,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -667,10 +656,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Hj" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -756,7 +742,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -881,8 +866,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_room) "Ny" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -936,7 +920,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -992,7 +975,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterVent"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/reinforced, diff --git a/maps/triumph/engines/rust.dmm b/maps/triumph/engines/rust.dmm index ce1f5183e0..fa36ecb84d 100644 --- a/maps/triumph/engines/rust.dmm +++ b/maps/triumph/engines/rust.dmm @@ -483,8 +483,7 @@ dir = 4; icon_state = "pdoor1"; id = "EngineVent"; - name = "Reactor Vent"; - p_open = 0 + name = "Reactor Vent" }, /turf/simulated/floor/reinforced, /area/engineering/engine_room) @@ -525,10 +524,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "lu" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -668,10 +664,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/engineering/engine_room) "rX" = ( @@ -782,8 +775,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/warning{ @@ -1021,11 +1013,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Ln" = ( diff --git a/maps/triumph/engines/sme.dmm b/maps/triumph/engines/sme.dmm index f827e010d3..588ddc96cb 100644 --- a/maps/triumph/engines/sme.dmm +++ b/maps/triumph/engines/sme.dmm @@ -56,7 +56,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -193,7 +192,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -278,8 +276,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -470,10 +467,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "sY" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 }, @@ -624,7 +618,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -685,7 +678,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -792,11 +784,7 @@ output_tag = "cooling_out"; sensors = list("engine_sensor"="Engine Core") }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Dv" = ( @@ -847,10 +835,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Ev" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -1052,7 +1037,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -1072,7 +1056,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/red, diff --git a/maps/triumph/levels/deck1.dmm b/maps/triumph/levels/deck1.dmm index 3fd1564b5e..6569ff4e1e 100644 --- a/maps/triumph/levels/deck1.dmm +++ b/maps/triumph/levels/deck1.dmm @@ -306,10 +306,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -764,10 +761,7 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) "cn" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/techfloor/orange{ dir = 10 }, @@ -1346,8 +1340,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -1740,8 +1733,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/red, @@ -1775,8 +1767,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -2121,8 +2112,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -2313,10 +2303,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -2447,8 +2434,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -2760,10 +2746,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "jf" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -3162,11 +3145,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/storage) "ks" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable, /turf/simulated/floor/plating, @@ -3532,11 +3512,8 @@ /area/storage/tech) "lP" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/table/rack{ dir = 8; @@ -3575,11 +3552,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/engi_engine) "lT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3879,11 +3853,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/table/rack{ dir = 8; layer = 2.6 @@ -4277,11 +4247,8 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "oE" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /obj/effect/floor_decal/techfloor/orange{ @@ -4426,8 +4393,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "pc" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -4508,8 +4474,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway/lower) "ps" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor/orange, @@ -4549,22 +4514,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/debris/cleanable/dirt, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-2" }, /turf/simulated/floor/plating, /area/storage/tech) "py" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/structure/closet/crate/bin{ anchored = 1 @@ -5129,11 +5086,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -6422,10 +6376,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -32 +/obj/machinery/power/apc/south_mount{ + cell_type = /obj/item/cell/super }, /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 2346; @@ -6608,11 +6560,7 @@ /area/engineering/engine_smes) "wf" = ( /obj/structure/closet/secure_closet/atmos_personal, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -6684,8 +6632,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -6953,11 +6900,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) "xj" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "4-8" @@ -6996,10 +6940,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -7311,10 +7252,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "yA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -7351,8 +7289,7 @@ dir = 1 }, /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -7488,10 +7425,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/workshop) "ze" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -7576,8 +7510,7 @@ /turf/simulated/wall/prepainted/engineering, /area/maintenance/trash_pit) "zy" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/table/bench/wooden, @@ -8069,11 +8002,8 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -8284,8 +8214,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor/orange{ @@ -8674,15 +8603,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shunt) "Dm" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -8776,8 +8703,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -8900,9 +8826,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) "DU" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/portables_connector{ dir = 4 }, @@ -9637,8 +9561,7 @@ /obj/item/hardsuit/ce/equipped{ req_access = list(56) }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -9746,8 +9669,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "GP" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/ladder/up, @@ -9780,10 +9702,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "4-8" }, @@ -10854,15 +10773,9 @@ name = "Engineering Hardsuits"; req_access = list(11) }, -/obj/item/hardsuit/eva/equipped{ - req_access = list(10) - }, -/obj/item/hardsuit/eva/equipped{ - req_access = list(10) - }, -/obj/item/hardsuit/eva/equipped{ - req_access = list(10) - }, +/obj/item/hardsuit/eva/equipped, +/obj/item/hardsuit/eva/equipped, +/obj/item/hardsuit/eva/equipped, /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) @@ -11057,8 +10970,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "Ll" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/computer/ship/navigation/telescreen{ @@ -11570,11 +11482,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) "MV" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11822,8 +11730,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -11878,11 +11785,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -12025,11 +11929,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/storage) "Ov" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, @@ -12304,11 +12204,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/plating, /area/maintenance/engineering) @@ -12524,11 +12421,8 @@ /turf/space, /area/space) "Qh" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -12586,10 +12480,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) "Qp" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, @@ -12707,11 +12598,7 @@ /turf/simulated/floor/tiled/hydro, /area/engineering/atmos) "QM" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -13143,11 +13030,8 @@ }, /area/tcommsat/chamber) "Sj" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-8" @@ -13685,8 +13569,7 @@ /turf/space, /area/space) "Ua" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -13710,10 +13593,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tcommsat/computer) "Ud" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -13814,11 +13694,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14048,8 +13924,7 @@ /turf/simulated/wall/prepainted/engineering, /area/engineering/engine_monitoring) "Vi" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor/orange{ @@ -14283,11 +14158,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/tiled/techmaint, /area/engineering/workshop) @@ -14413,11 +14285,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 28 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -14761,8 +14630,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor/orange, @@ -14796,15 +14664,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/engineering/hallway) -"XH" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/item/storage/briefcase/inflatable, -/obj/item/storage/briefcase/inflatable, -/turf/simulated/floor/tiled, -/area/engineering/atmos/monitoring) "XI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/carpet/blucarpet, @@ -14949,8 +14808,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -15190,11 +15048,7 @@ }, /obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) @@ -15591,8 +15445,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/engineering/hallway/lower) "ZY" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/techfloor/orange{ @@ -35325,7 +35178,7 @@ zj ZJ yp Lo -XH +YL eN vW nC diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm index 86dc404d24..eae478dc5d 100644 --- a/maps/triumph/levels/deck2.dmm +++ b/maps/triumph/levels/deck2.dmm @@ -49,8 +49,8 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "ah" = ( -/obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "ai" = ( @@ -63,11 +63,8 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "aj" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -135,8 +132,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/steeldecal/steel_decals_central6, @@ -355,7 +351,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "belter_docking"; - layer = 3.3; name = "Belting Dock Controller"; pixel_x = 24; pixel_y = 30; @@ -415,7 +410,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "bh" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bi" = ( @@ -484,10 +479,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "bp" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/civilian, /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/carpet/bcarpet, @@ -835,10 +827,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/hallway/primary/port) @@ -867,11 +856,7 @@ /obj/item/packageWrap, /obj/item/packageWrap, /obj/item/packageWrap, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -899,10 +884,7 @@ }, /obj/structure/closet, /obj/item/storage/backpack/dufflebag, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -985,11 +967,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/cargo) @@ -1117,6 +1095,7 @@ /obj/item/clothing/head/helmet/space/void/mining, /obj/item/clothing/suit/space/void/mining, /obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "de" = ( @@ -1125,7 +1104,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/door/firedoor{ @@ -1316,11 +1294,8 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 8 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -1342,10 +1317,7 @@ name = "sink"; pixel_x = 13 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 25 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "dO" = ( @@ -1456,11 +1428,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "ec" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -1599,8 +1567,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/catwalk, @@ -1788,11 +1755,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "ff" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -2073,11 +2037,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "fW" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2093,8 +2053,7 @@ "fX" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2258,8 +2217,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/triumph/surfacebase/mining_main/refinery) "gu" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor, @@ -2353,11 +2311,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "gO" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2753,11 +2707,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "ik" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /obj/structure/closet/wardrobe, @@ -2923,8 +2874,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "iF" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -3135,11 +3085,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) @@ -3205,7 +3151,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen-c"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -3266,11 +3211,7 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "jH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3377,10 +3318,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "jX" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled, @@ -3433,7 +3371,7 @@ name = "Engineering Fore External Access" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "mining_fore_airlock"; name = "exterior access button"; @@ -3578,15 +3516,13 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "kE" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/structure/table/standard, @@ -3652,10 +3588,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "kM" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3784,11 +3717,8 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "lg" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -3827,11 +3757,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "ll" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -3863,6 +3789,11 @@ /obj/machinery/computer/shuttle_control/belter{ dir = 4 }, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the belter shuttle systems, to help miners find where they left their shuttle."; + gps_tag = "BELTER"; + name = "belter beacon" + }, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "ls" = ( @@ -3978,10 +3909,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/kitchen) "lQ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 17 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -4118,8 +4046,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "mt" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -4150,10 +4077,7 @@ /turf/simulated/floor/tiled/monotile, /area/triumph/surfacebase/mining_main/eva) "mA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; @@ -4284,7 +4208,6 @@ /area/crew_quarters/freezer) "mX" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/holopad, @@ -4520,11 +4443,7 @@ /obj/structure/bed/chair/comfy/teal{ dir = 8 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_11) "nO" = ( @@ -4626,8 +4545,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "og" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/red, @@ -4659,11 +4577,7 @@ /obj/structure/mirror{ pixel_x = -28 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4702,8 +4616,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) "om" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -4755,8 +4668,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) "ox" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/door/airlock/glass, @@ -5168,7 +5080,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -5229,11 +5140,7 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "pS" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/quartermaster/foyer) @@ -5352,11 +5259,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5434,7 +5337,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen-c"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor, @@ -5613,7 +5515,7 @@ icon_state = "2-8" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "solar_dock"; name = "interior access button"; @@ -5703,7 +5605,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/recharger, @@ -5900,11 +5801,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "rI" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -5931,8 +5829,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/door/firedoor, @@ -6092,6 +5989,9 @@ "sm" = ( /obj/structure/bed/chair/shuttle, /obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/panic_button{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "sn" = ( @@ -6101,10 +6001,7 @@ "so" = ( /obj/structure/ore_box, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -6582,8 +6479,7 @@ /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -6669,7 +6565,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; - layer = 3.3; name = "Kitchen Service Shutters" }, /turf/simulated/floor/tiled/monotile, @@ -6724,8 +6619,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -6748,8 +6642,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "uf" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/undies_wardrobe, @@ -6860,8 +6753,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) "uu" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/closet/wardrobe, @@ -6878,8 +6770,7 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/triumph/surfacebase/bar_backroom) "uz" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/dark, @@ -6932,8 +6823,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "uJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -6983,10 +6873,7 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "uR" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -7071,11 +6958,7 @@ /turf/simulated/floor/airless, /area/space) "vc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7125,11 +7008,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/port) "vj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -7261,7 +7140,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel/airless, +/turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "vx" = ( /obj/machinery/light/small{ @@ -7500,10 +7379,7 @@ /area/crew_quarters/recreation_area_hallway) "wj" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -7581,11 +7457,8 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "wx" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -7650,11 +7523,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/lounge/kitchen_freezer) "wD" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -7785,7 +7655,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/door/firedoor{ @@ -8054,8 +7923,7 @@ /area/crew_quarters/freezer) "xI" = ( /obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -8108,8 +7976,7 @@ /area/maintenance/dormitory) "xQ" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/light{ @@ -8140,6 +8007,9 @@ /obj/item/stack/flag/green, /obj/item/stack/flag/yellow, /obj/item/stack/flag/red, +/obj/item/binoculars{ + pixel_y = 6 + }, /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) "xW" = ( @@ -8309,8 +8179,7 @@ "yt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/techfloor{ @@ -8350,8 +8219,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "yy" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/plating, @@ -8571,8 +8439,7 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "yZ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -8758,10 +8625,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_4) "zz" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -8852,8 +8716,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_2) "zP" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/computer/ship/navigation/telescreen{ @@ -9379,9 +9242,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "BA" = ( @@ -9455,10 +9316,7 @@ /turf/simulated/floor/tiled, /area/hydroponics) "BP" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/wardrobe, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) @@ -9613,11 +9471,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "Cr" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -9735,8 +9589,7 @@ dir = 4; pixel_y = 33 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -9781,8 +9634,7 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -9871,11 +9723,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "De" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -9915,7 +9763,6 @@ dir = 4 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /turf/simulated/floor/tiled, @@ -9988,8 +9835,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/plating, @@ -10031,11 +9877,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -10082,8 +9924,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/triumph/surfacebase/mining_main/refinery) "DR" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -10105,8 +9946,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "DV" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/closet/wardrobe, @@ -10245,8 +10085,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -10274,8 +10113,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "Eu" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -10431,8 +10269,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area_hallway) "EV" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/techfloor{ @@ -10555,10 +10392,7 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10784,11 +10618,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "Gf" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -10882,8 +10713,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "Gu" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/reagent_dispensers/beerkeg, @@ -11189,8 +11019,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/bar) "Hn" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor, @@ -11260,8 +11089,7 @@ "HB" = ( /obj/structure/table/marble, /obj/item/hand_labeler, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/item/storage/box/donkpockets, @@ -11475,7 +11303,6 @@ /area/maintenance/dormitory) "Im" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -11520,11 +11347,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/crate/bin{ anchored = 1 }, @@ -11544,8 +11367,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "IA" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -11581,8 +11403,7 @@ /turf/simulated/floor/plating, /area/triumph/surfacebase/mining_main/refinery) "IG" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/filingcabinet/chestdrawer, @@ -11881,10 +11702,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "Jy" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11916,21 +11734,14 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "JF" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/flora/pottedplant/smalltree, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) "JH" = ( @@ -12174,11 +11985,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/fiftyspawner/steel, /turf/simulated/floor/wood, @@ -12717,8 +12525,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_office) "LZ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -12907,11 +12714,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -13007,8 +12810,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "MX" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor, @@ -13087,7 +12889,7 @@ /area/crew_quarters/recreation_area) "Nl" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "mining_fore_airlock"; name = "interior access button"; @@ -13220,8 +13022,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "NA" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/closet/crate/bin{ @@ -13480,7 +13281,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13508,11 +13308,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "Ox" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -13703,8 +13499,7 @@ /area/triumph/surfacebase/mining_main/storage) "OV" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/camera/network/cargo{ @@ -13898,7 +13693,7 @@ icon_state = "1-2" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "solar_dock"; name = "exterior access button"; @@ -14030,11 +13825,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "PT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -14217,8 +14009,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "QI" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/table/rack/shelf, @@ -14471,8 +14262,7 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "Rq" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14627,8 +14417,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "RP" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/table/woodentable, @@ -14788,11 +14577,8 @@ "Si" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -14810,8 +14596,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/port) "Sl" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/recipe_lookup/drinks{ @@ -15216,6 +15001,7 @@ /area/crew_quarters/bar) "TB" = ( /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "TC" = ( @@ -15300,8 +15086,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -15376,9 +15161,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "Uc" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/landmark{ name = "blobstart" }, @@ -15480,11 +15263,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "Up" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /turf/simulated/floor/wood, @@ -15530,7 +15310,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/light{ @@ -15578,10 +15357,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "UE" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -15696,8 +15472,7 @@ /area/crew_quarters/recreation_area) "UU" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/bed/chair/sofa/black/right{ @@ -15910,6 +15685,8 @@ /area/shuttle/mining_ship/general) "Vz" = ( /obj/machinery/light, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "VA" = ( @@ -15936,8 +15713,7 @@ "VE" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/dogbed, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -16025,8 +15801,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -16133,9 +15908,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/station/stairs_two) "Wh" = ( @@ -16301,8 +16074,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -16327,8 +16099,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "WJ" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -16401,8 +16172,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "WX" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/random/trash_pile, @@ -16484,7 +16254,6 @@ "Xi" = ( /obj/machinery/conveyor_switch/oneway{ id = "mining_interior"; - layer = 3.3; name = "refining conveyor"; pixel_y = 14 }, @@ -16576,11 +16345,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/station/stairs_two) "XC" = ( @@ -16646,8 +16411,7 @@ /area/crew_quarters/sleep/Dorm_7) "XM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16686,7 +16450,6 @@ "XQ" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - layer = 3.3; pixel_y = 30 }, /turf/simulated/floor/tiled, @@ -16755,6 +16518,7 @@ /obj/item/clothing/head/helmet/space/void/mining, /obj/item/clothing/suit/space/void/mining, /obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "Yg" = ( @@ -16819,8 +16583,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -16829,19 +16592,14 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "Yu" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16883,8 +16641,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/catwalk, @@ -17308,21 +17065,14 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "ZR" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/flora/pottedplant/smalltree, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "ZU" = ( diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm index 1efc24c8de..946fdc537c 100644 --- a/maps/triumph/levels/deck3.dmm +++ b/maps/triumph/levels/deck3.dmm @@ -381,10 +381,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/table/woodentable, /obj/item/toy/plushie/kitten, /turf/simulated/floor/wood, @@ -842,8 +839,7 @@ /area/triumph/station/stairs_three) "aHX" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/flora/pottedplant/stoutbush, @@ -1134,8 +1130,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "aWr" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1513,10 +1508,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -2107,11 +2099,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/button/windowtint{ dir = 8; id = "ward_b"; @@ -2293,10 +2281,7 @@ /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/black, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/medical/resleeving) @@ -2322,8 +2307,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay3) "bYR" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2994,10 +2978,7 @@ /area/maintenance/fpmaint2) "cDC" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "cEs" = ( @@ -3049,11 +3030,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -3085,10 +3062,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_c) "cGb" = ( @@ -3112,11 +3086,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "cGu" = ( @@ -3217,10 +3187,7 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer_auxiliary) "cKJ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "cLl" = ( @@ -3241,10 +3208,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_b) "cMb" = ( @@ -3360,11 +3324,7 @@ "cRH" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3433,11 +3393,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/research) "cTS" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3535,10 +3491,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "cZD" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/triumph/station/stairs_three) "cZK" = ( @@ -4085,10 +4038,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "dzs" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light_switch{ pixel_x = 25 }, @@ -4292,7 +4242,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/multi_tile, /obj/structure/curtain/open/shower/medical, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -4300,6 +4249,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "dHN" = ( @@ -4307,10 +4257,7 @@ /area/rnd/research_foyer_auxiliary) "dIa" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/tiled, /area/rnd/storage) @@ -4531,11 +4478,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/secure_closet/medical3{ name = "surgeon's locker" }, @@ -4887,8 +4830,7 @@ /obj/item/material/knife/machete, /obj/item/clothing/accessory/holster/machete, /obj/item/clothing/accessory/permit/gun/paramedic, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/bodybag/cryobag, @@ -5290,10 +5232,7 @@ }, /obj/structure/table/steel_reinforced, /obj/item/hand_labeler, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "eyb" = ( @@ -5404,11 +5343,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -5612,11 +5547,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "eNW" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -5723,11 +5655,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5914,8 +5842,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -6732,10 +6659,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -6884,8 +6808,7 @@ /turf/simulated/floor/tiled, /area/medical/surgeryprep) "fNb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -6998,11 +6921,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "fRk" = ( @@ -7037,8 +6956,7 @@ /turf/simulated/floor/tiled, /area/medical/virology) "fRL" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/carpet/blue, @@ -7114,11 +7032,7 @@ /area/rnd/reception_desk) "fTU" = ( /obj/machinery/computer/rdconsole/core, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -7682,8 +7596,7 @@ /turf/simulated/floor/plating, /area/rnd/rdoffice) "guA" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -7710,6 +7623,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "guJ" = ( @@ -7889,10 +7803,7 @@ /obj/machinery/light{ color = "#0098c8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/medical/virologyaccess) "gCw" = ( @@ -8031,11 +7942,7 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "gJS" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -8094,11 +8001,7 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8274,8 +8177,7 @@ /turf/simulated/floor/tiled/white, /area/medical/ward) "gXK" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -8469,11 +8371,7 @@ /turf/simulated/floor/tiled/dark, /area/assembly/robotics) "hgb" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -8687,11 +8585,7 @@ }, /obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/corner/blue/diagonal, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/landmark/spawnpoint/job/medical_doctor, /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_1) @@ -8944,10 +8838,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "hwg" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -9273,8 +9164,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9343,8 +9233,7 @@ /obj/item/clothing/mask/surgical, /obj/item/storage/secure/briefcase/ml3m_pack_cmo, /obj/item/clothing/accessory/poncho/roles/cloak/cmo, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -9638,15 +9527,12 @@ /turf/simulated/floor/tiled, /area/medical/virology) "hWK" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/bed/chair{ - dir = 1 + dir = 4 }, /obj/machinery/light{ dir = 8; @@ -9818,11 +9704,7 @@ "ido" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/medical/psych_ward) "idK" = ( @@ -9870,6 +9752,9 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "ifg" = ( @@ -10023,8 +9908,7 @@ /area/rnd/research/testingrange) "iny" = ( /obj/structure/loot_pile/maint/trash, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -10150,11 +10034,7 @@ /area/rnd/rdoffice) "iry" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/table/steel_reinforced, /obj/item/storage/box/masks{ pixel_x = -7 @@ -10223,8 +10103,7 @@ /turf/simulated/floor/tiled, /area/medical/surgery2) "iuJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/closet/coffin, @@ -10261,11 +10140,7 @@ "ivK" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10523,8 +10398,7 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "iEo" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/open, @@ -10639,11 +10513,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) "iIR" = ( @@ -10911,10 +10781,7 @@ pixel_y = 6 }, /obj/item/toy/plushie/kitten, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/medical/psych/psych_2) "iVb" = ( @@ -11240,8 +11107,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -11566,11 +11432,7 @@ /area/holodeck_control) "jvO" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/research) @@ -11767,10 +11629,7 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "jBH" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11875,10 +11734,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/test_area) "jFt" = ( @@ -12482,11 +12338,7 @@ icon_state = "0-4" }, /obj/machinery/washing_machine, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/white, /area/rnd/research_restroom) "kjr" = ( @@ -12972,11 +12824,7 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "kFN" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -13027,11 +12875,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "kIf" = ( @@ -13489,10 +13333,7 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "lcw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/civilian, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13528,11 +13369,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) "leM" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) "lfj" = ( @@ -13596,11 +13433,7 @@ icon_state = "0-8" }, /obj/structure/catwalk, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "ljL" = ( @@ -13711,11 +13544,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/bed/chair/office/dark, /obj/machinery/computer/med_data/laptop{ dir = 1; @@ -13792,8 +13621,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/camera/network/medbay{ @@ -13826,11 +13654,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -13840,8 +13664,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "lsR" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/blue/diagonal, @@ -14016,10 +13839,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "lzH" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) @@ -14319,11 +14139,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -14694,7 +14510,6 @@ "mge" = ( /obj/structure/bed/roller, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, @@ -15155,10 +14970,7 @@ /turf/space, /area/space) "mDv" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -15271,10 +15083,7 @@ dir = 1 }, /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "mHV" = ( @@ -15336,11 +15145,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/fore) "mLf" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "0-2" @@ -15517,21 +15322,14 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/crate/bin{ anchored = 1 }, /turf/simulated/floor/tiled, /area/teleporter/departing) "mSd" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/triumph/station/stairs_three) "mSK" = ( @@ -15698,11 +15496,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) "mXs" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -15715,8 +15509,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -16123,10 +15916,7 @@ /area/triumph/station/stairs_three) "nrD" = ( /obj/machinery/camera/network/civilian, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/triumph/station/stairs_three) "nsd" = ( @@ -16171,10 +15961,7 @@ /area/medical/resleeving) "nvp" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -16480,11 +16267,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -16802,8 +16585,7 @@ /turf/simulated/floor/wood, /area/hallway/primary/port) "nUC" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -16973,22 +16755,14 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/assembly/chargebay) "odm" = ( /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/sink{ pixel_y = 19 }, @@ -17070,11 +16844,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/rnd/misc_lab) "ohC" = ( @@ -17251,11 +17021,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/button/windowtint{ dir = 8; id = "ward_a"; @@ -17400,7 +17166,7 @@ req_access = list(39) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -17510,11 +17276,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "oyK" = ( @@ -17855,11 +17617,8 @@ /area/medical/surgeryprep) "oMP" = ( /obj/machinery/atmospherics/portables_connector, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -18033,10 +17792,7 @@ /area/rnd/misc_lab) "oSV" = ( /obj/structure/reagent_dispensers/watertank, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/research) "oTe" = ( @@ -18086,11 +17842,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18139,10 +17891,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "oXx" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/loot_pile/maint/trash, /turf/simulated/floor/plating, /area/maintenance/research) @@ -18318,8 +18067,7 @@ dir = 8; light_range = 12 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/holopad, @@ -18356,11 +18104,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_d) "peR" = ( @@ -19082,10 +18826,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "pHm" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) @@ -19131,7 +18872,7 @@ req_access = list(39) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -19201,11 +18942,7 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_d) "pLn" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -19733,8 +19470,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "qaw" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/bed/padded, @@ -19759,11 +19495,7 @@ /turf/simulated/floor/plating, /area/rnd/misc_lab) "qdL" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/wood, /area/hallway/primary/port) @@ -20019,11 +19751,7 @@ /turf/simulated/wall/prepainted/science, /area/rnd/research_foyer_auxiliary) "qqe" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) @@ -20179,11 +19907,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/red, /obj/effect/floor_decal/borderfloorwhite{ @@ -20567,11 +20291,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20837,10 +20557,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "qSB" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/disease2/diseaseanalyser, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -21007,7 +20724,6 @@ /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_c) "qZM" = ( -/obj/machinery/computer/ship/sensors, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -21020,8 +20736,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -21116,11 +20831,7 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) "rdw" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -21326,8 +21037,7 @@ /area/medical/virologyisolation) "rnw" = ( /obj/structure/closet/l3closet/virology, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -21355,11 +21065,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "rqj" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -21599,8 +21305,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "rAp" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/random/trash, @@ -21923,8 +21628,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -22179,8 +21883,7 @@ /area/hallway/primary/aft) "rZm" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -22346,8 +22049,7 @@ /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_d) "skH" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/bed/chair/wheelchair, @@ -22355,10 +22057,12 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "skW" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/structure/curtain/open/shower/medical, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "slc" = ( @@ -22417,8 +22121,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "smf" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -22866,11 +22569,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "sGt" = ( @@ -22880,8 +22579,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "sHa" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/reagent_dispensers/watertank, @@ -22968,10 +22666,7 @@ dir = 1 }, /obj/machinery/light, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -23010,8 +22705,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "sLb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -23122,10 +22816,7 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology) "sQh" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/techfloor, /obj/structure/cable/green, /turf/simulated/floor/tiled/techfloor, @@ -23415,11 +23106,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -24097,15 +23784,10 @@ "tIc" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/corner/blue/full, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -24145,10 +23827,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "tJE" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -24191,6 +23870,9 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, +/obj/structure/panic_button{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "tLd" = ( @@ -24252,11 +23934,7 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "tNv" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -24354,8 +24032,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "tPb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -24405,11 +24082,8 @@ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) @@ -24543,11 +24217,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -24813,10 +24483,7 @@ pixel_y = 16 }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/industrial/outline/blue, /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -24949,10 +24616,7 @@ /obj/structure/table/standard, /obj/item/soap/nanotrasen, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/holodeck_control) "uon" = ( @@ -25050,10 +24714,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "uuj" = ( @@ -25131,11 +24792,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "uxB" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -25470,11 +25127,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -25782,8 +25435,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) "vcY" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/random/trash_pile, @@ -25867,18 +25519,14 @@ /turf/simulated/floor/tiled, /area/triumph/station/stairs_three) "vgT" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "vha" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/techfloor{ @@ -26061,8 +25709,7 @@ /obj/item/storage/firstaid/toxin{ pixel_y = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/blue, @@ -26109,8 +25756,7 @@ /obj/effect/floor_decal/industrial/loading{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -26296,11 +25942,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "vAo" = ( @@ -26704,11 +26346,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/triumph/station/stairs_three) "vQu" = ( @@ -26819,11 +26457,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "vVP" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26897,11 +26531,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "vYZ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26944,11 +26574,7 @@ /area/maintenance/substation/research) "wap" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "waz" = ( @@ -27348,11 +26974,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "woC" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -27461,11 +27083,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -27498,10 +27116,7 @@ /turf/simulated/floor/plating, /area/maintenance/research) "wwu" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -27555,8 +27170,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -27600,6 +27214,9 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, +/obj/machinery/computer/ship/sensors{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/cockpit) "wCL" = ( @@ -27841,10 +27458,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_d) "wLf" = ( @@ -28013,10 +27627,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "wQy" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/xenobiology) @@ -28509,10 +28120,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "xrB" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -28658,11 +28266,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/button/windowtint{ dir = 8; id = "ward_c"; @@ -29099,10 +28703,7 @@ /turf/simulated/floor/plating, /area/maintenance/research) "xOU" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/rnd/breakroom) "xOV" = ( @@ -29268,8 +28869,7 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) "xUB" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/portable_atmospherics/powered/pump, @@ -29378,11 +28978,7 @@ /area/maintenance/research) "xZy" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -29443,8 +29039,7 @@ /area/medical/sleeper) "ygh" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -29530,11 +29125,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index 3ffbae079e..e6e6ebaf63 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -149,10 +149,7 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "ahv" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -608,11 +605,7 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "awz" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -995,11 +988,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -1325,11 +1314,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/flora/pottedplant/flower, /turf/simulated/floor/wood, /area/bridge/office) @@ -1384,11 +1369,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Captain's Office" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -1420,8 +1401,7 @@ /obj/machinery/camera/network/security{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1507,8 +1487,7 @@ /obj/item/radio/intercom/department/security{ pixel_y = -24 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -2521,11 +2500,7 @@ "bKU" = ( /obj/machinery/camera/network/exploration, /obj/structure/table/bench/steel, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "bKZ" = ( @@ -2801,11 +2776,7 @@ /area/security/forensics) "bSR" = ( /obj/structure/flora/pottedplant/minitree, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/item/radio/intercom{ dir = 8; pixel_x = -24 @@ -3143,8 +3114,7 @@ "cfR" = ( /obj/structure/closet/secure_closet/security, /obj/structure/window/basic, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -3172,10 +3142,7 @@ }, /obj/machinery/iv_drip, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/exploration/medical) "cgB" = ( @@ -3186,11 +3153,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -3409,8 +3372,7 @@ /area/maintenance/security/starboard) "cpb" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -3717,8 +3679,7 @@ "cFi" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/item/reagent_containers/glass/cooler_bottle, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/corner/red{ @@ -4263,11 +4224,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4376,11 +4333,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "ddG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -4607,11 +4560,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) "dhK" = ( @@ -4858,10 +4807,7 @@ /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) "dnt" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) @@ -5185,10 +5131,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "dtN" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "dtZ" = ( @@ -5216,11 +5159,7 @@ "duF" = ( /obj/machinery/camera/network/command, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/reinforced, /obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, @@ -5378,11 +5317,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -5390,10 +5326,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/sauna) "dBP" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/central) "dCl" = ( @@ -5505,11 +5438,7 @@ /area/chapel/main) "dGi" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/porta_turret/stationary, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -5585,7 +5514,7 @@ /area/hydroponics/garden) "dIH" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "sec_shuttle_airlock"; name = "interior access button"; @@ -5828,11 +5757,7 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "dQJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5857,11 +5782,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/light{ dir = 8; light_range = 12 @@ -6184,7 +6105,7 @@ id_tag = "sec_shuttle_pump" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "sec_shuttle_airlock"; name = "exterior access button"; @@ -6851,10 +6772,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "eFy" = ( @@ -6921,11 +6839,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) @@ -7027,19 +6941,11 @@ dir = 1 }, /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/grass, /area/hydroponics/garden) "eKd" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -7128,7 +7034,6 @@ /area/crew_quarters/sleep/CMO_quarters) "eNI" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/light{ @@ -7302,8 +7207,7 @@ /turf/simulated/floor/plating, /area/shuttle/courser/cockpit) "eTm" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/dark, @@ -7512,11 +7416,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/crate/bin{ anchored = 1 }, @@ -7610,11 +7510,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -7682,11 +7578,7 @@ /area/shuttle/excursion/general) "fkf" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/CE_quarters) "fkm" = ( @@ -7958,11 +7850,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -8034,7 +7922,7 @@ /area/exploration/explorer_prep) "ftm" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "sec_shuttle_airlock"; name = "exterior access button"; @@ -8180,8 +8068,7 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -8411,8 +8298,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorblack, @@ -8438,10 +8324,7 @@ /area/lawoffice) "fLQ" = ( /obj/structure/closet/secure_closet/detective, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/lino, /area/security/detectives_office) "fLR" = ( @@ -8458,7 +8341,7 @@ "fLT" = ( /obj/machinery/door/firedoor, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "civvie_docker"; pixel_x = 5; @@ -8560,10 +8443,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/monotile, /area/security/forensics) @@ -8589,10 +8469,7 @@ pixel_y = 5 }, /obj/item/hand_labeler, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "fPE" = ( @@ -8807,11 +8684,7 @@ dir = 1 }, /obj/structure/table/steel_reinforced, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9095,11 +8968,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/catwalk, /obj/random/trash, @@ -9769,11 +9639,7 @@ /area/ai_upload) "gED" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/bed/chair/comfy/black{ dir = 8 }, @@ -9996,10 +9862,7 @@ "gPm" = ( /obj/landmark/spawnpoint/job/clown, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/crew_quarters/clownoffice) "gPM" = ( @@ -10425,7 +10288,6 @@ dir = 4 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/effect/floor_decal/borderfloor{ @@ -10647,11 +10509,7 @@ "hip" = ( /obj/structure/table/steel, /obj/machinery/recharger, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10726,11 +10584,7 @@ }, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/table/rack/shelf/steel, /obj/item/clothing/head/helmet/ballistic{ pixel_x = -5; @@ -10812,11 +10666,7 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/interrogation) "hnG" = ( @@ -10829,11 +10679,8 @@ /turf/simulated/floor/tiled, /area/exploration) "hoa" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -10961,10 +10808,7 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "hsu" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/bench/wooden, /turf/simulated/floor/tiled/freezer, /area/triumph/surfacebase/sauna) @@ -11305,10 +11149,7 @@ /area/security/evidence_storage) "hHM" = ( /obj/structure/closet/wardrobe/red, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/red{ dir = 10 @@ -11407,11 +11248,7 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "hJV" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -11604,11 +11441,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11702,10 +11535,7 @@ /area/crew_quarters/sleep/CMO_quarters) "hVl" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11968,11 +11798,7 @@ /turf/simulated/floor/tiled, /area/chapel/main) "ifq" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -12034,8 +11860,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "iiq" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/dark, @@ -12242,8 +12067,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/civilian_hallway_mid) "iqj" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/spline/fancy/wood, @@ -12375,8 +12199,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -12827,11 +12650,7 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "iKm" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13143,11 +12962,7 @@ dir = 1 }, /obj/machinery/camera/network/security, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/armoury) "iVk" = ( @@ -13163,8 +12978,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "iVr" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/filingcabinet/tall, @@ -13669,11 +13483,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/lounge) "joN" = ( @@ -13879,11 +13689,7 @@ dir = 5 }, /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/grass, /area/hydroponics/garden) "jtj" = ( @@ -14158,11 +13964,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "jBQ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/woodentable, /obj/item/paper_bin, /obj/item/pen, @@ -14191,10 +13993,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/carpet/blucarpet, /area/lawoffice) "jDE" = ( @@ -14229,7 +14028,7 @@ /area/security/prison) "jFB" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "sec_shuttle_airlock"; name = "interior access button"; @@ -14327,11 +14126,8 @@ /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/excursion/general) "jJL" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -14345,11 +14141,7 @@ /turf/simulated/floor/tiled, /area/bridge/hallway) "jJV" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/reinforced, /obj/random/tech_supply, /obj/random/tech_supply, @@ -14509,8 +14301,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "jNp" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/carpet/bcarpet, @@ -14531,10 +14322,7 @@ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "jOl" = ( @@ -14904,8 +14692,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet/bcarpet, @@ -14932,10 +14719,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "kaw" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/red{ dir = 10 @@ -15124,11 +14908,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "khl" = ( @@ -15205,21 +14985,14 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "kiD" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "kiQ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -15302,8 +15075,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -15582,11 +15354,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/wood, /area/bridge/meeting_room) "kyG" = ( @@ -15851,10 +15619,7 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "kGi" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/CMO_quarters) "kGu" = ( @@ -15862,8 +15627,7 @@ /area/security/range) "kGB" = ( /obj/machinery/holopad, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/monotile, @@ -16219,11 +15983,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/HOP_quarters) "kPs" = ( @@ -16408,8 +16168,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/item/clothing/under/swimsuit/stripper/cowbikini, /obj/item/reagent_containers/food/drinks/cans/waterbottle, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -16481,10 +16240,7 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "kYv" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-4" @@ -16556,8 +16312,7 @@ /turf/simulated/floor/airless/ceiling, /area/space) "lcP" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/filingcabinet/chestdrawer, @@ -16584,11 +16339,7 @@ /area/security/nuke_storage) "ldn" = ( /obj/structure/closet/secure_closet/blueshield, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -16824,10 +16575,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "lqD" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -17094,11 +16842,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/substation/command) "lCw" = ( @@ -17358,11 +17102,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/CMO_quarters) "lOq" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -17383,11 +17123,7 @@ /turf/simulated/floor/plating, /area/maintenance/central) "lOs" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -17705,10 +17441,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/lounge) "maJ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -18176,11 +17909,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "mrJ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18625,8 +18354,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -18738,8 +18466,7 @@ /turf/simulated/wall/r_wall/prepainted/security, /area/security/brig) "mMS" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorblack, @@ -18938,7 +18665,7 @@ /area/hallway/secondary/civilian_hallway_mid) "mTU" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "civvie_docker"; pixel_y = -21 @@ -19004,11 +18731,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/table/rack/shelf/steel, /obj/item/gun/ballistic/fiveseven, /obj/item/gun/ballistic/fiveseven, @@ -19358,11 +19081,7 @@ dir = 1 }, /obj/machinery/recharge_station, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/bridge/hallway) "nnq" = ( @@ -19660,11 +19379,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "nzw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/CE_quarters) "nzy" = ( @@ -20122,11 +19837,7 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/excursion/general) "nMp" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20155,11 +19866,7 @@ /area/crew_quarters/clownoffice) "nNa" = ( /obj/structure/dogbed, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20774,11 +20481,7 @@ /turf/simulated/floor/tiled/monotile, /area/exploration/pathfinder_office) "ogK" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/exploration/meeting) "ogQ" = ( @@ -21015,11 +20718,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "oqF" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -21255,8 +20954,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -21446,11 +21144,7 @@ /obj/item/pen/invisible, /obj/item/pen/invisible, /obj/item/pen/invisible, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -21506,11 +21200,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) "oKo" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "oKZ" = ( @@ -21639,11 +21329,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/dark, /area/triumph/station/stairs_four) "oPo" = ( @@ -21711,8 +21397,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24; pixel_y = 6 }, @@ -21752,11 +21437,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -21798,11 +21480,7 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "oUz" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -21889,8 +21567,7 @@ "oXL" = ( /obj/structure/table/steel, /obj/item/storage/toolbox/mechanical, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/light{ @@ -22226,7 +21903,6 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 27 }, /obj/item/storage/briefcase{ @@ -22472,11 +22148,8 @@ /turf/simulated/floor/carpet, /area/bridge/office) "pqr" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -22511,7 +22184,6 @@ /area/teleporter) "prS" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22556,11 +22228,7 @@ /area/security/lobby) "ptO" = ( /obj/machinery/papershredder, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -22629,8 +22297,7 @@ /area/security/brig) "pwQ" = ( /obj/machinery/photocopier, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/purple/full, @@ -22774,16 +22441,11 @@ dir = 6 }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "pAb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -22869,11 +22531,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -22969,10 +22628,7 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "pEM" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -23083,8 +22739,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -23396,11 +23051,7 @@ /turf/simulated/wall/prepainted/exploration, /area/exploration/explorer_prep) "pWm" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/closet/crate/secure/weapon, /turf/simulated/floor/tiled, /area/exploration/excursion_dock) @@ -23481,10 +23132,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) "qbH" = ( @@ -23974,7 +23622,6 @@ }, /obj/machinery/button/windowtint{ id = "hop_bedroom"; - layer = 3.3; pixel_y = 25 }, /turf/simulated/floor/carpet/bcarpet, @@ -24471,11 +24118,7 @@ /obj/item/cell/high{ maxcharge = 15000 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/security/eva) "qNu" = ( @@ -24502,11 +24145,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "1-2" }, @@ -24590,11 +24229,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -24846,10 +24481,7 @@ /area/hallway/secondary/civilian_hallway_mid) "qZu" = ( /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/CE_quarters) "qZD" = ( @@ -25198,11 +24830,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "rlK" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -25266,11 +24894,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "roT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /turf/simulated/floor/tiled, @@ -25298,11 +24923,7 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "rpR" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -25414,8 +25035,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "rvM" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -25500,11 +25120,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/exploration/showers) "rzL" = ( @@ -26278,10 +25894,7 @@ /obj/structure/closet{ name = "Evidence Closet" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) @@ -26302,11 +25915,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) "saW" = ( @@ -26440,10 +26049,7 @@ /turf/simulated/floor/tiled, /area/hydroponics/garden) "sgq" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -26472,8 +26078,7 @@ /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) "shJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light/small, @@ -26575,11 +26180,7 @@ /area/bridge/meeting_room) "skY" = ( /obj/structure/table/steel, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -26663,11 +26264,7 @@ /turf/simulated/floor/tiled/white, /area/triumph/surfacebase/sauna) "snu" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "snQ" = ( @@ -26815,8 +26412,7 @@ /area/hallway/secondary/docking_hallway) "sve" = ( /obj/structure/table/bench/wooden, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/effect/mist, @@ -26872,10 +26468,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/corner/red/border{ dir = 4 }, @@ -26899,10 +26492,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -27706,11 +27296,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "thX" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "tix" = ( @@ -28262,10 +27848,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "tCF" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/maintenance/chapel) @@ -28384,11 +27967,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "tFw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -28683,11 +28262,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/vacant/vacant_bar) "tQJ" = ( @@ -29513,11 +29088,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "usn" = ( @@ -29771,14 +29342,12 @@ /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "hop_office_desk"; - layer = 3.3; name = "Desk Privacy Shutter"; pixel_x = -25; pixel_y = -25 }, /obj/machinery/button/windowtint{ id = "hop_office"; - layer = 3.3; pixel_x = -24; pixel_y = 25 }, @@ -29902,10 +29471,7 @@ /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "uDg" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/security/hanger) @@ -29931,11 +29497,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "uDx" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -30265,10 +29827,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "uPB" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, @@ -30785,11 +30344,8 @@ /turf/simulated/floor/tiled, /area/exploration/showers) "vjT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -31225,8 +30781,7 @@ /area/exploration/excursion_dock) "vEi" = ( /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -31270,8 +30825,7 @@ /area/crew_quarters/sleep/HOP_quarters) "vFn" = ( /obj/structure/closet/secure_closet/brig, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -31327,10 +30881,7 @@ /turf/simulated/floor/carpet, /area/security/brig) "vGH" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31392,11 +30943,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -31471,11 +31018,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, /area/security/armoury) "vKT" = ( @@ -31553,11 +31096,8 @@ /area/maintenance/substation/exploration) "vNY" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/wood, /area/library) @@ -31813,11 +31353,7 @@ /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan, /turf/simulated/floor/tiled, /area/shuttle/excursion/cockpit) @@ -31960,8 +31496,7 @@ "wbl" = ( /obj/structure/table/steel, /obj/item/storage/box/evidence, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/monotile, @@ -32126,10 +31661,7 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "whp" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/security) @@ -32222,10 +31754,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "woe" = ( @@ -32837,7 +32366,6 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/item/storage/briefcase{ @@ -33133,11 +32661,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/security/breakroom) "wVY" = ( @@ -33163,11 +32687,7 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "wWR" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/vending/fitness, /turf/simulated/floor/tiled, /area/triumph/surfacebase/tram) @@ -33320,8 +32840,7 @@ /area/gateway) "xch" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/bed/chair{ @@ -33618,8 +33137,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "xkO" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -28 }, /turf/simulated/floor/wood, @@ -33782,10 +33300,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "xmL" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -33824,11 +33339,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 5 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, @@ -33984,7 +33495,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /turf/simulated/floor/wood, @@ -34066,11 +33576,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "xwo" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/bridge/office) "xwz" = ( @@ -34815,11 +34321,7 @@ name = "AI Upload turret control"; pixel_y = -26 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -34856,8 +34358,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/corner/red{ @@ -35021,11 +34522,7 @@ /area/security/lobby) "ydy" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -35210,11 +34707,7 @@ /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "yfy" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -35329,10 +34822,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "4-8" diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm index 6859b86f77..59d2c31e2c 100644 --- a/maps/triumph/levels/flagship.dmm +++ b/maps/triumph/levels/flagship.dmm @@ -1,6 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ac" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, /turf/unsimulated/floor/steel, /area/centcom/command) "ae" = ( @@ -2677,7 +2679,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "ArmouryC2"; - layer = 3.3; name = "Armoury" }, /turf/unsimulated/floor/steel, @@ -4185,7 +4186,6 @@ /area/centcom/restaurant) "nm" = ( /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_y = 30 }, @@ -4302,7 +4302,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "ArmouryC4"; - layer = 3.3; name = "Armoury" }, /turf/unsimulated/floor{ @@ -4359,7 +4358,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchenC"; - layer = 3.3; name = "Kitchen Shutters" }, /turf/unsimulated/floor/steel, @@ -6792,6 +6790,12 @@ name = "plating" }, /area/centcom/terminal) +"vO" = ( +/obj/machinery/door/firedoor/glass, +/turf/unsimulated/floor/steel{ + icon_state = "white" + }, +/area/centcom/medical) "vP" = ( /turf/unsimulated/wall/planetary/virgo3b, /area/centcom/security) @@ -7172,7 +7176,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) "wQ" = ( @@ -7894,6 +7898,12 @@ icon_state = "dark" }, /area/centcom/control) +"zm" = ( +/obj/spawner/window/low_wall/full/firelocks, +/turf/unsimulated/floor{ + name = "plating" + }, +/area/centcom/security) "zt" = ( /obj/machinery/button/remote/blast_door{ id = "HEAVY"; @@ -8856,7 +8866,7 @@ /area/centcom/control) "CB" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, @@ -9370,6 +9380,8 @@ }, /area/centcom/command) "Et" = ( +/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/full/firelocks, /turf/unsimulated/floor{ name = "plating" }, @@ -10364,7 +10376,8 @@ "HS" = ( /obj/machinery/door/window/brigdoor{ req_access = list(63); - req_one_access = list(1) + req_one_access = list(1); + dir = 4 }, /obj/machinery/button/remote/airlock{ id = "front"; @@ -11315,7 +11328,6 @@ /area/centcom/living) "KF" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 28 }, /obj/effect/floor_decal/borderfloorblack{ @@ -11719,6 +11731,9 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -13328,7 +13343,8 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ req_access = list(63); - req_one_access = list(1) + req_one_access = list(1); + dir = 4 }, /turf/unsimulated/floor{ icon_state = "dark" @@ -13626,7 +13642,7 @@ pixel_y = -28 }, /obj/structure/cable/green, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/cockpit) "RN" = ( @@ -14950,7 +14966,8 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -15739,7 +15756,7 @@ /area/centcom/evac) "YL" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/centcom/specops/dock) "YM" = ( @@ -38918,7 +38935,7 @@ dw gQ Ft dw -dw +vO dw dw dw @@ -46696,7 +46713,7 @@ WK WK WK WK -Et +zm Et WK wp diff --git a/sound/custom_vote.ogg b/sound/custom_vote.ogg new file mode 100644 index 0000000000..e8f0e2a36e Binary files /dev/null and b/sound/custom_vote.ogg differ diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index 2477641c7e..56951b1484 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -4,7 +4,7 @@ "version": "4.3.1", "type": "module", "dependencies": { - "axios": "^0.21.1", + "axios": "^1.6.0", "glob": "^7.1.7", "source-map": "^0.7.3", "stacktrace-parser": "^0.1.10", diff --git a/tgui/packages/tgui/interfaces/EmbeddedController.js b/tgui/packages/tgui/interfaces/EmbeddedController.js index 1c0562426b..3d9debc210 100644 --- a/tgui/packages/tgui/interfaces/EmbeddedController.js +++ b/tgui/packages/tgui/interfaces/EmbeddedController.js @@ -467,6 +467,18 @@ const AirlockConsolePhoron = (props, context) => { : 'good'; }), }, + { + minValue: -273, + maxValue: 310, + value: data.chamber_temperature, + label: "Chamber Temperature", + textValue: data.chamber_temperature + " °C", + color: (value => { + return (value < 0) ? 'bad' + : (value < 15) ? 'average' + : 'good'; + }), + }, ]; return ( diff --git a/tgui/packages/tgui/interfaces/ExosuitFabricator.js b/tgui/packages/tgui/interfaces/ExosuitFabricator.js index ecce139d5f..1bdc570b6e 100644 --- a/tgui/packages/tgui/interfaces/ExosuitFabricator.js +++ b/tgui/packages/tgui/interfaces/ExosuitFabricator.js @@ -27,6 +27,8 @@ const MATERIAL_KEYS = { "lead": "stack-adamantine", "platinum": "stack-adamantine", "plastic": "stack-plastic", + "bananium": "stack-bananium", + "silencium": "stack-silencium", }; const COLOR_NONE = 0; diff --git a/tgui/packages/tgui/interfaces/MaterialProcessor.tsx b/tgui/packages/tgui/interfaces/MaterialProcessor.tsx new file mode 100644 index 0000000000..f2aaa73abb --- /dev/null +++ b/tgui/packages/tgui/interfaces/MaterialProcessor.tsx @@ -0,0 +1,158 @@ +import { BooleanLike } from "common/react"; +import { capitalize } from "common/string"; +import { Fragment } from "inferno"; +import { useBackend } from "../backend"; +import { Button, LabeledList, Section, AnimatedNumber } from "../components"; +import { Window } from '../layouts'; + +enum MaterialProcessorMode { + None = 0, + Smelt = 1, + Compress = 2, + Alloy = 3, +} + +const COLOR_PROCESSING = { + [MaterialProcessorMode.None]: false, + [MaterialProcessorMode.Smelt]: "orange", + [MaterialProcessorMode.Compress]: "blue", + [MaterialProcessorMode.Alloy]: "purple", +}; + +type OreData = +{ + name: string, + displayName: string, + processing: number, + amount: number, + ref: string, +} + +type MaterialProcessorData = +{ + on: BooleanLike, + fast: BooleanLike, + ores: OreData[], + unclaimedPoints: number, + idName: string, + idPoints: number, +} + +export const MaterialProcessor = (props, context) => { + const { act, data } = useBackend(context); + const { + on, + fast, + ores, + unclaimedPoints, + idName, + idPoints, + } = data; + + return ( + + +
    + + 0)} + onClick={() => act("claim_points", {})} + /> + }> + + + + {idName && ( + act("eject_id", {})} + /> + }> + + + ) || ( + act("insert_id", {})} /> + } + /> + )} + +
    +
    +
    +     +     + ); +}; diff --git a/tgui/packages/tgui/interfaces/machines/IcecreamCart.tsx b/tgui/packages/tgui/interfaces/machines/IcecreamCart.tsx new file mode 100644 index 0000000000..58ed84f42e --- /dev/null +++ b/tgui/packages/tgui/interfaces/machines/IcecreamCart.tsx @@ -0,0 +1,88 @@ +import { useBackend } from "../../backend"; +import { Button, LabeledList, ProgressBar, Section, Stack } from "../../components"; +import { Window } from "../../layouts"; +import { ByondAtomColor } from "../common/Color"; + +interface IcecreamCartData { + baseIngredients: { + milk: number, + flour: number, + sugar: number, + ice: number, + }; + sources: { + name: string, + volume: number, + maxVolume: number, + color: ByondAtomColor, + ref: string, + }[]; + scoopSource: number | null; +} + +export const IcecreamCart = (props, context) => { + let { data, act } = useBackend(context); + + return ( + + + + + +
    + + + {data.baseIngredients.flour}u + + + {data.baseIngredients.ice}u + + + {data.baseIngredients.milk}u + + + {data.baseIngredients.sugar}u + + +
    +     +     + +
    + + {data.sources.map((s, i) => ( + + + +
    +     + +
    + act('produceCone')} /> +
    +     +     +     +     + ); +}; diff --git a/tgui/yarn.lock b/tgui/yarn.lock index 2b9fa81bba..83a1e7858a 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -3566,12 +3566,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.21.1": - version: 0.21.4 - resolution: "axios@npm:0.21.4" +"axios@npm:^1.6.0": + version: 1.6.2 + resolution: "axios@npm:1.6.2" dependencies: - follow-redirects: ^1.14.0 - checksum: 44245f24ac971e7458f3120c92f9d66d1fc695e8b97019139de5b0cc65d9b8104647db01e5f46917728edfc0cfd88eb30fc4c55e6053eef4ace76768ce95ff3c + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8 languageName: node linkType: hard @@ -5710,13 +5712,13 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.0": - version: 1.15.0 - resolution: "follow-redirects@npm:1.15.0" +"follow-redirects@npm:^1.15.0": + version: 1.15.3 + resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: debug: optional: true - checksum: eaec81c3e0ae57aae2422e38ad3539d0e7279b3a63f9681eeea319bb683dea67502c4e097136b8ce9721542b4e236e092b6b49e34e326cdd7733c274f0a3f378 + checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231 languageName: node linkType: hard @@ -9241,6 +9243,13 @@ __metadata: languageName: node linkType: hard +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + "psl@npm:^1.1.28, psl@npm:^1.1.33": version: 1.8.0 resolution: "psl@npm:1.8.0" @@ -10668,7 +10677,7 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-dev-server@workspace:packages/tgui-dev-server" dependencies: - axios: ^0.21.1 + axios: ^1.6.0 glob: ^7.1.7 source-map: ^0.7.3 stacktrace-parser: ^0.1.10 diff --git a/tools/dmi/__init__.py b/tools/dmi/__init__.py index 4c3ef22137..da6d73b680 100755 --- a/tools/dmi/__init__.py +++ b/tools/dmi/__init__.py @@ -174,6 +174,16 @@ def to_file(self, filename, *, palette=False): if palette: output = output.convert('P') output.save(filename, 'png', optimize=True, pnginfo=pnginfo) + + def swap_ns(self): + for i in range(0, len(self.states)): + state = self.states[i] + state.swap_ns() + + def swap_ew(self): + for i in range(0, len(self.states)): + state = self.states[i] + state.swap_ew() class State: @@ -216,7 +226,32 @@ def _frame_index(self, frame=0, dir=None): def get_frame(self, *args, **kwargs): return self.frames[self._frame_index(*args, **kwargs)] - + + def swap_ns(self): + for i in range(0, self.framecount): + if len(self.frames) <= i * self.dirs + 1: + continue + # south + f1 = (i * self.dirs) + 0 + # north + f2 = (i * self.dirs) + 1 + # swap + buffer = self.frames[f1] + self.frames[f1] = self.frames[f2] + self.frames[f2] = buffer + + def swap_ew(self): + for i in range(0, self.framecount): + if len(self.frames) <= i * self.dirs + 3: + continue + # east + f1 = (i * self.dirs) + 2 + # west + f2 = (i * self.dirs) + 3 + # swap + buffer = self.frames[f1] + self.frames[f1] = self.frames[f2] + self.frames[f2] = buffer def escape(text): text = text.replace('\\', '\\\\')