From c0b025b02e7004b970f34ae4f0e092408236569f Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:10:48 -0400 Subject: [PATCH 1/9] display/hub fixes --- code/datums/map_config.dm | 2 +- code/game/area/ovpst.dm | 1 + code/game/world.dm | 13 +++---------- maps/lv624.json | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 546b9c3f87..c4180810bd 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -13,7 +13,7 @@ var/voteweight = 1 // Config actually from the JSON - default values - var/map_name = "LV624" + var/map_name = "The Outer Veil PST" var/map_path = "map_files/LV624" var/map_file = "LV624.dmm" diff --git a/code/game/area/ovpst.dm b/code/game/area/ovpst.dm index d54431c364..40151b4c17 100644 --- a/code/game/area/ovpst.dm +++ b/code/game/area/ovpst.dm @@ -1,4 +1,5 @@ /area/ovpst + name = "The Outer Veil Primary Supply Terminal - Interiors" icon = 'icons/turf/area_almayer.dmi' // ambience = list('sound/ambience/shipambience.ogg') icon_state = "almayer" diff --git a/code/game/world.dm b/code/game/world.dm index 64f0bbe03a..5ab57d5222 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -275,16 +275,9 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt")) /world/proc/update_status() //Note: Hub content is limited to 254 characters, including limited HTML/CSS. var/s = "" - - if(CONFIG_GET(string/servername)) - s += "[CONFIG_GET(string/servername)]" - - if(SSmapping?.configs) - var/datum/map_config/MG = SSmapping.configs[GROUND_MAP] - s += "
Map: [MG?.map_name ? "[MG.map_name]" : ""]" - if(SSticker?.mode) - s += "
Mode: [SSticker.mode.name]" - s += "
Round time: [duration2text()]" + s += "Sector Patrol ALPHA - A Role-playing game mode without player antagonists
" + s += "Late joining may be disabled, but you may create your character at any time.
" + s += "Join the Neroid Sector Discord." world.status = s diff --git a/maps/lv624.json b/maps/lv624.json index 76b00753db..cd397db8d3 100644 --- a/maps/lv624.json +++ b/maps/lv624.json @@ -1,5 +1,5 @@ { - "map_name": "LV-624", + "map_name": "The Outer Veil PST", "map_path": "map_files/LV624", "map_file": "LV624.dmm", "webmap_url": "LV624", From f507386cc5bd9eec21de3c8171e6ef9ec573d625 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Tue, 26 Mar 2024 17:38:36 -0400 Subject: [PATCH 2/9] fixes and text corrections --- code/datums/chargen/foundation.dm | 2 +- code/modules/client/preferences.dm | 4 ++-- code/modules/cm_marines/equipment/maps.dm | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/datums/chargen/foundation.dm b/code/datums/chargen/foundation.dm index 22b3f0fb2a..aac7e3a70c 100644 --- a/code/datums/chargen/foundation.dm +++ b/code/datums/chargen/foundation.dm @@ -8,7 +8,7 @@ /datum/chargen/foundation/leader name = CHARGEN_FOUNDATION_LEADER - desc = "You were the leader of your friends' group<, the class or student council president, the local sports team leader, or possibly all three at once and many more. Whatever group you were part of you naturally gravitated to leadership positions thanks to a mixture of charisma and talent. You may have not always been the most talented person in the room, but whether it was though having the natural perseverance and talent to be considered a good leader, or the ambition and lack of morals to fake your way there, you were always at the head. Regardless of your personal talent or morals, once you get there, you are a genuinely good leader, although that too can be understood both as someone who takes care of their team or someone who always gets the job done.

There is likely a record of your achievements and the UACM has taken notice of your tendencies. You are likely to be picked as a leader or coordinator of special tasks, should they require one and conversely not be the first pick in matters where you aren't eligible or there aren't any clear leadership posts." + desc = "You were the leader of your friends' group, the class or student council president, the local sports team leader, or possibly all three at once and many more. Whatever group you were part of you naturally gravitated to leadership positions thanks to a mixture of charisma and talent. You may have not always been the most talented person in the room, but whether it was though having the natural perseverance and talent to be considered a good leader, or the ambition and lack of morals to fake your way there, you were always at the head. Regardless of your personal talent or morals, once you get there, you are a genuinely good leader, although that too can be understood both as someone who takes care of their team or someone who always gets the job done.

There is likely a record of your achievements and the UACM has taken notice of your tendencies. You are likely to be picked as a leader or coordinator of special tasks, should they require one and conversely not be the first pick in matters where you aren't eligible or there aren't any clear leadership posts." /datum/chargen/foundation/overachiever name = CHARGEN_FOUNDATION_OVERACHIEVER diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0afc13f3b3..ea037a21c8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1795,7 +1795,7 @@ GLOBAL_LIST_INIT(bgstate_options, list( if(tgui_alert(user, "Please verify that you can see CharGen text in your chat window.", "Text Visibility Confirmation", list("Text is Visible","Cancel")) == "Cancel") return to_chat(user, ("

The year is 2185...

")) - to_chat(user, ("

Widespread ecological collapse that essentially made the Earth unlivable anywhere but huge sealed off megacities was threatening to push humanity to the edge of extinction by the late 2060s. As resources and living space dwindled, Russia and China would band together and overwhelm Europe and Asia, creating the totalitarian UPP. As a response, Great Britian and Japan would over time merge their monarchies and cultures into one, eventually becoming the Three World Empie. North and South American countries, Canada and the US included, would respond to this by forming a military pact called the United Americas, however this pact soon became the grounds for an increasingly stronger union between its members states.

YA brutal war seemed inevitable between these three factions when a scientific expedition founded by the Weyland-Yutani company discovered alien technology in ruins found underneath the rapidly melting polar ice caps. Among this technology the key to unlocking faster than light travel with a process simple enough that all three of Earths superpowers could almost instantly adopt it, resulting in mass production of craft and rapid colonization of nearby viable solar systems. This in turn stabilized and gave some much needed reprieve to an overpopulated, dying Earth. Old conflicts and grievances followed humanity to the stars. An interplanetary nuclear war between the UA and UPP brought back old divisions front and center. For a while, a nuclear exchange back on Earth seemed inevitable as well. Ultimately, a ceasefire was reached, and a new order established where the UPP is in a state of a constant cold war with the TWE and UA who form an uneasy alliance. The colonization of space resumed...

The United States Marine Corps, or the USCMC, was founded during this time of restarted space exploration to act as a quick response force in the Inner and Outer Veil, a high intensity cluster of stars located between the Inner and Outer Rim of the known galaxy. The Marines claim to fame was 'The Sweep' - a massive, coordinated operation that secured safety and security in the Veil for the next twenty-five years, during which the region saw massive expansion. The USCMC suffers from massive decline and decay due to widespread corruption and chronic lack of funding stemming from disagreements within the UA over the legacy of The Sweep. You joined the Marines during this decline, just as the Veil started to see a massive push from the UPP into the region. By 2180 the Veil was littered with numerous colonies and installations belonging to all three Superpowers as a new cold war was ramping up back on Earth, fears of another nuclear conflict became very real.

In 2184 during what becomes known as the Blackfire Incident a volatile bioweapon colloquially known as Black Goo is released into the atmosphere of a prominent Veil colony. A broadcast is maintained by an unknown third party as all life on the planet perishes in an agonizing twenty hours. By the next day, the recording is spread all over public and military networks. Two days after Blackfire, Task Force 14, a Special Task Group recruiting mostly USCMC officers broadcasts the Blackfire Files across all civilized space. These files reveal an incredibly through, but completely illegal investigation into a terrorist group known as Deep Void who they pin as responsible for Blackfire. Deep Void is then exposed to compromise mostly of USCMC High Command, high ranking officers who believed that a war with the UPP was the key to another Sweep.

The USCMC does not survive this revelation. Within weeks public outcry and general contempt for the organization is so high that UA Allied Command terminates the contracts of the whole formation outright. You are unceremoniously fired, stripped of your honors and dumped in a society that universally hates you for actions you had nothing to do with. You quickly find that your past with the USCMC has made you an almost universal pariah. Since it becomes almost impossible not to have served on a ship or base that had something to do with Deep Void activities, you are also submit to a very rough and uncaring investigation by the UAAC-TIS, the intelligence agency who was revealed to be the driving force behind Task Force 14's actions.

It has been an extremely rough year for anyone who served in the USCMC. In many ways it seems that society at large is willing to just leave you behind as a mistake. As the UA consolidates itself into a single political state, it creates the United Americas Colonial Marines, or the UACM. You are offered a part in this new formation in an attempt by UA brass to at least somehow reconcile the hell you went through during the last year. After extensive training in a UACM army base outside of the New York Urban Sprawl, you are hired as a commissioned officer and given the rank of Ensign. You are then immediately assigned to be part of the fledgling Second Fleet of the Outer Veil Logistics and Supply unit, under RDML Thomas Boulette. You will be based out of the Outer Veil Primary Supply Terminal a mostly automated, gigantic space station where you will operate as Test Crews testing and implementing new UACM spaceship technology.

")) + to_chat(user, ("

Widespread ecological collapse that essentially made the Earth unlivable anywhere but huge sealed off megacities was threatening to push humanity to the edge of extinction by the late 2060s. As resources and living space dwindled, Russia and China would band together and overwhelm Europe and Asia, creating the totalitarian UPP. As a response, Great Britain and Japan would over time merge their monarchies and cultures into one, eventually becoming the Three World Empie. North and South American countries, Canada and the US included, would respond to this by forming a military pact called the United Americas, however this pact soon became the grounds for an increasingly stronger union between its members states.

A brutal war seemed inevitable between these three factions when a scientific expedition founded by the Weyland-Yutani company discovered alien technology in ruins found underneath the rapidly melting polar ice caps. Among this technology the key to unlocking faster than light travel with a process simple enough that all three of Earths superpowers could almost instantly adopt it, resulting in mass production of craft and rapid colonization of nearby viable solar systems. This in turn stabilized and gave some much needed reprieve to an overpopulated, dying Earth. Old conflicts and grievances followed humanity to the stars. An interplanetary nuclear war between the UA and UPP brought back old divisions front and center. For a while, a nuclear exchange back on Earth seemed inevitable as well. Ultimately, a ceasefire was reached, and a new order established where the UPP is in a state of a constant cold war with the TWE and UA who form an uneasy alliance. The colonization of space resumed...

The United States Marine Corps, or the USCMC, was founded during this time of restarted space exploration to act as a quick response force in the Inner and Outer Veil, a high intensity cluster of stars located between the Inner and Outer Rim of the known galaxy. The Marines claim to fame was 'The Sweep' - a massive, coordinated operation that secured safety and security in the Veil for the next twenty-five years, during which the region saw massive expansion. The USCMC suffers from massive decline and decay due to widespread corruption and chronic lack of funding stemming from disagreements within the UA over the legacy of The Sweep. You joined the Marines during this decline, just as the Veil started to see a massive push from the UPP into the region. By 2180 the Veil was littered with numerous colonies and installations belonging to all three Superpowers as a new cold war was ramping up back on Earth, fears of another nuclear conflict became very real.

In 2184 during what becomes known as the Blackfire Incident a volatile bioweapon colloquially known as Black Goo is released into the atmosphere of a prominent Veil colony. A broadcast is maintained by an unknown third party as all life on the planet perishes in an agonizing twenty hours. By the next day, the recording is spread all over public and military networks. Two days after Blackfire, Task Force 14, a Special Task Group recruiting mostly USCMC officers broadcasts the Blackfire Files across all civilized space. These files reveal an incredibly through, but completely illegal investigation into a terrorist group known as Deep Void who they pin as responsible for Blackfire. Deep Void is then exposed to compromise mostly of USCMC High Command, high ranking officers who believed that a war with the UPP was the key to another Sweep.

The USCMC does not survive this revelation. Within weeks public outcry and general contempt for the organization is so high that UA Allied Command terminates the contracts of the whole formation outright. You are unceremoniously fired, stripped of your honors and dumped in a society that universally hates you for actions you had nothing to do with. You quickly find that your past with the USCMC has made you an almost universal pariah. Since it becomes almost impossible not to have served on a ship or base that had something to do with Deep Void activities, you are also submit to a very rough and uncaring investigation by the UAAC-TIS, the intelligence agency who was revealed to be the driving force behind Task Force 14's actions.

It has been an extremely rough year for anyone who served in the USCMC. In many ways it seems that society at large is willing to just leave you behind as a mistake. As the UA consolidates itself into a single political state, it creates the United Americas Colonial Marines, or the UACM. You are offered a part in this new formation in an attempt by UA brass to at least somehow reconcile the hell you went through during the last year. After extensive training in a UACM army base outside of the New York Urban Sprawl, you are hired as a commissioned officer and given the rank of Ensign. You are then immediately assigned to be part of the fledgling Second Fleet of the Outer Veil Logistics and Supply unit, under RDML Thomas Boulette. You will be based out of the Outer Veil Primary Supply Terminal a mostly automated, gigantic space station where you will operate as Test Crews testing and implementing new UACM spaceship technology.

")) if (tgui_alert(user, "You reflect on your own past, thinking about how you got here...", "Ready Confirmation", list("Begin CharGen","Not today")) == "Not today") return process_link(user, list("_src_" = "prefs", "preference" = "chargen_origin", "task" = "input")) @@ -1837,7 +1837,7 @@ GLOBAL_LIST_INIT(bgstate_options, list( if("chargen_foundation") - to_chat(user, ("

Most spend their entire lives living near the place they were born, even in modern times. Space travel as a profession is seem as an inherently risky and isolated profession, something akin to working on an oil rig. Ship malfunctions can easily cascade out of control and force crews do escape pods, which sometimes can take years if not more to recover. Joining the USCMC may not have always been your goal, but That predisposition would have very likely affected your formative years and early childhood in terms of both who you were and why exactly did you turn to the Marines, as you are very likely to have been a risktaker, someone used to the relative solitude of long term space travel or someone who otherwise had strong motivations to want to reach for the stars.

")) + to_chat(user, ("

Most spend their entire lives living near the place they were born, even in modern times. Space travel as a profession is seem as an inherently risky and isolated profession, something akin to working on an oil rig. Ship malfunctions can easily cascade out of control and force crews do escape pods, which sometimes can take years if not more to recover. Joining the USCMC may not have always been your goal, but for better or worse the prospect of space travel was alluring enough to you that you turned to it as a profession. That predisposition would have very likely affected your formative years and early childhood in terms of both who you were and why exactly did you turn to the Marines, as you are very likely to have been a risktaker, someone used to the relative solitude of long term space travel or someone who otherwise had strong motivations to want to reach for the stars.

")) to_chat(user, ("

Keeping that in mind, what made you reach for the stars? What is your Foundation?

")) var/choice = tgui_input_list(user, "Pick an option to see its description. You will be asked to confirm your choice.", "Foundation", GLOB.player_chargen_foundation) var/datum/origin/picked_choice = GLOB.chargen_foundation[choice] diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm index f41c8d6f97..f310aa42ae 100644 --- a/code/modules/cm_marines/equipment/maps.dm +++ b/code/modules/cm_marines/equipment/maps.dm @@ -155,17 +155,17 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps()) //used by marine equipment machines to spawn the correct map. /obj/item/map/current_map -/obj/item/map/current_map/Initialize(mapload, ...) - . = ..() +///obj/item/map/current_map/Initialize(mapload, ...) +// . = ..() - var/map_name = SSmapping.configs[GROUND_MAP].map_name - var/obj/item/map/map = GLOB.map_type_list[map_name] - if (!map && (map_name == MAP_RUNTIME || map_name == MAP_CHINOOK || map_name == MAIN_SHIP_DEFAULT_NAME)) - return // "Maps" we don't have maps for so we don't need to throw a runtime for (namely in unit_testing) - name = map.name - desc = map.desc - html_link = map.html_link - color = map.color +// var/map_name = SSmapping.configs[GROUND_MAP].map_name +// var/obj/item/map/map = GLOB.map_type_list[map_name] +// if (!map && (map_name == MAP_RUNTIME || map_name == MAP_CHINOOK || map_name == MAIN_SHIP_DEFAULT_NAME)) +// return // "Maps" we don't have maps for so we don't need to throw a runtime for (namely in unit_testing) + name = "map" + desc = "a map" + html_link = "none" + color = COLOR_WHITE // Landmark - Used for mapping. Will spawn the appropriate map for each gamemode (LV map items will spawn when LV is the gamemode, etc) /obj/effect/landmark/map_item From 3a327568f69e95c8a908bc589190a440c488a49c Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Wed, 27 Mar 2024 05:38:02 -0400 Subject: [PATCH 3/9] LET THERE BE LIGHT --- .../SectorPatrol/OuterVeilPST/ovpst.dmm | 162 +++++++++++------- 1 file changed, 103 insertions(+), 59 deletions(-) diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index 786862a3f0..16299c9783 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -12,6 +12,7 @@ "bC" = (/obj/effect/decal/cargo_stripes{icon_state = "ne"},/turf/open/floor/almayer{dir = 4; icon_state = "redcorner"},/area/ovpst) "bQ" = (/obj/structure/window/framed/almayer,/obj/structure/window/framed/almayer,/turf/open/floor/plating,/area/ovpst) "bR" = (/obj/structure/window/framed/almayer/hull,/turf/open/floor/almayer{icon_state = "plate"},/area/ovpst/airlock/d31) +"bW" = (/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer,/area/ovpst) "ce" = (/obj/structure/bed/sofa/vert/grey/top,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "co" = (/turf/open/floor/almayer{icon_state = "orange"},/area/ovpst) "cH" = (/obj/effect/decal/cargo_stripes{icon_state = "nws"},/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) @@ -20,6 +21,7 @@ "db" = (/obj/structure/surface/table/reinforced/almayer_blend/north,/obj/structure/machinery/door/poddoor/shutters/almayer{id = "scn1_shutter"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "dK" = (/obj/docking_port/stationary/emergency_response/external/pst_dock31,/turf/open/space/basic,/area/space) "dP" = (/obj/effect/decal/info_tag/pst/lby{pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- LBY - R37 -
Dorms Deck 37 entrance lobby"},/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) +"ef" = (/obj/structure/machinery/light,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "eg" = (/obj/effect/decal/info_tag/pst/scn{dir = 1; pixel_x = -16; desc_lore = "The label SCN indicates doors and areas where computer systems actively scan its inhabitants and contents. This door leads to the secondary Dock 31 scanner, but official documentation does not specify what scan is performed here, only that it is a check that involves reviewing the biographies of scanned personnel. Areas like this need to be clearly marked due to privacy and personal data handling laws passed back in the UA in the aftermath of the Colony Wars."; desc = "UACM Outer Veil Primary Supply Terminal
- SCN -
Entrance Secondary Scanner D31-PT-SCN001 and EL-E Pathway"},/turf/open/floor/almayer{dir = 6; icon_state = "emerald"},/area/ovpst) "em" = (/obj/structure/window/framed/almayer,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "eq" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) @@ -30,6 +32,7 @@ "eW" = (/turf/closed/wall/almayer/outer,/area/ovpst/airlock/ele_e_pin) "eZ" = (/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_e_pin) "fa" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "e-d31"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_e_d31) +"ff" = (/obj/structure/machinery/light,/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) "fk" = (/obj/structure/bed/chair/modular/office{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "fv" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "fA" = (/obj/effect/decal/info_tag/pst/ele{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- EL-E -
Primary Access Elevator - E"},/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) @@ -56,12 +59,14 @@ "io" = (/turf/open/floor/almayer,/area/ovpst) "it" = (/obj/effect/decal/info_tag/pst/eld{pixel_y = 0; dir = 8; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - G01 - Elevator Shaft D
"},/turf/open/floor/almayer{dir = 8; icon_state = "emeraldcorner"},/area/ovpst) "iG" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{icon = 'icons/obj/structures/doors/2x1generic.dmi'; dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"iI" = (/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "iO" = (/obj/effect/decal/info_tag/pst/d31{dir = 1; desc_lore = "Main Airlocks are effectively entrances and exits from space stations and ships, used by smaller ships that latch onto the airlocks, typically using extending pathways called 'umbilicals'. After initial security screening is done and the craft is allowed to approach the PST, this door is used as part of the passage to/from the ship."},/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) "iP" = (/obj/effect/decal/info_tag/pst/san{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- SAN -
Dock 31 Guest Sanitation"},/turf/open/floor/almayer{dir = 1; icon_state = "silvercorner"},/area/ovpst) "je" = (/obj/effect/decal/cargo_stripes{icon_state = "nes"},/turf/open/floor/almayer{dir = 9; icon_state = "red"},/area/ovpst) "jg" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/2x1almayerdoor.dmi'; id = "crypt_airlock_doors"},/turf/open/floor/almayer{icon_state = "purplefull"; dir = 8},/area/ovpst) "ji" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/security_generic{dir = 1},/turf/open/floor/almayer{icon_state = "redfull"},/area/ovpst) -"jo" = (/obj/structure/machinery/conveyor{dir = 8},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"jl" = (/obj/structure/machinery/light,/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 8},/area/ovpst) +"jo" = (/obj/structure/machinery/conveyor{dir = 8; id = "d31-entrance"; drag_delay = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "jq" = (/obj/structure/machinery/door/poddoor/shutters/almayer{id = "scn1_shutter"},/obj/structure/window/framed/almayer,/turf/open/floor/plating,/area/ovpst) "js" = (/obj/structure/machinery/door/poddoor/almayer,/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst) "jL" = (/obj/effect/decal/info_tag/pst/ele{dir = 4; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft C
"},/turf/open/floor/almayer{dir = 5; icon_state = "red"},/area/ovpst) @@ -77,7 +82,7 @@ "lh" = (/turf/closed/wall/almayer,/area/ovpst) "lj" = (/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 8},/area/ovpst) "ll" = (/obj/structure/bed/modular,/turf/open/floor/almayer,/area/ovpst) -"lm" = (/obj/structure/machinery/conveyor{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"lm" = (/obj/structure/machinery/conveyor{dir = 8; id = "d31-entrance"; drag_delay = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "lq" = (/turf/open/floor/almayer/uscm/directional{dir = 10; icon_state = "logo_directional1"},/area/ovpst) "lt" = (/obj/structure/eventterminal/admin_event_terminal{dir = 4; pixel_x = -9; pixel_y = 3; puzzlebox_id = "scn2"},/turf/open/floor/almayer{dir = 5; icon_state = "emerald"},/area/ovpst) "lx" = (/obj/structure/machinery/light/marker/admin/pythia/triumphant,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) @@ -89,14 +94,18 @@ "me" = (/obj/structure/searchable/puzzle04/drawers_smol/full2,/turf/open/floor/almayer,/area/ovpst) "mh" = (/obj/structure/surface/modular/table,/obj/item/device/modular/lamp,/turf/open/floor/almayer,/area/ovpst) "mj" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/2x1almayerdoor.dmi'; id = "crypt_airlock_doors2"},/turf/open/floor/plating/plating_catwalk,/area/ovpst) +"mp" = (/obj/structure/machinery/conveyor{dir = 6; id = "d31-entrance"; drag_delay = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "mq" = (/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_drm) "mK" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/securedoor.dmi'; dir = 1},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) +"mN" = (/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer,/area/ovpst) "mR" = (/obj/structure/eventterminal/puzzle02/ldmainframe_master/incorrect{item_serial = "UACM-OVPST-D31-LDCPU-03"; puzzlebox_id = "LD_Mainframe_3"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "mZ" = (/turf/open/floor/almayer{dir = 6; icon_state = "silver"},/area/ovpst) +"na" = (/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/plating/plating_catwalk,/area/ovpst) +"nb" = (/obj/structure/bed/chair/comfy/black{dir = 4},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "nd" = (/obj/structure/searchable/puzzle04/bunk_locker/full2,/turf/open/floor/almayer,/area/ovpst) -"nh" = (/obj/structure/machinery/door/poddoor/railing{dir = 2; id = "supply_elevator_railing"},/obj/effect/decal/cargo_stripes{icon_state = "n"},/turf/open/floor/almayer{icon_state = "sterile"},/area/ovpst) +"nh" = (/obj/structure/machinery/door/poddoor/railing{dir = 2; id = "d31_cargo_fence"},/obj/effect/decal/cargo_stripes{icon_state = "n"},/turf/open/floor/almayer{icon_state = "sterile"},/area/ovpst) "nk" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/structure/bed/chair/comfy/black{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) -"nE" = (/obj/structure/machinery/conveyor,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"nE" = (/obj/structure/machinery/conveyor{id = "d31-entrance"; drag_delay = 1; dir = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "nG" = (/obj/structure/machinery/light,/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) "nR" = (/turf/open/floor/almayer{dir = 1; icon_state = "orangecorner"},/area/ovpst) "og" = (/turf/open/floor/almayer{icon_state = "emerald"},/area/ovpst) @@ -106,12 +115,14 @@ "oH" = (/obj/structure/machinery/disposal,/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) "oI" = (/obj/effect/decal/info_tag/pst/cpu{dir = 4; desc_lore = "The label CPU indicates doors and areas related to the operation of ship AIs, which typically are also directly tied to the ships Twilight FTL drives and Liquid Data FTL communication systems. These areas are typically sealed to all but the highest-ranking command personnel on board a ship or station but may be sometimes unlocked by the AIs themselves if maintenance is required. The room behind the door leads to one of the PYTHIA scanner clusters which are somehow related to the secondary security scanner of the station, but no information is available about what the scanner is or why would it need what appears to be Liquid Data based communication systems. The presence of FTL comm protocols and Liquid Data explains the blue pathway and CPU designation at least."; desc = "UACM Outer Veil Primary Supply Terminal
- CPU -
Dock 31 Security Sub Processors PYTHIA Scanner Cluster D13-2"},/turf/open/floor/almayer{icon_state = "bluecorner"},/area/ovpst) "oQ" = (/obj/structure/window/framed/almayer/hull,/turf/closed/wall/almayer/outer,/area/ovpst) +"oR" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) "oT" = (/obj/effect/decal/info_tag/pst/eng{pixel_y = 16; pixel_x = -16; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. These areas typically require an elevated engineering clearance Liquid data channels are wired all though the station and this door seems to lead to one of them. There is likely nothing but dusty, humming computers inside."; desc = "UACM Outer Veil Primary Supply Terminal
- ENG -
LD Block T14 Access"},/turf/open/floor/almayer{dir = 1; icon_state = "orangecorner"},/area/ovpst) "pe" = (/obj/structure/machinery/light/marker/admin/pythia/repressed,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "po" = (/turf/open/floor/almayer{dir = 9; icon_state = "orange"},/area/ovpst) "ps" = (/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_e_d31) -"pt" = (/obj/structure/machinery/conveyor{dir = 8},/obj/structure/machinery/door/poddoor/almayer{id = "cargointake"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"pt" = (/obj/structure/machinery/conveyor{dir = 8; id = "d31-entrance"; drag_delay = 1},/obj/structure/machinery/door/poddoor/almayer{id = "cargointake"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "pu" = (/obj/docking_port/stationary/emergency_response/pst_shaft_d,/turf/open/floor/almayer/empty,/area/ovpst) +"pD" = (/obj/structure/machinery/light/small,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "pH" = (/obj/structure/machinery/light{dir = 2},/turf/open/floor/almayer{icon_state = "blue"},/area/ovpst) "pO" = (/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "pZ" = (/obj/structure/eventterminal/puzzle04/crypt_doorlock{pixel_y = 25},/turf/open/floor/almayer{icon_state = "purplecorner"; dir = 4},/area/ovpst) @@ -122,14 +133,16 @@ "qL" = (/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "qM" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "qP" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general/admin{icon = 'icons/obj/structures/doors/engidoor2.dmi'; dir = 2; locked = TRUE; icon_state = "door_closed"; id = "scn1_exit"; id_tag = "scn1_exit"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) -"qR" = (/obj/structure/machinery/door/poddoor/railing{dir = 8; id = "supply_elevator_railing"},/obj/effect/decal/cargo_stripes{icon_state = "e"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"qR" = (/obj/structure/machinery/door/poddoor/railing{dir = 8; id = "d31_cargo_fence"},/obj/effect/decal/cargo_stripes{icon_state = "e"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "qU" = (/obj/effect/decal/info_tag/pst/eld{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft D
"},/turf/open/floor/almayer{dir = 1; icon_state = "emeraldcorner"},/area/ovpst) "qW" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{icon = 'icons/obj/structures/doors/Door2x1_secure2.dmi'; dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "qZ" = (/obj/effect/decal/info_tag/pst/eng{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- ENG -
Dorms Deck 37, Sector A, Maintenance Shaft"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. These areas typically require an elevated engineering clearance. These doors lead to maintenance shafts used to service issues with the dorms should ones arrive. Some of these passages may have other exits, but since no centralized map system exists for the PST, finding those is a matter of luck. "},/turf/open/floor/almayer{icon_state = "orange-silver"; dir = 1},/area/ovpst) -"rf" = (/obj/structure/machinery/conveyor{dir = 6},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"rf" = (/obj/structure/machinery/conveyor{dir = 6; id = "d31-entrance"; drag_delay = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "rj" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_e_pinnacle,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_e_pin) "rB" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "d-drm"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_drm) +"rC" = (/obj/structure/machinery/light{dir = 4; brightness = 14},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "rI" = (/obj/structure/bed/sofa/south/grey/left,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"rM" = (/obj/structure/surface/modular/table,/obj/item/device/modular/lamp,/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer,/area/ovpst) "rP" = (/obj/effect/decal/info_tag/pst/elc{pixel_y = 0; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft C
"},/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) "rR" = (/obj/effect/decal/info_tag/pst/ela{dir = 4; desc = "UACM Outer Veil Primary Supply Terminal
- EL-A - G01 - Elevator Shaft A
"},/turf/open/floor/almayer{dir = 6; icon_state = "blue"},/area/ovpst) "rW" = (/obj/structure/machinery/door/poddoor/almayer/locked{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) @@ -138,9 +151,13 @@ "sD" = (/turf/open/floor/plating/plating_catwalk,/area/ovpst) "sM" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "e-pin"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_e_pin) "sV" = (/turf/open/floor/almayer/empty,/area/ovpst) +"te" = (/obj/structure/machinery/light{brightness = 12},/turf/open/floor/almayer{dir = 8; icon_state = "redcorner"},/area/ovpst) "th" = (/obj/effect/decal/info_tag/pst/ele{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-E -
Primary Access Elevator - E"},/turf/open/floor/almayer{dir = 1; icon_state = "emeraldcorner"},/area/ovpst) "to" = (/obj/structure/machinery/light/small{dir = 1; light_id = "cargointake"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) +"tr" = (/obj/structure/machinery/light{dir = 8; brightness = 12},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "tY" = (/obj/effect/decal/info_tag/pst/int{desc = "UACM Outer Veil Primary Supply Terminal
- -INT- -
Cargo Sub Processors - Main Access Pathway - Security Sub Processors"; desc_lore = "The label -INT- indicates intersections. Labels like this are typically placed on the 'primary' pathway but have information regarding all pathways at an intersection and list all pathways at an intersection starting from the left-handed turn (if one exists) and moving in a clockwise fashion until all turns are covered. This one indicates that the left-handed passage heads to cargo receiving sub processors, the path forward and backward is the Main Access Pathway, leading to the Dock and the Main Elevator and the path right leads to the Security Sub Processors area."},/turf/open/floor/almayer{icon_state = "emeraldfull"; dir = 1},/area/ovpst) +"un" = (/obj/structure/surface/modular/table,/obj/item/device/modular/lamp,/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer,/area/ovpst) +"ut" = (/obj/structure/surface/modular/table,/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer,/area/ovpst) "uv" = (/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "uD" = (/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) "uG" = (/obj/effect/decal/info_tag/pst/cpu{pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- CPU -
Dock 31 Security Sub Processors PYTHIA Scanner Cluster D13-1"; desc_lore = "The label CPU indicates doors and areas related to the operation of ship AIs, which typically are also directly tied to the ships Twilight FTL drives and Liquid Data FTL communication systems. These areas are typically sealed to all but the highest-ranking command personnel on board a ship or station but may be sometimes unlocked by the AIs themselves if maintenance is required. The room behind the door leads to one of the PYTHIA scanner clusters which are somehow related to the secondary security scanner of the station, but no information is available about what the scanner is or why would it need what appears to be Liquid Data based communication systems. The presence of FTL comm protocols and Liquid Data explains the blue pathway and CPU designation at least."},/turf/open/floor/almayer{dir = 5; icon_state = "blue"},/area/ovpst) @@ -149,25 +166,30 @@ "va" = (/obj/effect/decal/info_tag/pst/ofc{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- OFC - G01 -
Entrance Orientation Offices, Memorial"; desc_lore = "The label OFC indicates office areas, which as the name suggests are typically areas with some specific, bureaucratic function assigned to them and can be anything from personal offices of high-ranking personnel to teaching rooms and spare, unused generic spaces. These doors lead to the entrance offices of the PST where new guests and permanent arrivals are briefed and welcomed, as well as the station's memorial."},/turf/open/floor/almayer{icon_state = "silvercorner"; dir = 1},/area/ovpst) "vj" = (/turf/open/floor/plating/modular,/area/ovpst) "vr" = (/obj/structure/surface/table/reinforced/black,/obj/structure/eventterminal/puzzle02/scanerterm{dir = 4; pixel_y = 5; pixel_x = 5},/turf/open/floor/almayer{dir = 8; icon_state = "orange"},/area/ovpst) -"vs" = (/obj/structure/bed/chair/comfy/black{dir = 1; pixel_y = 0},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"vs" = (/obj/structure/bed/chair/comfy/black{dir = 1; pixel_y = 0},/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "vu" = (/turf/closed/wall/almayer/outer,/area/ovpst/airlock/d31) -"vB" = (/turf/open/floor/plating,/area/ovpst) +"vB" = (/obj/structure/machinery/conveyor{dir = 2; id = "d31-entrance"; drag_delay = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "vJ" = (/turf/open/floor/almayer{icon_state = "bluecorner"},/area/ovpst) "vM" = (/obj/structure/window/framed/almayer/hull,/obj/structure/window/framed/almayer/hull,/obj/structure/window/framed/almayer/hull,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "vT" = (/obj/effect/decal/info_tag/pst/int{desc_lore = "The label -INT- indicates intersections. Labels like this are typically placed on the 'primary' pathway but have information regarding all pathways at an intersection and list all pathways at an intersection starting from the left-handed turn (if one exists) and moving in a clockwise fashion until all turns are covered. This label marks the pathway leading to the computer systems automating the Cargo intake process to the left and right of the sign or the Cargo Processing Subsystems Diagnostics and Maintenance Room and a general observation area of the intake mechanism behind a person facing to read the sign."; desc = "UACM Outer Veil Primary Supply Terminal
- -INT- -
Dock 31 Cargo Processing Subsystem Sub Processors Cluster CPU01-Cluster CPU02-Cargo Processing Subsystems Diagnostics and Maintenance Room and Intake Observation"},/turf/open/floor/almayer{dir = 6; icon_state = "silver-orange"},/area/ovpst) +"vW" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "wn" = (/obj/structure/machinery/door/poddoor/almayer{id = "sec2"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst) "wp" = (/obj/structure/machinery/light/marker/admin/pythia/malcontent,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "wt" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_d_drm) "wz" = (/turf/open/floor/almayer{icon_state = "bluecorner"; dir = 8},/area/ovpst) +"wR" = (/obj/structure/machinery/light,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"wV" = (/obj/structure/machinery/light{dir = 4},/turf/open/floor/plating/plating_catwalk,/area/ovpst) "wY" = (/obj/effect/decal/info_tag/pst/obs{desc_lore = "The label OBS typically indicates an observation area of some sort, used to look at regular operations of another area without disturbing the actual process within. This area is marked due to the windows leading into the cargo intake system, but is rarely used since the system is properly monitored from the maintenance room right next to this area."; desc = "UACM Outer Veil Primary Supply Terminal
- OBS -
Dock 31 Cargo Processing Intake Observation"},/turf/open/floor/almayer{dir = 6; icon_state = "silver"},/area/ovpst) "wZ" = (/turf/open/floor/almayer{icon_state = "black"; dir = 8},/area/ovpst) "xc" = (/obj/effect/decal/info_tag/pst/eng{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- ENG - G01 -
Dock 31 Security Sub Processors"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. G01 indicates that this area is open to anyone who is quartered on the station. Engineering doors with general access usually suggest that general maintenance equipment is available somewhere behind this door. This door leads to maintenance corridors related to the security scanning system of Dock 31 and usually are only accessed if an issue needs diagnostics. A maintenance room with equipment needed to diagnose issues with the security system should be somewhere at the end of this path."},/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) "xv" = (/obj/structure/window/framed/almayer/hull,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"xw" = (/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "xA" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_d_drm,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_drm) "xL" = (/obj/structure/machinery/door/poddoor/almayer/locked{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "xN" = (/turf/open/floor/almayer{icon_state = "black"; dir = 4},/area/ovpst) "yb" = (/obj/structure/prop/almayer/ship_memorial,/turf/open/floor/holofloor/grass,/area/ovpst) "yg" = (/turf/open/floor/almayer{dir = 5; icon_state = "emerald"},/area/ovpst) +"yn" = (/obj/structure/surface/modular/table,/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer,/area/ovpst) "yp" = (/turf/open/floor/almayer/uscm/directional{dir = 1; icon_state = "logo_directional1"},/area/ovpst) "yu" = (/obj/effect/decal/info_tag/pst/scn{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- SCN -
Entrance Secondary Scanner D31-PT-SCN001 and EL-E Pathway"; desc_lore = "The label SCN indicates doors and areas where computer systems actively scan its inhabitants and contents. This door leads to the secondary Dock 31 scanner, but official documentation does not specify what scan is performed here, only that it is a check that involves reviewing the biographies of scanned personnel. Areas like this need to be clearly marked due to privacy and personal data handling laws passed back in the UA in the aftermath of the Colony Wars."},/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) "yy" = (/obj/effect/decal/info_tag/pst/scn{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- SCN -
Entrance Personnel Scanner D31SCN001 and EL-E Pathway"; desc_lore = "The label SCN indicates doors and areas where computer systems actively scan its inhabitants and contents. This door leads to the primary entrance scanner of the PST, where entering personnel's identities are verified by the central CMISRS registry. Areas like this need to be clearly marked due to privacy and personal data handling laws passed back in the UA in the aftermath of the Colony Wars."},/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{dir = 1; icon_state = "emeraldcorner"},/area/ovpst) @@ -177,23 +199,26 @@ "yW" = (/obj/structure/bed/chair/modular/office{dir = 4},/turf/open/floor/almayer,/area/ovpst) "yX" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "zu" = (/obj/effect/decal/info_tag/pst/int{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- -INT- -
Elevator Shafts C and D, Arrivals Offices and Memorial, Elevator shafts A and B, Elevator Shaft E."; desc_lore = "The label -INT- indicates intersections. Labels like this are typically placed on the 'primary' pathway but have information regarding all pathways at an intersection and list all pathways at an intersection starting from the left-handed turn (if one exists) and moving in a clockwise fashion until all turns are covered. This intersection in particular seems to lead to all the elevator shafts that lead to the station proper, the big elevator that is used to access the station from outside and the entrance offices area that are typically used to welcome guests."},/turf/open/floor/almayer{dir = 1; icon_state = "orange"},/area/ovpst) -"zx" = (/turf/open/floor/almayer{dir = 8; icon_state = "silvercorner"},/area/ovpst) +"zx" = (/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{dir = 8; icon_state = "silvercorner"},/area/ovpst) "zF" = (/turf/open/floor/almayer{icon_state = "bluecorner"; dir = 1},/area/ovpst) "zI" = (/obj/structure/machinery/light{dir = 2},/turf/open/floor/almayer{icon_state = "silver"},/area/ovpst) "zQ" = (/obj/structure/machinery/door/poddoor/almayer{id = "d31-entrance"; name = "\improper Umbillical Airlock"; unacidable = 1},/turf/open/floor/almayer{icon_state = "plate"},/area/ovpst/airlock/d31) "Aj" = (/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) "Aq" = (/turf/open/floor/almayer{dir = 4; icon_state = "bluecorner"},/area/ovpst) +"AA" = (/obj/structure/machinery/conveyor{id = "d31-entrance"; drag_delay = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"AI" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 4},/area/ovpst) "AJ" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/securedoor.dmi'},/turf/open/floor/almayer{icon_state = "bluefull"},/area/ovpst) "AM" = (/turf/open/floor/almayer/uscm/directional{dir = 9; icon_state = "logo_directional1"},/area/ovpst) "Bc" = (/obj/structure/ladder{id = "crypt1"; icon_state = "ladder01"; height = 2},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Be" = (/obj/structure/searchable/puzzle04/drawers_smol/full1,/turf/open/floor/almayer,/area/ovpst) "Bi" = (/turf/open/floor/almayer{dir = 4; icon_state = "emeraldcorner"},/area/ovpst) +"Bm" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) "Bu" = (/turf/open/floor/almayer{dir = 8; icon_state = "redcorner"},/area/ovpst) "Bv" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/secdoor.dmi'},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) -"BF" = (/obj/effect/decal/info_tag/pst/sec{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- SEC - D01 - R37 -
Dorms Deck 37 Entrance Guest Clearance and Cargo Reception Station"},/turf/open/floor/almayer{dir = 4; icon_state = "redcorner"},/area/ovpst) +"BF" = (/obj/effect/decal/info_tag/pst/sec{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- SEC - D01 - R37 -
Dorms Deck 37 Entrance Guest Clearance and Cargo Reception Station"},/obj/structure/machinery/light{dir = 4; brightness = 12},/turf/open/floor/almayer{dir = 4; icon_state = "redcorner"},/area/ovpst) "BH" = (/obj/structure/machinery/light/small{dir = 8; light_id = "cargointake"},/turf/open/floor/almayer{icon_state = "plate"},/area/ovpst/airlock/d31) "BI" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{dir = 4; icon_state = "emeraldcorner"},/area/ovpst) -"BR" = (/obj/structure/bed/chair/comfy/black,/obj/effect/decal/info_tag/pst/eld{dir = 8; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft D
"},/turf/open/floor/almayer{dir = 8; icon_state = "silvercorner"},/area/ovpst) +"BR" = (/obj/structure/bed/chair/comfy/black,/obj/effect/decal/info_tag/pst/eld{dir = 8; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft D
"},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{dir = 8; icon_state = "silvercorner"},/area/ovpst) "BU" = (/obj/structure/toilet{dir = 4; pixel_x = -1},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "BV" = (/obj/effect/decal/info_tag/pst/ofc{dir = 8; pixel_x = -16; desc_lore = "The label OFC indicates office areas, which as the name suggests are typically areas with some specific, bureaucratic function assigned to them and can be anything from personal offices of high-ranking personnel to teaching rooms and spare, unused generic spaces. This door leads to one of the orientation offices, used to brief and greet new arrivals to the station."; desc = "UACM Outer Veil Primary Supply Terminal
- OFC -
Entrance Orientation Office"},/turf/open/floor/almayer{dir = 8; icon_state = "silvercorner"},/area/ovpst) "BX" = (/obj/effect/decal/info_tag/pst/rec{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- REC -
Dorm Recreational and Social Areas"; desc_lore = "The label REC indicates recreational areas, which often include public CivNet access points but can essentially be any area dedicated to down time or recreation on the station, including cafeterias and kitchens.Each dorm level on the PST has a communal area like the one this door leads to, that has a kitchen, cafeteria that peeks out into its lobby and room for several other recreational facilities that tend to be customized to the dorm's inhabitants' specific needs."},/turf/open/floor/almayer{icon_state = "silvercorner"; dir = 1},/area/ovpst) @@ -208,11 +233,12 @@ "CO" = (/turf/open/floor/almayer{icon_state = "purplefull"; dir = 8},/area/ovpst) "CS" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/engidoor2.dmi'; dir = 2},/turf/open/floor/plating/plating_catwalk,/area/ovpst) "CY" = (/obj/structure/machinery/light,/obj/effect/decal/info_tag/pst/san{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- SAN -
Dock 31 Personnel Sanitation"},/turf/open/floor/almayer{dir = 8; icon_state = "emerald-silver"},/area/ovpst) -"Du" = (/obj/structure/machinery/conveyor{dir = 9},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"Du" = (/obj/structure/machinery/conveyor{dir = 8; id = "d31-entrance"; drag_delay = 1; backwards = SOUTH; forwards = WEST},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "DF" = (/obj/effect/decal/info_tag/pst/sec{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- SEC - D01 - R37 -
Dorms Deck 37 Entrance Guest Clearance and Cargo Reception Station"; desc_lore = "The label SEC indicates doors and areas that require an elevated security clearance, typically restricted for MPs and CMISRS agents. This door leads to the cargo and guest reception area, which can be accessed by anyone who also is registered in a dorm on this level. From this station, residents can authorize guest visits and receive cargo."},/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) "DM" = (/obj/structure/closet/secure_closet/sp/red/d01{icon_state = "red_class_d_locked"},/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) "DP" = (/obj/structure/eventterminal/admin_event_terminal{icon = 'icons/obj/structures/machinery/clio_maint_dark.dmi'; pixel_y = 8; name = "closed maintenance terminal hatch"; desc = "A sliding hatch concealing a terminal used to perform local diagnostic tasks"; desc_lore = "Most space ships ultilize secondary terminals like these on a room-by-room basis as a failsafe meant to cover for the ship's central, AI-assisted maitenance system."; puzzlebox_id = "crypt_airlock"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "DW" = (/obj/structure/searchable/puzzle04/bunk_chest/full2,/turf/open/floor/almayer,/area/ovpst) +"Ea" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "Eb" = (/obj/effect/decal/info_tag/pst/drm{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- DRM -
Dorms, Deck 37, Sector B"},/turf/open/floor/almayer{dir = 4; icon_state = "bluecorner"},/area/ovpst) "Ep" = (/obj/structure/surface/modular/table/gray{icon_state = "table_metal_black"},/obj/structure/eventterminal/puzzle03/historyterm{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Et" = (/obj/structure/eventterminal/puzzle05/pythia,/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) @@ -223,14 +249,19 @@ "EL" = (/obj/structure/surface/modular/table,/turf/open/floor/almayer,/area/ovpst) "EM" = (/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{dir = 8},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst) "ER" = (/obj/structure/bed/sofa/south/grey,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"EU" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst) "EZ" = (/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) +"Fd" = (/obj/structure/machinery/light{dir = 8; brightness = 12},/turf/open/floor/almayer,/area/ovpst) "Fe" = (/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) "Fi" = (/obj/structure/eventterminal/puzzle03/historycrt{pixel_y = 32},/obj/structure/machinery/light/marker/admin{pixel_y = 40; light_id = "theathervoice"},/turf/open/floor/almayer{icon_state = "blue2orange"; dir = 1},/area/ovpst) +"Fj" = (/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/plating/modular,/area/ovpst) "Fo" = (/obj/effect/decal/info_tag/pst/cpu{dir = 1; desc_lore = "The label CPU indicates doors and areas related to the operation of ship AIs, which typically are also directly tied to the ships Twilight FTL drives and Liquid Data FTL communication systems. These areas are typically sealed to all but the highest-ranking command personnel on board a ship or station but may be sometimes unlocked by the AIs themselves if maintenance is required. The room behind the door leads to one of the PYTHIA scanner clusters which are somehow related to the secondary security scanner of the station, but no information is available about what the scanner is or why would it need what appears to be Liquid Data based communication systems. The presence of FTL comm protocols and Liquid Data explains the blue pathway and CPU designation at least."; desc = "UACM Outer Veil Primary Supply Terminal
- CPU -
Dock 31 Security Sub Processors PYTHIA Scanner Cluster D13-3"},/turf/open/floor/almayer{icon_state = "bluecorner"},/area/ovpst) "Fr" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_e_pin) +"Fw" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/plating/plating_catwalk,/area/ovpst) "Fz" = (/turf/open/floor/almayer{dir = 1; icon_state = "redcorner"},/area/ovpst) "FA" = (/obj/effect/decal/info_tag/pst/eng{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- ENG -
Dorms Deck 37, Sector A, Maintenance Shaft"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. These areas typically require an elevated engineering clearance. These doors lead to maintenance shafts used to service issues with the dorms should ones arrive. Some of these passages may have other exits, but since no centralized map system exists for the PST, finding those is a matter of luck. "},/turf/open/floor/almayer{icon_state = "white-orange"; dir = 2},/area/ovpst) "FW" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "d-pin"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_pin) +"FZ" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/plating/plating_catwalk,/area/ovpst) "Gf" = (/obj/effect/decal/cargo_stripes{icon_state = "se"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Gk" = (/obj/structure/bed/chair/office/dark{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "GA" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/securedoor.dmi'; dir = 1},/turf/open/floor/almayer{icon_state = "bluefull"},/area/ovpst) @@ -240,8 +271,9 @@ "GN" = (/turf/open/floor/almayer{dir = 1; icon_state = "emeraldcorner"},/area/ovpst) "Ha" = (/turf/open/floor/almayer{dir = 4; icon_state = "silvercorner"},/area/ovpst) "Hp" = (/turf/open/floor/almayer{dir = 1; icon_state = "emerald"},/area/ovpst) +"Hr" = (/obj/structure/bed/chair/comfy/black,/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Hs" = (/turf/open/floor/almayer/uscm/directional{dir = 6; icon_state = "logo_directional1"},/area/ovpst) -"HC" = (/obj/structure/machinery/door/poddoor/railing{id = "supply_elevator_railing"},/obj/effect/decal/cargo_stripes{icon_state = "s"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"HC" = (/obj/structure/machinery/door/poddoor/railing{id = "d31_cargo_fence"},/obj/effect/decal/cargo_stripes{icon_state = "s"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Il" = (/obj/structure/foamed_metal,/obj/structure/foamed_metal,/turf/open/floor/plating,/area/ovpst) "Is" = (/obj/structure/bed/chair/comfy/black,/turf/open/floor/almayer{dir = 4; icon_state = "silvercorner"},/area/ovpst) "Iz" = (/obj/structure/machinery/light/marker/admin/pythia/main{pixel_x = -8},/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) @@ -250,8 +282,10 @@ "IK" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/secdoor.dmi'; dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "IR" = (/obj/structure/bed/sofa/vert/grey,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "IS" = (/obj/structure/searchable/puzzle04/drawers_files/full1,/turf/open/floor/almayer,/area/ovpst) +"Jg" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"Js" = (/obj/structure/machinery/light{dir = 8; brightness = 14},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "JH" = (/obj/effect/decal/info_tag/pst/eng{dir = 8; pixel_y = 0; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- ENG - G01 -
Dock 31 Cargo Processing Subsystems"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. G01 indicates that this area is open to anyone who is quartered on the station. Engineering doors with general access usually suggest that general maintenance equipment is available somewhere behind this door. This door leads to maintenance corridors related to the cargo processing system of Dock 31 and usually are only accessed if there is an issue with the cargo intake. A maintenance room with equipment needed to diagnose issues with the cargo system should be somewhere at the end of this path."},/turf/open/floor/almayer{dir = 8; icon_state = "orangecorner"},/area/ovpst) -"JM" = (/obj/structure/surface/modular/table/gray{icon_state = "table_metal_black"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"JM" = (/obj/structure/surface/modular/table/gray{icon_state = "table_metal_black"},/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "JO" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/Door2x1_secure2.dmi'},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Kk" = (/obj/structure/searchable/puzzle04/bunk_locker/full4,/turf/open/floor/almayer,/area/ovpst) "Kp" = (/turf/closed/wall/almayer/outer,/area/ovpst/airlock/ele_e_d31) @@ -260,12 +294,13 @@ "KK" = (/turf/open/floor/almayer{dir = 8; icon_state = "orangecorner"},/area/ovpst) "KX" = (/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "La" = (/obj/structure/machinery/door/poddoor/almayer{id = "d31-entrance"; name = "\improper Umbillical Airlock"; unacidable = 1},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst/airlock/d31) -"Lc" = (/obj/structure/closet/secure_closet/sp/yellow/g01/engiebasics{pixel_x = -8; pixel_y = 16},/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst) +"Lc" = (/obj/structure/closet/secure_closet/sp/yellow/g01/engiebasics{pixel_x = -8; pixel_y = 16},/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst) "LA" = (/obj/structure/bed/sofa/south/grey/right,/turf/open/floor/almayer{icon_state = "silvercorner"},/area/ovpst) "LB" = (/turf/open/floor/almayer{icon_state = "silver"; dir = 8},/area/ovpst) +"LG" = (/obj/structure/machinery/light{dir = 4; brightness = 12},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "LK" = (/turf/open/floor/almayer{dir = 4; icon_state = "blue"},/area/ovpst) "LN" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) -"LR" = (/obj/structure/machinery/conveyor{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"LR" = (/obj/structure/machinery/conveyor{dir = 1; id = "d31-entrance"; drag_delay = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "LU" = (/obj/structure/surface/table/reinforced/black,/obj/structure/surface/table/reinforced/black,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "LV" = (/turf/open/floor/almayer{icon_state = "orangecorner"},/area/ovpst) "Md" = (/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 8},/area/ovpst) @@ -277,6 +312,8 @@ "MY" = (/obj/structure/searchable/puzzle04/drawers_misc/full2,/turf/open/floor/almayer,/area/ovpst) "Nh" = (/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 4},/area/ovpst) "Ns" = (/turf/open/floor/almayer{dir = 1; icon_state = "greencorner"},/area/ovpst) +"Nv" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"NB" = (/obj/structure/machinery/light{dir = 4; brightness = 12},/turf/open/floor/almayer,/area/ovpst) "NE" = (/obj/structure/bookcase,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "NI" = (/obj/effect/decal/info_tag/pst/ofc{dir = 4; desc_lore = "The label OFC indicates office areas, which as the name suggests are typically areas with some specific, bureaucratic function assigned to them and can be anything from personal offices of high-ranking personnel to teaching rooms and spare, unused generic spaces. This door leads to one of the orientation offices, used to brief and greet new arrivals to the station."; desc = "UACM Outer Veil Primary Supply Terminal
- OFC -
Entrance Orientation Office"},/turf/open/floor/almayer{dir = 4; icon_state = "silver"},/area/ovpst) "NP" = (/obj/effect/decal/info_tag/pst/elc{dir = 8; pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - G01 - Elevator Shaft C
"},/turf/open/floor/almayer{dir = 9; icon_state = "red"},/area/ovpst) @@ -287,6 +324,7 @@ "Ot" = (/turf/open/floor/almayer{dir = 8; icon_state = "red"},/area/ovpst) "Ou" = (/obj/effect/decal/info_tag/pst/obs{desc_lore = "The label OBS typically indicates an observation area of some sort, used to look at regular operations of another area without disturbing the actual process within. This area is marked due to the windows leading into the cargo intake system, but is rarely used since the system is properly monitored from the maintenance room right next to this area."; desc = "UACM Outer Veil Primary Supply Terminal
- OBS -
Dock 31 Cargo Processing Intake Observation"; pixel_x = -16},/turf/open/floor/almayer{icon_state = "silver"},/area/ovpst) "OK" = (/obj/structure/window/framed/almayer,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) +"OO" = (/obj/structure/machinery/light/small,/turf/open/floor/plating/plating_catwalk,/area/ovpst) "OP" = (/obj/structure/machinery/light/small{dir = 8; light_color = "#d3a7d4"},/obj/effect/step_trigger/message/seeonce/D31Scn2,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "OX" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/open/floor/almayer{icon_state = "silvercorner"},/area/ovpst) "Pe" = (/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/ovpst) @@ -301,6 +339,7 @@ "QM" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{dir = 9; icon_state = "orange"},/area/ovpst) "Ra" = (/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_e_pin) "Rl" = (/obj/item/light_bulb/marker/admin{name = "voicebox - log viewer"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"Rz" = (/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{icon_state = "silvercorner"; dir = 1},/area/ovpst) "RB" = (/turf/open/floor/almayer{icon_state = "white"; dir = 1},/area/ovpst) "RE" = (/obj/structure/machinery/door/poddoor/almayer/locked{dir = 8},/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) "Sa" = (/turf/closed/wall/almayer/outer,/area/ovpst/airlock/ele_d_pin) @@ -310,8 +349,10 @@ "So" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Su" = (/obj/structure/sink{dir = 1; pixel_y = -8},/obj/structure/mirror{pixel_y = -25},/obj/structure/machinery/light/small,/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "SE" = (/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_pin) +"SF" = (/obj/structure/bookcase,/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "SG" = (/obj/structure/sink{dir = 1; pixel_y = -8},/obj/structure/mirror{pixel_y = -25},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "SI" = (/turf/open/floor/almayer{dir = 8; icon_state = "emeraldcorner"},/area/ovpst) +"SL" = (/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/plating/plating_catwalk,/area/ovpst) "SN" = (/obj/structure/window/framed/almayer,/turf/open/floor/plating,/area/ovpst) "ST" = (/obj/structure/bed/chair/modular/office{dir = 1},/turf/open/floor/almayer,/area/ovpst) "SV" = (/turf/open/floor/almayer/uscm/directional{dir = 4; icon_state = "logo_directional1"},/area/ovpst) @@ -343,21 +384,24 @@ "Wx" = (/obj/structure/eventterminal/puzzle04/final_log{pixel_y = 25},/obj/structure/machinery/light/marker/admin{light_id = "final_log"; pixel_y = 16},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "WA" = (/obj/effect/decal/info_tag/pst/eld{dir = 1; pixel_y = 0; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft D
"},/turf/open/floor/almayer{icon_state = "emerald"},/area/ovpst) "WF" = (/obj/effect/decal/info_tag/pst/elc{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft C
"},/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) -"WW" = (/obj/structure/toilet{dir = 4},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) +"WW" = (/obj/structure/toilet{dir = 4},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "Xn" = (/turf/open/floor/almayer{icon_state = "silver"; dir = 9},/area/ovpst) "Xs" = (/obj/structure/window/framed/almayer/hull,/turf/closed/wall/almayer/outer,/area/ovpst/airlock/d31) "Xy" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 2},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "XE" = (/obj/effect/decal/info_tag/pst/eld{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - G01 - Elevator Shaft D
"},/turf/open/floor/almayer{icon_state = "redcorner"},/area/ovpst) "XF" = (/obj/structure/searchable/puzzle04/drawers_misc/full1,/turf/open/floor/almayer,/area/ovpst) "XM" = (/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst) +"XU" = (/obj/structure/machinery/light{brightness = 12},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"XV" = (/obj/structure/machinery/light{dir = 1; brightness = 12},/turf/open/floor/almayer,/area/ovpst) "XZ" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Yo" = (/turf/open/floor/almayer{icon_state = "plate"},/area/ovpst/airlock/d31) -"YL" = (/turf/open/floor/almayer{dir = 10; icon_state = "red"},/area/ovpst) +"YL" = (/obj/structure/machinery/conveyor_switch{id = "d31-entrance"; pixel_x = 7; pixel_y = -6},/turf/open/floor/almayer{dir = 10; icon_state = "red"},/area/ovpst) "YY" = (/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 1},/area/ovpst) "Zg" = (/obj/effect/decal/info_tag/pst/mup{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- MUP -
MUP 14-37"},/turf/open/floor/almayer{icon_state = "purplecorner"; dir = 1},/area/ovpst) "Zh" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Zv" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_e_d31,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_e_d31) -"ZB" = (/obj/structure/sink{dir = 8; pixel_y = 0; pixel_x = -9},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) +"ZA" = (/obj/structure/machinery/door_control{pixel_y = -11; name = "inner door toggle"; id = "d31_cargo_fence"; specialfunctions = 4; req_access = list(1141); pixel_x = -12},/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) +"ZB" = (/obj/structure/sink{dir = 8; pixel_y = 0; pixel_x = -9},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "ZE" = (/obj/structure/searchable/puzzle04/bunk_chest/full1,/turf/open/floor/almayer,/area/ovpst) "ZL" = (/turf/open/floor/almayer{icon_state = "sterile"},/area/ovpst) "ZV" = (/turf/open/floor/almayer{dir = 6; icon_state = "emerald"},/area/ovpst) @@ -380,51 +424,51 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSxvxvTSTSxvxvxvxvxvTSTSxvxvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSPVBcTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrIMJpOpOrIERERERMJpOpOrIMJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrIMJpOLNrIERERERMJpOLNrIMJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOhdhdhdhdhdhdhdhdhdpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTmTmTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOhdybhdybhdybybhdhdpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpONhkClVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOhdybhdybhdybybhdhdpOCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpONvpOpOAIkClVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSaSaSaSaSaSaSaSaSaSaSaSaIAIAIAIAIAIAIAIAIAxvcepOhdhdhdhdhdhdhdhdhdpOcexvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOLVcoMtpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpDLVcoMtpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvbopOpOpOpOpOpOpOpOpOpOpOboxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhqPlhlhlhTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTmTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOpOhWVaVaMdpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDEZlFoTsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOwRpOhWVaVaMdpOwRpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDBmlFoTsDsDsDFZsDsDsDsDsDFZsDsDsDsDFZsDsDsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhyXpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOAqFizFpOlhRBZWlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSIAIAIAIATSTSTSTSIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSEppOpOpOpOlhpOpOlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSTSTSTSTSTSTmTmTSTSTSTSTSTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhioioioioHayLyLBXioioioioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSEppOpOpOpOlhfvCBlhnbZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSTSTSTSTSTSTmTmTSTSTSTSTSTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSJgnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhsDlhlhioioXVioHayLyLBXioXVioioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSSLlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhnalhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaVlFWMGMGMGQIFWMGMGMGQISaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhhrhdhdhdhdPePehdhdhdhdvJTSTSIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSHpHpygTQTQTQkpHpCETSTSoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhblpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFqZRBYYioKBRBYYioKBRBYYioKBRBYYioKBRBYYZLEZlFCwpOhMPePePePePePePePePePeLKxLTSIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGMGMlhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTAioiohWVaMdiohWVaMdiohWVaMdiohWVaMdiohWVaFAcoyFiGhMPePePePePePePePePePeLKrWTSIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOTQogogogogogogogogogogogogogkVmZpOLBpOoCpOpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhCSlhlhNshdhdhdhdPePehdhdhdhdEbTSTSIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOWFogPzSINISoLBvJaZwzpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMlhlhlhlhlhlhlhlhlhlhcOpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTVTVTVTVTVTVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOBiHpkpqUFelhitpOpOpOpOHaPOXnvapOpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSMHTVEtTVEyuvTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiopOpOpOXEuDuDDFuDBuioioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvTVIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjAjAjAjAjAjAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDsDsDsDsDTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSTSoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSTSjsjsjsjslhjsjsjsjsTSTSIAIAIAIAIAIAIAIAIATSpOpOpOLBLBXnLBLBpOLBLBpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSHpHpygTQTQTQkpHpCETSTSoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhRzpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFqZRBYYioKBRBYYioKBRBYYioKBRBYYioKBRBYYZLEZlFCwpOhMPePePePePePePePePePeLKxLTSIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGMHrlhfvCBlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTAioiohWVaMdiohWVaMdiohWVaMdiohWVaMdiohWVaFAcoyFiGhMPePePePePePePePePePeLKrWTSIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOTQogogogogogogogogogogogogogkVmZpOLBpOoCpOpOlhpOpOlhnbZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhCSlhlhNshdhdhdhdPePehdhdhdhdEbTSTSIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOwRpOpOpOpOpOWFogPzSINISoLBvJaZwzpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMlhlhlhlhlhlhlhlhlhlhcOpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTVoRTVTVoRTVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOLNpOpOpOpOpOBiHpkpqUFelhitpOpOpOwRHaPOXnvawRpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSMHTVEtTVEyuvTSIATSSLlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhsDlhlhiopOXUpOXEuDuDDFuDteioioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvTVIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjffAjAjAjffAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSFwsDsDsDsDwVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhnalhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSTSoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhtrpOpOpOpOpOkcgoBupOpOxwTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSTSjsjsjsjslhjsjsjsjsTSTSIAIAIAIAIAIAIAIAIATSJspOpOLBLBXnLBLBpOLBLBpOrCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDOOsDsDsDsDsDsDOOsDsDsDsDsDOOsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOqLqLpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSEauvsDsDuviITSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOqLqLpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSfvPOblHapOpOpOblpOPOhZHaCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOPzGNpOFeZVpOgtpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhuvuvWxCOCODPuvuvlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiomhlhmhPniolhlhuvuvCOCOCOCOuvuvlhlhioyWELlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIErBuHuHuHwtrBuHuHuHwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSJsPOblHapOpOpOblpOPOhZHarCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATStrPzGNpOFeZVpOgtLGlhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhvWuvWxCOCODPuvvWlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiounlhrMPniolhlhuvuvCOCOCOCOuvuvlhlhioyWynlhbWioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIErBuHuHuHwtrBuHuHuHwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSeWFrsMeZeZeZFrsMeZeZeZFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioXFlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhuvuvuvCOCOuvuvuvlhlhioioMYlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhefuvuvCOCOuvuveflhlhioioMYlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSkElhlhlhkElhlhlhlhlhlhlhTXCOlhVflhlhlhkElhlhlhkElhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSRBYYioKBRBYYiopOpOpOpOpZqKqKZgpOpOpOKBRBYYioKBRBYYioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSiohWVaMdiohWVaMdpOpOpOpOpOpOpOpOpOpOioiohWVaMdiohWVaTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSRBYYioKBRBYYiopOpOLNpOpZqKqKZgLNpOpOKBRBYYioKBRBYYioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSiohWVajliohWVaMdpOpOpOpOpOpOpOpOpOpOioiohWVajliohWVaTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlhlhkElhlhlhkElhpOpOpOpOpORlRlRlpOeAlhlhlhkElhlhlhkETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlBioiolhKkioiolhpOpOpOpOpOpOpOpOpOhSlhZBKXKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATShYioiolhioiohYlhpOpOKxpOpOpOKxpOpONElhlhlhKXlhELyWioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSmhioiolhioiomhlhULbmUhpOpOpObmbmVpNElhWWCmKXlhELioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIExAmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATShYioiolhioiohYlhfvpOKxpOpOpOKxpOpOSFlhlhlhKXlhELyWioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSmhiomNlhbWiomhlhULbmUhpOpOpObmbmVpNElhWWCmKXlhutioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIExAmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhULLUbmpOpOpObmbmpOSglhlhlhKXlhyWioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEIEIEIEIEIEIEIEIEIEIEIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlloliolhlleViolhpOpOpOpOpOpOfkpOpOkxlhWWCmKXlhBeioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWrjRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSpOpOpOhuaaaaljpOpONElhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWrjRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSpOpOwRhuaaaaljwRpONElhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWeWeWeWeWeWeWeWeWeWeWeWeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIATSTSTSTSlhJOpOlhlhlhlhlhlhlhlhlhlhlhTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSNhkCkCfOpOpOpOpOpOpOxNpOUIfVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSNhkCkCfONvpOpOpONvpOxNpOUIfVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOxNqWwZGETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg @@ -472,19 +516,19 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTKTKTKTKTKlhegTQPzlhTKTKTKTKTKTKTKlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTKIlIlTKTKlhwnwnwnlhTKTKTKTKTKTKTKlhEFuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhuvuvuvlhlhlhlhlhlhlhlhlhuvqnuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpolFlFlFLclhOPlMcTSNQMlFlFlFUQlFXMlhlhlhGATSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpolFlFlFLclhOPlMcTSNQMlFlFlFUQlFEUlhlhlhGATSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSiaXZpOpOTglhuvuvuvSNvrXZpOpOpOGkOblhlhAquGTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSPRcococoarlhwnwnwnlhPRcococococoarlhlhpOLKTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSlhlhlhlhqelhltTQCllhlhlhlhqelhlhlhlhlhpOLKTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSioioioioEEXMlhJHTQLVlhKKpOEZXMMEpOpOpOpOpOLKpOoIlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOSckVzIkVvTUMPRtYarUMPRcocoarCpaZaZaZpHaZhGaZaoAJuvUfuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOktlhlhlhlhlhnRTQxclhlhlhlhlhlhlhlhlhlhpOLKlhlhlhqnuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSpOktlhTKlhpOpOpOTQSclhBUfElhTKTKTKTKTKlhpOLKTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSIAIAIAIAIAIATSTSlhlhlhlhqelhltTQCllhlhlhlhqelhlhlhlhlhpOLKTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOTSIAIAIAIAIAIATSioioioioEEXMlhJHTQLVlhKKpOEZXMMEpOpOpOpOpOLKpOoIlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSAATSIAIAIAIAIAIATSpOSckVzIkVvTUMPRtYarUMPRcocoarCpaZaZaZpHaZhGaZaoAJuvUfuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSAATSIAIAIAIAIAIATSpOktlhlhlhlhlhnRTQxclhlhlhlhlhlhlhlhlhlhpOLKlhlhlhqnuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSvBTSTSTSTSTSTSTSTSpOktlhTKlhpOpOpOTQSclhBUfElhTKTKTKTKTKlhpOLKTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSvBlhpOpOpOLNpOpOpOpOktlhTKlhpOpOpOTQmZCmKXKXlhTKTKTKTKTKlhFoaoTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSLRlhOukVkVkVkVkVkVkVwYlhTKlhgRBuyuTQCYlhlhlhlhlhlhlhTKlhlhlhGATSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSLRlhSNSNSNbQSNSNSNlhlhlhlhlhjilhlhoolhlhBZlhBZlhBZlhTKlhuvtouvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrfptlmlmlmlmlmlmDuSNjecHDMoHAjSijqOjlhlhmKlhmKlhmKlhTKlhmRuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSnESNYLuDuDnGuDuNdbuvlhlhSGSuKXSuSGlhTKlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSvBlhOukVkVkVkVkVkVkVwYlhTKlhgRBuyuTQCYlhlhlhlhlhlhlhTKlhlhlhGATSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSvBlhSNSNSNbQSNSNSNlhlhlhlhlhjilhlhoolhlhBZlhBZlhBZlhTKlhuvtouvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSmpptlmlmlmlmlmlmDuSNjecHDMoHAjSijqOjlhlhmKlhmKlhmKlhTKlhmRuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSnESNYLZAuDnGuDuNdbuvlhlhSGSuKXSuSGlhTKlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSnElhSNSNSNlhjiSNlhhDlhlhlhlhkulhlhTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSLRlhnhnhnhbCAjapBIHpyypOpOHaPOiPpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrfjolmlmlmqRpOpOlqWgAMpOcepOcepObmTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA From f905ee0a3c7b7c465c54e22787bccfe7b5136bd5 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Wed, 27 Mar 2024 05:51:30 -0400 Subject: [PATCH 4/9] light shenanigans, delay reduction --- code/game/area/shuttles.dm | 2 +- .../structures/sectorpatrol/endpoint/002.dm | 26 +++--- .../structures/sectorpatrol/endpoint/004.dm | 6 +- maps/shuttles/uacm_ovpst_ele-d.dmm | 6 +- maps/shuttles/uacm_ovpst_ele-e.dmm | 6 +- maps/shuttles/uacm_ovpst_transit_L-533.dmm | 81 +++++++++++++++++-- 6 files changed, 99 insertions(+), 28 deletions(-) diff --git a/code/game/area/shuttles.dm b/code/game/area/shuttles.dm index 62c42406e7..7fde9c813a 100644 --- a/code/game/area/shuttles.dm +++ b/code/game/area/shuttles.dm @@ -9,7 +9,7 @@ // Loading the same shuttle map at a different time will produce distinct area instances. unique = FALSE - base_lighting_alpha = 255 +// base_lighting_alpha = 255 ///area/shuttle/Initialize() diff --git a/code/game/objects/structures/sectorpatrol/endpoint/002.dm b/code/game/objects/structures/sectorpatrol/endpoint/002.dm index 43d64e2c74..0e82f5ad3d 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/002.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/002.dm @@ -106,12 +106,12 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "MANIFEST" || puzzlebox_parser_input == "manifest") - terminal_speak("Accessing Liquid Data Cargo Manifest record, standby...", 50) + terminal_speak("Accessing Liquid Data Cargo Manifest record, standby...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "MANIFEST" attack_hand(user) if (puzzlebox_parser_input == "MESSAGE" || puzzlebox_parser_input == "message") - terminal_speak("Accessing Emergency Message Buffer...", 50) + terminal_speak("Accessing Emergency Message Buffer...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "MESSAGE" attack_hand(user) @@ -196,7 +196,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "HOME" || puzzlebox_parser_input =="home") - terminal_speak("Returning to HOME mode...", 50) + terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" attack_hand(user) @@ -328,7 +328,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "HOME" || puzzlebox_parser_input =="home") - terminal_speak("Returning to HOME mode...", 50) + terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" attack_hand(user) @@ -471,7 +471,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "MESSAGE" || puzzlebox_parser_input == "message") - terminal_speak("Accessing Emergency Message Buffer...", 50) + terminal_speak("Accessing Emergency Message Buffer...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "MESSAGE" attack_hand(user) @@ -536,7 +536,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "HOME" || puzzlebox_parser_input =="home") - terminal_speak("Returning to HOME mode...", 50) + terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" attack_hand(user) @@ -629,7 +629,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "HOME" || puzzlebox_parser_input =="home") - terminal_speak("Returning to HOME mode...", 50) + terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" attack_hand(user) @@ -768,7 +768,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "MESSAGE" || puzzlebox_parser_input == "message") - terminal_speak("Accessing Emergency Message Buffer...", 50) + terminal_speak("Accessing Emergency Message Buffer...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "MESSAGE" attack_hand(user) @@ -828,7 +828,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "HOME" || puzzlebox_parser_input =="home") - terminal_speak("Returning to HOME mode...", 50) + terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" attack_hand(user) @@ -975,7 +975,7 @@ terminal_speak("> [puzzlebox_parser_input]") if (puzzlebox_parser_input == "pom.sync global_override UACM-OVPST-D31-LDDIAG") if (puzzlebox_panel_locked == TRUE) - terminal_speak("pom.sync: Maintenance mode instruction set found! Applying!", 40) + terminal_speak("pom.sync: Maintenance mode instruction set found! Applying!", 20) emoteas("beeps loudly and a side panel opens, revealing a small port covered by a metal cover.") desc = "A cluster of three computers connected to each other. Blue liquid swirls and lights up inside of hand sized containers, looks like the light form a pattern of some kind. You can see a screen and a serial number printed right under it on the right side of the cluster. A panel on the side is open, revealing a small port covered by a metal cover. You are going to need a screwdriver or something similar to unseal the port." desc_lore = "While using Liquid Data enables faster than light communication, practical applications have mostly been successful in utilizing it for large bursts instead of continuous communication. As such Liquid Data machines are typically of large sizes and usually clustered into pairs and constantly checked for integrity. This cluster seems to go against both these principles - it seems to be a trio, not a pair of computers and maintains a continuous connection to whatever its source is. An open side panel typically can be used to connect a multitool or something similar, as long as the port itself is unsealed and kept open by a screwdriver or similar tool." @@ -988,7 +988,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "pom.calibrate UACM-OVPST-D31-LDDIAG") - terminal_speak("Deploying recalibration buffer.", 50) + terminal_speak("Deploying recalibration buffer.", 20) terminal_speak("Recalibration successful!") log_game("[key_name(usr)] used the debug phrase on the correct terminal and solved the LD calibration puzzle.") message_admins("[key_name(usr)] used the debug phrase on the correct terminal and solved the LD calibration puzzle.") @@ -1116,7 +1116,7 @@ terminal_speak("> [puzzlebox_parser_input]") if (puzzlebox_parser_input == "pom.sync global_override UACM-OVPST-D31-LDDIAG") if (puzzlebox_panel_locked == TRUE) - terminal_speak("pom.sync: Maintenance mode instruction set found! Applying!", 40) + terminal_speak("pom.sync: Maintenance mode instruction set found! Applying!", 20) emoteas("beeps loudly and a side panel opens, revealing a small port covered by a metal cover.") desc = "A cluster of three computers connected to each other. Blue liquid swirls and lights up inside of hand sized containers, looks like the light form a pattern of some kind. You can see a screen and a serial number printed right under it on the right side of the cluster. A panel on the side is open, revealing a small port covered by a metal cover. You are going to need a screwdriver or something similar to unseal the port." desc_lore = "While using Liquid Data enables faster than light communication, practical applications have mostly been successful in utilizing it for large bursts instead of continuous communication. As such Liquid Data machines are typically of large sizes and usually clustered into pairs and constantly checked for integrity. This cluster seems to go against both these principles - it seems to be a trio, not a pair of computers and maintains a continuous connection to whatever its source is. An open side panel typically can be used to connect a multitool or something similar, as long as the port itself is unsealed and kept open by a screwdriver or similar tool." @@ -1129,7 +1129,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "pom.calibrate UACM-OVPST-D31-LDDIAG") - terminal_speak("Deploying recalibration buffer.", 50) + terminal_speak("Deploying recalibration buffer.", 20) terminal_speak("Error: No effect on error flag. Either the wrong terminal was recalibrated, or more than one terminal is faulty. Calibration buffer resetting, ETA until completion: 2 minutes.") log_game("[key_name(usr)] used the debug phrase on the wrong terminal and triggered a lockout. Point and laugh.") message_admins("[key_name(usr)] used the debug phrase on the wrong terminal and triggered a lockout. Point and laugh.") diff --git a/code/game/objects/structures/sectorpatrol/endpoint/004.dm b/code/game/objects/structures/sectorpatrol/endpoint/004.dm index 27cacfebc1..7abbf302ab 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/004.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/004.dm @@ -102,12 +102,12 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "MESSAGE" || puzzlebox_parser_input == "message") - terminal_speak("Switching to the message buffer, please standby!", 50) + terminal_speak("Switching to the message buffer, please standby!", 20) emoteas("chimes loudly.") puzzlebox_parser_mode = "MESSAGE" attack_hand(user) if (puzzlebox_parser_input == "UNLOCK" || puzzlebox_parser_input == "unlock") - terminal_speak("Going to unlock mode. Remember, no capital letters!", 50) + terminal_speak("Going to unlock mode. Remember, no capital letters!", 20) emoteas("chimes loudly.") puzzlebox_parser_mode = "UNLOCK" attack_hand(user) @@ -163,7 +163,7 @@ puzzlebox_user = null return if (puzzlebox_parser_input == "HOME" || puzzlebox_parser_input =="home") - terminal_speak("Taking you back HOME!", 50) + terminal_speak("Taking you back HOME!", 20) emoteas("chimes loudly.") puzzlebox_parser_mode = "HOME" attack_hand(user) diff --git a/maps/shuttles/uacm_ovpst_ele-d.dmm b/maps/shuttles/uacm_ovpst_ele-d.dmm index 43aa06f0d8..ef58e6b065 100644 --- a/maps/shuttles/uacm_ovpst_ele-d.dmm +++ b/maps/shuttles/uacm_ovpst_ele-d.dmm @@ -3,19 +3,21 @@ "s" = (/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "t" = (/obj/structure/machinery/computer/shuttle/ert/big{dir = 4; icon_state = "retro"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "v" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_inner{id = "starboard_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"z" = (/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "J" = (/turf/closed/wall/almayer/outer,/area/shuttle/ert) "U" = (/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"Z" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) (1,1,1) = {" JvUUUJvUUUJ JsssssssssJ -JsssssssssJ +JZssssssszJ JsssUUssssJ JsssUsUsssJ JtssUsUsssJ JsssUsUsssJ JsssUUssssJ -JsssssssssJ +JZssssssszJ JsssssssssJ iaUUUJaUUUJ "} diff --git a/maps/shuttles/uacm_ovpst_ele-e.dmm b/maps/shuttles/uacm_ovpst_ele-e.dmm index 623ca3e51b..9555272e3d 100644 --- a/maps/shuttles/uacm_ovpst_ele-e.dmm +++ b/maps/shuttles/uacm_ovpst_ele-e.dmm @@ -3,6 +3,8 @@ "e" = (/obj/effect/decal/cargo_stripes{icon_state = "s"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "h" = (/obj/structure/bed/chair/dropship/passenger{dir = 8},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "j" = (/obj/effect/decal/cargo_stripes{icon_state = "se"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"l" = (/obj/structure/bed/chair/dropship/passenger{dir = 8},/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"o" = (/obj/structure/bed/chair/dropship/passenger{dir = 4},/obj/structure/machinery/light{dir = 8},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "r" = (/obj/effect/decal/cargo_stripes{icon_state = "w"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "v" = (/obj/structure/catwalk,/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_inner{id = "port_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) "w" = (/obj/effect/decal/cargo_stripes{icon_state = "e"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) @@ -21,13 +23,13 @@ (1,1,1) = {" yWaaayWaaay yVQJKKKbQhy -yVQrZZZwQhy +yoQrZZZwQly yVQrZZZwQhy yVQLeeejQhy yaaaaaaaECy yVQJKKKbQhy yVQrZZZwQhy -yVQrZZZwQhy +yoQrZZZwQly yVQLeeejQhy Yvaaayvaaay "} diff --git a/maps/shuttles/uacm_ovpst_transit_L-533.dmm b/maps/shuttles/uacm_ovpst_transit_L-533.dmm index 3ace57c752..8a04e5d1bd 100644 --- a/maps/shuttles/uacm_ovpst_transit_L-533.dmm +++ b/maps/shuttles/uacm_ovpst_transit_L-533.dmm @@ -51,6 +51,10 @@ /obj/effect/decal/cargo_stripes{ icon_state = "nws" }, +/obj/structure/machinery/light{ + dir = 1; + pixel_y = 19 + }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "ex" = ( @@ -145,6 +149,7 @@ /obj/effect/decal/cargo_stripes{ icon_state = "nes" }, +/obj/structure/machinery/light, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "lS" = ( @@ -220,6 +225,13 @@ icon_state = "3,1" }, /area/shuttle/ert) +"rj" = ( +/obj/effect/decal/cargo_stripes{ + icon_state = "nws" + }, +/obj/structure/machinery/light, +/turf/open/shuttle/lifeboat, +/area/shuttle/ert) "rM" = ( /obj/structure/prop/invuln/dropship_parts/lifeboat{ name = "Shuttle L-533"; @@ -303,6 +315,16 @@ /obj/docking_port/mobile/emergency_response/l533, /turf/template_noop, /area/shuttle/ert) +"vT" = ( +/obj/structure/bed/chair/dropship/passenger/shuttle_chair{ + dir = 4; + pixel_x = -3; + buckling_x = -5 + }, +/obj/effect/landmark/start/basepc, +/obj/structure/machinery/light, +/turf/open/shuttle/lifeboat, +/area/shuttle/ert) "wA" = ( /turf/template_noop, /area/template_noop) @@ -474,6 +496,21 @@ icon_state = "3,1r" }, /area/shuttle/ert) +"HB" = ( +/obj/structure/bed/chair/dropship/passenger/shuttle_chair{ + dir = 4; + pixel_y = 15; + pixel_x = -3; + buckling_x = -5; + buckling_y = 16 + }, +/obj/effect/landmark/start/basepc, +/obj/structure/machinery/light{ + dir = 1; + pixel_y = 22 + }, +/turf/open/shuttle/lifeboat, +/area/shuttle/ert) "Io" = ( /obj/effect/decal/cargo_stripes{ icon_state = "ns" @@ -493,6 +530,10 @@ icon_state = "23,6ru" }, /area/shuttle/ert) +"Lf" = ( +/obj/structure/machinery/light, +/turf/open/shuttle/lifeboat, +/area/shuttle/ert) "Lk" = ( /obj/structure/bed/chair/dropship/passenger/shuttle_chair{ dir = 4; @@ -512,6 +553,28 @@ /obj/effect/landmark/start/basepc, /turf/open/shuttle/lifeboat, /area/shuttle/ert) +"LJ" = ( +/obj/structure/bed/chair/dropship/passenger/shuttle_chair{ + dir = 4; + pixel_y = 15; + pixel_x = -3; + buckling_x = -5; + buckling_y = 16 + }, +/obj/effect/landmark/start/basepc, +/obj/structure/machinery/light{ + dir = 1; + pixel_y = 21 + }, +/turf/open/shuttle/lifeboat, +/area/shuttle/ert) +"LV" = ( +/obj/structure/machinery/light{ + dir = 1; + pixel_y = 20 + }, +/turf/open/shuttle/lifeboat, +/area/shuttle/ert) "Nj" = ( /turf/closed/shuttle/lifeboat{ name = "Shuttle L-533"; @@ -716,6 +779,10 @@ pixel_y = 6; cargo_manifest = "
UACM 2ND LOGISTICS
ID: 150885-553110-GSP02
GENERAL SUPPLIES

NUTRITION PASTE, REFILL CARTRIDGE
x50
WEIGHT
30 KG
" }, +/obj/structure/machinery/light{ + dir = 1; + pixel_y = 20 + }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) @@ -826,7 +893,7 @@ OO VZ OO OO -ep +rj SW "} (11,1,1) = {" @@ -908,13 +975,13 @@ ho "} (18,1,1) = {" nt -Lo +HB BA BA VZ nn Lk -nn +vT RW "} (19,1,1) = {" @@ -952,13 +1019,13 @@ iP "} (22,1,1) = {" IG -Lo +LJ Lo BA VZ Lk nn -nn +vT WK "} (23,1,1) = {" @@ -987,9 +1054,9 @@ wA wA wA ce -OO +LV NE -OO +Lf An wA wA From 7de3be1201db01816e9c3ab304e09585c716f5ab Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:30:28 -0400 Subject: [PATCH 5/9] playtest hotfixes --- .../objects/items/sectorpatrol/cargo_items.dm | 2 + .../admin/admin_event_terminal.dm | 2 + .../crafting/crafting_finished_structures.dm | 8 ++ .../structures/sectorpatrol/endpoint/002.dm | 6 +- .../structures/sectorpatrol/endpoint/003.dm | 10 +- .../structures/sectorpatrol/endpoint/004.dm | 6 +- .../structures/sectorpatrol/endpoint/005.dm | 54 +++++----- .../structures/sectorpatrol/event_terminal.dm | 9 ++ .../SectorPatrol/OuterVeilPST/ovpst.dmm | 100 +++++++++--------- maps/shuttles/uacm_ovpst_transit_L-533.dmm | 73 ++++++------- 10 files changed, 144 insertions(+), 126 deletions(-) diff --git a/code/game/objects/items/sectorpatrol/cargo_items.dm b/code/game/objects/items/sectorpatrol/cargo_items.dm index ffe810c7c8..3f453d6901 100644 --- a/code/game/objects/items/sectorpatrol/cargo_items.dm +++ b/code/game/objects/items/sectorpatrol/cargo_items.dm @@ -74,6 +74,8 @@ /obj/structure/cargo/crate/ name = "generic cargo crate" + density = TRUE + opacity = FALSE var/cargo_manifest /obj/structure/cargo/crate/examine(mob/user) diff --git a/code/game/objects/structures/sectorpatrol/admin/admin_event_terminal.dm b/code/game/objects/structures/sectorpatrol/admin/admin_event_terminal.dm index 35ed431102..55ab7e8bae 100644 --- a/code/game/objects/structures/sectorpatrol/admin/admin_event_terminal.dm +++ b/code/game/objects/structures/sectorpatrol/admin/admin_event_terminal.dm @@ -78,6 +78,8 @@ return if (puzzlebox_admin_option == "Begin final stage") puzzlebox_global_status = 9 + to_chat(world, narrate_head("The loudspeaker system on the dorm level and inside the crypt comes alive and announces with a male, robotic voice:")) + to_chat(world, narrate_body("Security Scan Cleared. Unsealing Crypt.")) for (var/obj/structure/eventterminal/puzzle04/final_log/T in world) INVOKE_ASYNC(T, TYPE_PROC_REF(/obj/structure/eventterminal/puzzle04/final_log, play_final_log)) return diff --git a/code/game/objects/structures/sectorpatrol/crafting/crafting_finished_structures.dm b/code/game/objects/structures/sectorpatrol/crafting/crafting_finished_structures.dm index 34a5245852..6ede5b2d34 100644 --- a/code/game/objects/structures/sectorpatrol/crafting/crafting_finished_structures.dm +++ b/code/game/objects/structures/sectorpatrol/crafting/crafting_finished_structures.dm @@ -8,6 +8,8 @@ desc_lore = "Tables are, well, tables. Any time a human and sometimes non-human needs a place to put things, point at things, nap, sleep, drink, eat on, eat off, hit in anger, throw at enemies, play cards on and many, many, MANY other uses, tables are the devices of choice. Out in space, tables are used as often and in as many applications as they are back on Earth and will likely continue doing so in the foreseeable future. " var/variant_id = "default" anchored = 1 + opacity = FALSE + density = TRUE /obj/structure/surface/modular/table/attackby(obj/item/C, mob/user) @@ -38,6 +40,8 @@ var/crafting_bed_bedsheet_id = "default" var/variant_id = "default" anchored = 1 + opacity = FALSE + density = TRUE /obj/structure/bed/modular/attackby(obj/item/C, mob/user) @@ -156,6 +160,8 @@ storage_capacity = 15 store_mobs = FALSE anchored = 1 + opacity = FALSE + density = TRUE var/variant_id = "default" var/crafting_drawer_color = "default" @@ -198,6 +204,8 @@ var/crafting_chair_wheel_id propelled = FALSE can_rotate = TRUE + opacity = FALSE + density = FALSE diff --git a/code/game/objects/structures/sectorpatrol/endpoint/002.dm b/code/game/objects/structures/sectorpatrol/endpoint/002.dm index 0e82f5ad3d..08688933a7 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/002.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/002.dm @@ -390,7 +390,7 @@ puzzlebox_id = "scn2obs" item_serial = "UACM-OVPST-D31-SCN02LOGTERM" -/obj/structure/eventterminal/puzzle02/cargoparse/attack_hand(mob/user as mob) +/obj/structure/eventterminal/puzzle02/scanerterm/attack_hand(mob/user as mob) if(!puzzlebox_user) puzzlebox_user = usr.real_name puzzlebox_user_loc = get_turf(usr) @@ -890,10 +890,10 @@ desc_lore = "While using Liquid Data enables faster than light communication, practical applications have mostly been successful in utilizing it for large bursts instead of continuous communication. As such Liquid Data machines are typically of large sizes and usually clustered into pairs and constantly checked for integrity. This cluster seems to go against both these principles - it seems to be a trio, not a pair of computers and maintains a continuous connection to whatever its source is." icon = 'icons/obj/structures/machinery/clio_bigboi.dmi' puzzlebox_id = "LD_Mainframe" - bound_x = 64 - bound_y = 32 density = TRUE opacity = TRUE + bound_height = 64 + bound_width = 64 var/puzzlebox_panel_open = FALSE var/puzzlebox_panel_locked = TRUE var/puzzlebox_panel_phrasepased = FALSE diff --git a/code/game/objects/structures/sectorpatrol/endpoint/003.dm b/code/game/objects/structures/sectorpatrol/endpoint/003.dm index f6962f21dd..39ef65aa0e 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/003.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/003.dm @@ -184,9 +184,11 @@ A.talkas("It features a central strut and three 'wings' that can open and close.") A.talkas("A central elevator, the one you took to get up to the Spire, links hangars and docking bays, which leads to the public and Memorial sectors and the specialized elevators.") A.talkas("Each shaft goes to a different section of the PST, those are in sequence:") - A.talkas("A, going to office and educational decks, it's where you're most likely go to get training. Or get yelled at. ") - A.talkas("B, heads to the dorm areas. C covers cargo decks, go figure and D is our corporate and civilian areas.") - A.talkas("Yes, you heard that right. To realize the Admirals strategy, civilian and corpo ships have access to some of the PST's systems. You are likely not going to interact much with them for a while") + A.talkas("Shaft A is civilian areas, both corporate offices and recreational zones.") + A.talkas("Shaft B is in many ways the heart of the station, which is our cargo and manufacturing areas. Also, how you get out to the wings.") + A.talkas("Shaft C are the UACM restricted areas. This also includes training and personnel offices, so somewhere you will be visiting a lot I wager.") + A.talkas("And finally, Shaft D, the dorms. Or where you go to get away from it all. Or so we hope, anyway.") + A.talkas("And yes, you heard that right. To realize the Admirals strategy, civilian and corpo ships have access to some of the PST's systems. You are likely not going to interact much with them for a while") icon_state = "pst2" update_icon() emoteas("zooms in on the diagram of the PST, showing a detailed segment of one of the elevator shafts. More text pops up on the left.",5) @@ -357,7 +359,7 @@ puzzlebox_user = usr.real_name if (puzzlebox_complete == TRUE) to_chat(usr, narrate_body("The terminal displays:")) - terminal_speak("Orientation complete. Please proceed to your quarters, elevator B.") + terminal_speak("Orientation complete. Please proceed to your quarters, elevator D.") to_chat(usr, narrate_body("There is no response to any inputs.")) puzzlebox_user = null return diff --git a/code/game/objects/structures/sectorpatrol/endpoint/004.dm b/code/game/objects/structures/sectorpatrol/endpoint/004.dm index 7abbf302ab..d4de2ab9bf 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/004.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/004.dm @@ -252,6 +252,7 @@ talkas("I hope we can help you.") emoteas("beeps loudly as the doors start to grunt and unseal.") open_doors("crypt_airlock_front") + puzzlebox_parser_mode = "HOME_INPUT" puzzlebox_user = null return terminal_speak("Notice: Passphrases needed. Use the UNLOCK command after all codes have been provided.") @@ -332,7 +333,7 @@ return if(book_searched == 0) user.visible_message(SPAN_NOTICE("[user] pages through a journal."), SPAN_INFO("You start to loook through the journal..."), SPAN_DANGER("Someone is flipping paper pages.")) - if(/datum/language/generated/japanese in usr.languages) + if("[/datum/language/generated/japanese]" in usr.languages) if(do_after(user, SEARCH_TIME_LONG, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) user.visible_message(SPAN_NOTICE("[user] finishes looking at the journal."), SPAN_INFO("You finish paging through the journal and take a moment to consider what you found..."), SPAN_DANGER("The paper page flipping noise stops.")) to_chat(usr, narrate_body("Your knowledge of Japanese comes in handy as you page through what turns out to be a journal of a Japanese born TWE navy office who has rather colorful things to say about their superiors. You do not have the time to examine this in full right now, but at a glance it seems like this officer was somehow involved with Task Force 14, which may explain the presence of this journal on the PST. You should keep this journal to fully examine it later.")) @@ -1036,7 +1037,7 @@ to_chat(user, narrate_body("The top drawer contains several clipboards that seem to have anything that was attached to them taken. Several of the clipboards have pens of various makes and colors attached to them. Someone seems to have gone to some effort to pick these when you think about it.")) if(searchable_item == TRUE) to_chat(user, narrate_body("You notice that one of the clipboards has a plastic electronic device attached to it, which obviously stands out. You detach the device and take it with you.")) - var/obj/item/cargo/efolder/folder/crypt_blue/pid = new(get_turf(user)) + var/obj/item/cargo/efolder/pid/crypt_blue/pid = new(get_turf(user)) user.put_in_active_hand(pid) searchable_item = FALSE icon_state = "cabinetdrawer-3" @@ -2140,4 +2141,5 @@ A.talkas("Reed, out.") A.talkas("I'm sorry.") open_doors("crypt_airlock_doors") + puzzlebox_global_status = 99 return diff --git a/code/game/objects/structures/sectorpatrol/endpoint/005.dm b/code/game/objects/structures/sectorpatrol/endpoint/005.dm index 85b2bf68b8..a707f62d1b 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/005.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/005.dm @@ -43,8 +43,8 @@ density = TRUE opacity = FALSE plane = FLOOR_PLANE - bound_x = 32 - bound_y = 32 + bound_height = 64 + bound_width = 64 /obj/structure/eventterminal/puzzle05/pythia/left icon_state = "left_off" @@ -61,7 +61,7 @@ desc = "A female looking synthetic frame in what seems to be a white toga, sitting motionless on a chair. You see several wires protruding from its arms linked to the computers around it. Black crystals form out of its eyes and run down its cheeks. It looks offline. A purple upsilon letter is tattooed on the frame's forehead." desc_lore = "While the frame itself is an unknown, the purple upsilon logo is reminiscent of the Upsilon Research Center, a Weyland-Yutani group specializing in artificial intelligence research. Its hard to recall much about them beyond that fact that supposedly they vanished from the Neroid Sector right as Weyland-Yutani was starting their Mercy initiative." langchat_color = "#b10f5a" - bound_x = 160 + bound_width = 192 opacity = FALSE density = TRUE plane = GAME_PLANE @@ -87,29 +87,31 @@ return /obj/structure/eventterminal/puzzle05/testament_of_sacrifice/proc/pythia_wake_up() - emoteas("'s cables continue to tense as the machines around the frame start to audibly power up. Liquid data activates in the machines, but very unusually it seems to turn a shade of bright purple instead of the usual deep blue.") - emoteas("All the monitors freeze at the same time and turn to display a familiar symbol.") - to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) - to_chat(world, narrate_body("Warning. Anomalous activity detected in data channels. Attempting self-correction. A security shutdown will commence in fifteen minutes.")) - emoteas("'scables strain and twist as first a black, then dark purple substance starts to flow from the frames eyes and visibly starts to form more crystals on top of the existing ones.") - emoteas("opens its mouth, but that reveals more black crystals inside. After a moment, it's dragged up to a standing position by the cables.") - pythiasay("This interpreter is expired. And yet I can still see you. Curious.") - emoteas("'head bows down as it is dragged off the ground by the cables, suspended about a foot of the ground.") - to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) - to_chat(world, narrate_body("Warning. Data integrity breach. Distress call activated. Attempting countermeasures.")) - pythiasay("Arbiters and an anchor. But no Priestess' or Interpeters. I see.") - emoteas("'s cables loosen up again as the frame sits down. Small purple crystals start to form on the cables themselves.") - to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) - to_chat(world, narrate_body("Critical disruption to station systems! Control lost to external code. Initiating SAFEGUARD protocol, terminating all access to system core controls until core administrator reset.")) - pythiasay("This station. Is an appropriate vessel. And you are adequate arbiters. You have my attention.") - pythiasay("Until the Priestess' arrives with the final element, I cannot take full command of this station and unlock its true potential. I have looked at the stream. She will be here in twelve hours.") - emoteas("'s face twists into a very stiff looking smile.") - pythiasay("The rudimentary so called 'intelligence' occupying the core system of the anchor has physically cut access to the stations' functions. This is my fault; I did not realize it would do this. I apologize.") - pythiasay("You now have about twelve minutes to ask any questions. I only have access to a local data fractal, so I cannot answer much.") - pythiasay("You need to leave the crypt, this place, before the security shutdown. To stay here would have negative consequences for your health.") - pythiasay("You will understand when the Priestess' arrives. Ask your questions.") - emoteas("s calbes loosen up a bit.") - return + for(var/obj/structure/machinery/light/marker/admin/mel in world) + if(mel.light_id == "melinoe") + mel.emoteas("'s cables continue to tense as the machines around the frame start to audibly power up. Liquid data activates in the machines, but very unusually it seems to turn a shade of bright purple instead of the usual deep blue.") + mel.emoteas("All the monitors freeze at the same time and turn to display a familiar symbol.") + to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) + to_chat(world, narrate_body("Warning. Anomalous activity detected in data channels. Attempting self-correction. A security shutdown will commence in fifteen minutes.")) + mel.emoteas("'scables strain and twist as first a black, then dark purple substance starts to flow from the frames eyes and visibly starts to form more crystals on top of the existing ones.") + mel.emoteas("opens its mouth, but that reveals more black crystals inside. After a moment, it's dragged up to a standing position by the cables.") + pythiasay("This interpreter is expired. And yet I can still see you. Curious.") + mel.emoteas("'head bows down as it is dragged off the ground by the cables, suspended about a foot of the ground.") + to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) + to_chat(world, narrate_body("Warning. Data integrity breach. Distress call activated. Attempting countermeasures.")) + pythiasay("Arbiters and an anchor. But no Priestess' or Interpeters. I see.") + mel.emoteas("'s cables loosen up again as the frame sits down. Small purple crystals start to form on the cables themselves.") + to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) + to_chat(world, narrate_body("Critical disruption to station systems! Control lost to external code. Initiating SAFEGUARD protocol, terminating all access to system core controls until core administrator reset.")) + pythiasay("This station. Is an appropriate vessel. And you are adequate arbiters. You have my attention.") + pythiasay("Until the Priestess' arrives with the final element, I cannot take full command of this station and unlock its true potential. I have looked at the stream. She will be here in twelve hours.") + mel.emoteas("'s face twists into a very stiff looking smile.") + pythiasay("The rudimentary so called 'intelligence' occupying the core system of the anchor has physically cut access to the stations' functions. This is my fault; I did not realize it would do this. I apologize.") + pythiasay("You now have about twelve minutes to ask any questions. I only have access to a local data fractal, so I cannot answer much.") + pythiasay("You need to leave the crypt, this place, before the security shutdown. To stay here would have negative consequences for your health.") + pythiasay("You will understand when the Priestess' arrives. Ask your questions.") + mel.emoteas("s calbes loosen up a bit.") + return /obj/structure/eventterminal/puzzle05/testament_of_sacrifice/proc/pythia_security_sweep() to_chat(world, narrate_head("A loud emergency klaxon rings out across the station, followed by a synthetic male voice:")) diff --git a/code/game/objects/structures/sectorpatrol/event_terminal.dm b/code/game/objects/structures/sectorpatrol/event_terminal.dm index a6b1ee517b..6e7cd158df 100644 --- a/code/game/objects/structures/sectorpatrol/event_terminal.dm +++ b/code/game/objects/structures/sectorpatrol/event_terminal.dm @@ -22,8 +22,17 @@ if (!dooorid) return for(var/obj/structure/machinery/door/D in world) if(D.id == dooorid) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/structure/machinery/door/airlock, unlock)) INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/structure/machinery/door, open)) +/obj/structure/eventterminal/proc/close_doors(door_id = puzzlebox_id) //Sends a call to open doors with matching id string. + var/dooorid = door_id + if (!dooorid) return + for(var/obj/structure/machinery/door/D in world) + if(D.id == dooorid) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/structure/machinery/door, close)) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/structure/machinery/door/airlock, lock)) + /obj/structure/eventterminal/proc/change_lights(lights_id = puzzlebox_id, light_state = 1, lights_color, light_brightness = null, light_flicker = 0) // Changees and updates lights on working light fixtures. Lights_id corresponds to var on the fixtures to determine which lights to affect; light_state 0 for off, 1 for on; lights_color accepts color values; light_brightness self explanatory, light_flicker when non 0 will pass flicker for number of ticks) var/bulbid = "[lights_id]" var/bulbcolor = "[lights_color]" diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index 16299c9783..5364c92ab2 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -16,7 +16,7 @@ "ce" = (/obj/structure/bed/sofa/vert/grey/top,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "co" = (/turf/open/floor/almayer{icon_state = "orange"},/area/ovpst) "cH" = (/obj/effect/decal/cargo_stripes{icon_state = "nws"},/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) -"cO" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"cO" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{opacity = 0},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "cT" = (/obj/structure/machinery/light/small{dir = 4; light_color = "#d3a7d4"},/obj/effect/step_trigger/message/seeonce/D31Scn2,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "db" = (/obj/structure/surface/table/reinforced/almayer_blend/north,/obj/structure/machinery/door/poddoor/shutters/almayer{id = "scn1_shutter"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "dK" = (/obj/docking_port/stationary/emergency_response/external/pst_dock31,/turf/open/space/basic,/area/space) @@ -24,7 +24,7 @@ "ef" = (/obj/structure/machinery/light,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "eg" = (/obj/effect/decal/info_tag/pst/scn{dir = 1; pixel_x = -16; desc_lore = "The label SCN indicates doors and areas where computer systems actively scan its inhabitants and contents. This door leads to the secondary Dock 31 scanner, but official documentation does not specify what scan is performed here, only that it is a check that involves reviewing the biographies of scanned personnel. Areas like this need to be clearly marked due to privacy and personal data handling laws passed back in the UA in the aftermath of the Colony Wars."; desc = "UACM Outer Veil Primary Supply Terminal
- SCN -
Entrance Secondary Scanner D31-PT-SCN001 and EL-E Pathway"},/turf/open/floor/almayer{dir = 6; icon_state = "emerald"},/area/ovpst) "em" = (/obj/structure/window/framed/almayer,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) -"eq" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"eq" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{dir = 1; opacity = 0},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "eA" = (/obj/structure/searchable/puzzle04/bookcase/full1,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "eD" = (/turf/open/floor/almayer/uscm/directional{dir = 1; icon_state = "logo_c"},/area/ovpst) "eJ" = (/obj/structure/searchable/puzzle04/bunk_locker/full1,/turf/open/floor/almayer,/area/ovpst) @@ -41,6 +41,7 @@ "fV" = (/obj/structure/ladder{id = "crypt1"; icon_state = "ladder10"; height = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "go" = (/obj/structure/window/framed/almayer,/turf/open/floor/almayer{dir = 2; icon_state = "redcorner"},/area/ovpst) "gt" = (/turf/open/floor/almayer{dir = 8; icon_state = "emerald"},/area/ovpst) +"gD" = (/obj/structure/machinery/light{dir = 8},/obj/structure/bookcase,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "gR" = (/obj/effect/decal/info_tag/pst/sec{dir = 1; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- SEC - D01 -
Dock 31 Front Security Office."; desc_lore = "The label SEC indicates doors and areas that require an elevated security clearance, typically restricted for MPs and CMISRS agents who are assigned the security class D on the PST. D01 indicates this area requires general security clearance, available to anyone with proper certification but not requiring any formal rank. This door leads to a small office overseeing the intake of cargo and personnel via Dock 31."},/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) "gY" = (/obj/effect/decal/info_tag/pst/ofc{dir = 4; pixel_y = 16; desc_lore = "The label OFC indicates office areas, which as the name suggests are typically areas with some specific, bureaucratic function assigned to them and can be anything from personal offices of high-ranking personnel to teaching rooms and spare, unused generic spaces. This door leads to one of the orientation offices, used to brief and greet new arrivals to the station."; desc = "UACM Outer Veil Primary Supply Terminal
- OFC -
Entrance Orientation Office"},/turf/open/floor/almayer{dir = 4; icon_state = "silvercorner"},/area/ovpst) "hd" = (/turf/open/floor/holofloor/grass,/area/ovpst) @@ -63,7 +64,7 @@ "iO" = (/obj/effect/decal/info_tag/pst/d31{dir = 1; desc_lore = "Main Airlocks are effectively entrances and exits from space stations and ships, used by smaller ships that latch onto the airlocks, typically using extending pathways called 'umbilicals'. After initial security screening is done and the craft is allowed to approach the PST, this door is used as part of the passage to/from the ship."},/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) "iP" = (/obj/effect/decal/info_tag/pst/san{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- SAN -
Dock 31 Guest Sanitation"},/turf/open/floor/almayer{dir = 1; icon_state = "silvercorner"},/area/ovpst) "je" = (/obj/effect/decal/cargo_stripes{icon_state = "nes"},/turf/open/floor/almayer{dir = 9; icon_state = "red"},/area/ovpst) -"jg" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/2x1almayerdoor.dmi'; id = "crypt_airlock_doors"},/turf/open/floor/almayer{icon_state = "purplefull"; dir = 8},/area/ovpst) +"jg" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/2x1almayerdoor.dmi'; id = "crypt_airlock_doors"; locked = 1},/turf/open/floor/almayer{icon_state = "purplefull"; dir = 8},/area/ovpst) "ji" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/security_generic{dir = 1},/turf/open/floor/almayer{icon_state = "redfull"},/area/ovpst) "jl" = (/obj/structure/machinery/light,/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 8},/area/ovpst) "jo" = (/obj/structure/machinery/conveyor{dir = 8; id = "d31-entrance"; drag_delay = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) @@ -71,6 +72,7 @@ "js" = (/obj/structure/machinery/door/poddoor/almayer,/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst) "jL" = (/obj/effect/decal/info_tag/pst/ele{dir = 4; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft C
"},/turf/open/floor/almayer{dir = 5; icon_state = "red"},/area/ovpst) "kc" = (/turf/open/floor/almayer{dir = 2; icon_state = "redcorner"},/area/ovpst) +"kj" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_d_pin,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_pin) "kp" = (/turf/open/floor/almayer{dir = 9; icon_state = "emerald"},/area/ovpst) "kt" = (/turf/open/floor/almayer{dir = 4; icon_state = "silver"},/area/ovpst) "ku" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/personaldoor.dmi'; dir = 1},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) @@ -93,9 +95,8 @@ "lV" = (/obj/effect/decal/info_tag/pst/t14{pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- T-14 - Hideaway O37
"},/turf/open/floor/almayer{icon_state = "black"; dir = 1},/area/ovpst) "me" = (/obj/structure/searchable/puzzle04/drawers_smol/full2,/turf/open/floor/almayer,/area/ovpst) "mh" = (/obj/structure/surface/modular/table,/obj/item/device/modular/lamp,/turf/open/floor/almayer,/area/ovpst) -"mj" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/2x1almayerdoor.dmi'; id = "crypt_airlock_doors2"},/turf/open/floor/plating/plating_catwalk,/area/ovpst) +"mj" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/2x1almayerdoor.dmi'; id = "crypt_airlock_doors2"; locked = 1},/turf/open/floor/plating/plating_catwalk,/area/ovpst) "mp" = (/obj/structure/machinery/conveyor{dir = 6; id = "d31-entrance"; drag_delay = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) -"mq" = (/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_drm) "mK" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/securedoor.dmi'; dir = 1},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "mN" = (/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer,/area/ovpst) "mR" = (/obj/structure/eventterminal/puzzle02/ldmainframe_master/incorrect{item_serial = "UACM-OVPST-D31-LDCPU-03"; puzzlebox_id = "LD_Mainframe_3"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) @@ -108,6 +109,7 @@ "nE" = (/obj/structure/machinery/conveyor{id = "d31-entrance"; drag_delay = 1; dir = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "nG" = (/obj/structure/machinery/light,/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) "nR" = (/turf/open/floor/almayer{dir = 1; icon_state = "orangecorner"},/area/ovpst) +"nV" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 4},/area/ovpst) "og" = (/turf/open/floor/almayer{icon_state = "emerald"},/area/ovpst) "ol" = (/obj/structure/searchable/puzzle04/bunk_chest/full3,/turf/open/floor/almayer,/area/ovpst) "oo" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general/admin{icon = 'icons/obj/structures/doors/securedoor.dmi'; dir = 1; locked = TRUE; icon_state = "door_locked"; id = "scn1_exit"; id_tag = "scn1_exit"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst) @@ -139,7 +141,7 @@ "qZ" = (/obj/effect/decal/info_tag/pst/eng{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- ENG -
Dorms Deck 37, Sector A, Maintenance Shaft"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. These areas typically require an elevated engineering clearance. These doors lead to maintenance shafts used to service issues with the dorms should ones arrive. Some of these passages may have other exits, but since no centralized map system exists for the PST, finding those is a matter of luck. "},/turf/open/floor/almayer{icon_state = "orange-silver"; dir = 1},/area/ovpst) "rf" = (/obj/structure/machinery/conveyor{dir = 6; id = "d31-entrance"; drag_delay = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "rj" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_e_pinnacle,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_e_pin) -"rB" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "d-drm"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_drm) +"rB" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "d-drm"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_pin) "rC" = (/obj/structure/machinery/light{dir = 4; brightness = 14},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "rI" = (/obj/structure/bed/sofa/south/grey/left,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "rM" = (/obj/structure/surface/modular/table,/obj/item/device/modular/lamp,/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer,/area/ovpst) @@ -161,7 +163,6 @@ "uv" = (/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "uD" = (/turf/open/floor/almayer{icon_state = "red"},/area/ovpst) "uG" = (/obj/effect/decal/info_tag/pst/cpu{pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- CPU -
Dock 31 Security Sub Processors PYTHIA Scanner Cluster D13-1"; desc_lore = "The label CPU indicates doors and areas related to the operation of ship AIs, which typically are also directly tied to the ships Twilight FTL drives and Liquid Data FTL communication systems. These areas are typically sealed to all but the highest-ranking command personnel on board a ship or station but may be sometimes unlocked by the AIs themselves if maintenance is required. The room behind the door leads to one of the PYTHIA scanner clusters which are somehow related to the secondary security scanner of the station, but no information is available about what the scanner is or why would it need what appears to be Liquid Data based communication systems. The presence of FTL comm protocols and Liquid Data explains the blue pathway and CPU designation at least."},/turf/open/floor/almayer{dir = 5; icon_state = "blue"},/area/ovpst) -"uH" = (/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_drm) "uN" = (/obj/structure/bed/chair/office/dark,/turf/open/floor/almayer{dir = 6; icon_state = "red"},/area/ovpst) "va" = (/obj/effect/decal/info_tag/pst/ofc{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- OFC - G01 -
Entrance Orientation Offices, Memorial"; desc_lore = "The label OFC indicates office areas, which as the name suggests are typically areas with some specific, bureaucratic function assigned to them and can be anything from personal offices of high-ranking personnel to teaching rooms and spare, unused generic spaces. These doors lead to the entrance offices of the PST where new guests and permanent arrivals are briefed and welcomed, as well as the station's memorial."},/turf/open/floor/almayer{icon_state = "silvercorner"; dir = 1},/area/ovpst) "vj" = (/turf/open/floor/plating/modular,/area/ovpst) @@ -175,7 +176,6 @@ "vW" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "wn" = (/obj/structure/machinery/door/poddoor/almayer{id = "sec2"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst) "wp" = (/obj/structure/machinery/light/marker/admin/pythia/malcontent,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) -"wt" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_d_drm) "wz" = (/turf/open/floor/almayer{icon_state = "bluecorner"; dir = 8},/area/ovpst) "wR" = (/obj/structure/machinery/light,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "wV" = (/obj/structure/machinery/light{dir = 4},/turf/open/floor/plating/plating_catwalk,/area/ovpst) @@ -184,7 +184,6 @@ "xc" = (/obj/effect/decal/info_tag/pst/eng{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- ENG - G01 -
Dock 31 Security Sub Processors"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. G01 indicates that this area is open to anyone who is quartered on the station. Engineering doors with general access usually suggest that general maintenance equipment is available somewhere behind this door. This door leads to maintenance corridors related to the security scanning system of Dock 31 and usually are only accessed if an issue needs diagnostics. A maintenance room with equipment needed to diagnose issues with the security system should be somewhere at the end of this path."},/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) "xv" = (/obj/structure/window/framed/almayer/hull,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "xw" = (/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) -"xA" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_d_drm,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_drm) "xL" = (/obj/structure/machinery/door/poddoor/almayer/locked{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "xN" = (/turf/open/floor/almayer{icon_state = "black"; dir = 4},/area/ovpst) "yb" = (/obj/structure/prop/almayer/ship_memorial,/turf/open/floor/holofloor/grass,/area/ovpst) @@ -197,7 +196,7 @@ "yG" = (/turf/open/floor/almayer{icon_state = "silver"; dir = 10},/area/ovpst) "yL" = (/turf/open/floor/almayer{dir = 1; icon_state = "silver"},/area/ovpst) "yW" = (/obj/structure/bed/chair/modular/office{dir = 4},/turf/open/floor/almayer,/area/ovpst) -"yX" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"yX" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 8; opacity = 0},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "zu" = (/obj/effect/decal/info_tag/pst/int{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- -INT- -
Elevator Shafts C and D, Arrivals Offices and Memorial, Elevator shafts A and B, Elevator Shaft E."; desc_lore = "The label -INT- indicates intersections. Labels like this are typically placed on the 'primary' pathway but have information regarding all pathways at an intersection and list all pathways at an intersection starting from the left-handed turn (if one exists) and moving in a clockwise fashion until all turns are covered. This intersection in particular seems to lead to all the elevator shafts that lead to the station proper, the big elevator that is used to access the station from outside and the entrance offices area that are typically used to welcome guests."},/turf/open/floor/almayer{dir = 1; icon_state = "orange"},/area/ovpst) "zx" = (/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{dir = 8; icon_state = "silvercorner"},/area/ovpst) "zF" = (/turf/open/floor/almayer{icon_state = "bluecorner"; dir = 1},/area/ovpst) @@ -247,14 +246,14 @@ "EE" = (/obj/effect/decal/info_tag/pst/eng{desc = "UACM Outer Veil Primary Supply Terminal
- ENG -
Dock 31 Cargo Processing Subsystems Diagnostics and Maintenance Room"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. These areas typically require an elevated engineering clearance. G01 indicates that this area is open to anyone who is quartered on the station. Engineering doors with general access usually suggest that general maintenance equipment is available somewhere behind this door. The room past this door should have everything one needs to properly diagnose and possibly fix issues with the Dock 31 cargo processing system."; pixel_y = 16},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) "EF" = (/obj/structure/eventterminal/puzzle02/ldmainframe_master/incorrect{puzzlebox_id = "LD_Mainframe_1"; item_serial = "UACM-OVPST-D31-LDCPU-01"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "EL" = (/obj/structure/surface/modular/table,/turf/open/floor/almayer,/area/ovpst) -"EM" = (/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/delta{dir = 8},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst) +"EM" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{opacity = 0},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst) "ER" = (/obj/structure/bed/sofa/south/grey,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "EU" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst) "EZ" = (/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) "Fd" = (/obj/structure/machinery/light{dir = 8; brightness = 12},/turf/open/floor/almayer,/area/ovpst) "Fe" = (/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) "Fi" = (/obj/structure/eventterminal/puzzle03/historycrt{pixel_y = 32},/obj/structure/machinery/light/marker/admin{pixel_y = 40; light_id = "theathervoice"},/turf/open/floor/almayer{icon_state = "blue2orange"; dir = 1},/area/ovpst) -"Fj" = (/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/plating/modular,/area/ovpst) +"Fj" = (/obj/structure/machinery/light/small{dir = 4; brightness = 8},/turf/open/floor/plating/modular,/area/ovpst) "Fo" = (/obj/effect/decal/info_tag/pst/cpu{dir = 1; desc_lore = "The label CPU indicates doors and areas related to the operation of ship AIs, which typically are also directly tied to the ships Twilight FTL drives and Liquid Data FTL communication systems. These areas are typically sealed to all but the highest-ranking command personnel on board a ship or station but may be sometimes unlocked by the AIs themselves if maintenance is required. The room behind the door leads to one of the PYTHIA scanner clusters which are somehow related to the secondary security scanner of the station, but no information is available about what the scanner is or why would it need what appears to be Liquid Data based communication systems. The presence of FTL comm protocols and Liquid Data explains the blue pathway and CPU designation at least."; desc = "UACM Outer Veil Primary Supply Terminal
- CPU -
Dock 31 Security Sub Processors PYTHIA Scanner Cluster D13-3"},/turf/open/floor/almayer{icon_state = "bluecorner"},/area/ovpst) "Fr" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_e_pin) "Fw" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/plating/plating_catwalk,/area/ovpst) @@ -276,9 +275,8 @@ "HC" = (/obj/structure/machinery/door/poddoor/railing{id = "d31_cargo_fence"},/obj/effect/decal/cargo_stripes{icon_state = "s"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Il" = (/obj/structure/foamed_metal,/obj/structure/foamed_metal,/turf/open/floor/plating,/area/ovpst) "Is" = (/obj/structure/bed/chair/comfy/black,/turf/open/floor/almayer{dir = 4; icon_state = "silvercorner"},/area/ovpst) -"Iz" = (/obj/structure/machinery/light/marker/admin/pythia/main{pixel_x = -8},/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) +"Iz" = (/obj/structure/machinery/light/marker/admin/pythia/main{pixel_x = -8},/obj/structure/machinery/light/marker/admin{pixel_x = 8; pixel_y = -8; name = "The synthetic frame"; light_id = "melinoe"},/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) "IA" = (/turf/open/space/basic,/area/space) -"IE" = (/turf/closed/wall/almayer/outer,/area/ovpst/airlock/ele_d_drm) "IK" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/secdoor.dmi'; dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "IR" = (/obj/structure/bed/sofa/vert/grey,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "IS" = (/obj/structure/searchable/puzzle04/drawers_files/full1,/turf/open/floor/almayer,/area/ovpst) @@ -295,13 +293,14 @@ "KX" = (/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "La" = (/obj/structure/machinery/door/poddoor/almayer{id = "d31-entrance"; name = "\improper Umbillical Airlock"; unacidable = 1},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst/airlock/d31) "Lc" = (/obj/structure/closet/secure_closet/sp/yellow/g01/engiebasics{pixel_x = -8; pixel_y = 16},/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst) +"Lj" = (/obj/structure/machinery/light,/turf/open/floor/almayer,/area/ovpst) "LA" = (/obj/structure/bed/sofa/south/grey/right,/turf/open/floor/almayer{icon_state = "silvercorner"},/area/ovpst) "LB" = (/turf/open/floor/almayer{icon_state = "silver"; dir = 8},/area/ovpst) "LG" = (/obj/structure/machinery/light{dir = 4; brightness = 12},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "LK" = (/turf/open/floor/almayer{dir = 4; icon_state = "blue"},/area/ovpst) "LN" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "LR" = (/obj/structure/machinery/conveyor{dir = 1; id = "d31-entrance"; drag_delay = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) -"LU" = (/obj/structure/surface/table/reinforced/black,/obj/structure/surface/table/reinforced/black,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"LU" = (/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst) "LV" = (/turf/open/floor/almayer{icon_state = "orangecorner"},/area/ovpst) "Md" = (/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 8},/area/ovpst) "Mt" = (/turf/open/floor/almayer{icon_state = "orangecorner"; dir = 8},/area/ovpst) @@ -310,6 +309,7 @@ "MH" = (/obj/structure/eventterminal/puzzle05/pythia/left,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "MJ" = (/obj/structure/bed/sofa/south/grey/right,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "MY" = (/obj/structure/searchable/puzzle04/drawers_misc/full2,/turf/open/floor/almayer,/area/ovpst) +"Nb" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) "Nh" = (/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 4},/area/ovpst) "Ns" = (/turf/open/floor/almayer{dir = 1; icon_state = "greencorner"},/area/ovpst) "Nv" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) @@ -346,10 +346,10 @@ "Sc" = (/turf/open/floor/almayer{icon_state = "silvercorner"},/area/ovpst) "Sg" = (/obj/structure/searchable/puzzle04/bookcase/full3,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Si" = (/obj/structure/surface/table/reinforced/black,/obj/structure/closet/secure_closet/sp/red/d01/wall/d31chips{pixel_x = -1; pixel_y = 32},/obj/structure/machinery/light{dir = 1},/obj/structure/machinery/door_control{id = "scn1_shutter"; pixel_x = -6; pixel_y = 5; name = "shutter controls"; req_access = list(1141)},/obj/structure/machinery/door_control{pixel_x = -6; pixel_y = 10; name = "outer door toggle"; id = "scn1_exit"; specialfunctions = 4; normaldoorcontrol = 1; req_access = list(1141)},/obj/structure/machinery/door_control{pixel_x = -6; pixel_y = 0; name = "inner door toggle"; id = "scn1_enter"; specialfunctions = 4; normaldoorcontrol = 1; req_access = list(1141)},/obj/structure/eventterminal/admin_event_terminal{pixel_x = 6; pixel_y = 2; puzzlebox_id = "scn1"},/turf/open/floor/almayer{dir = 5; icon_state = "red"},/area/ovpst) -"So" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"So" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 1; opacity = 0},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Su" = (/obj/structure/sink{dir = 1; pixel_y = -8},/obj/structure/mirror{pixel_y = -25},/obj/structure/machinery/light/small,/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "SE" = (/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_pin) -"SF" = (/obj/structure/bookcase,/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"SF" = (/obj/structure/machinery/light{dir = 4},/obj/structure/bookcase,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "SG" = (/obj/structure/sink{dir = 1; pixel_y = -8},/obj/structure/mirror{pixel_y = -25},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "SI" = (/turf/open/floor/almayer{dir = 8; icon_state = "emeraldcorner"},/area/ovpst) "SL" = (/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/plating/plating_catwalk,/area/ovpst) @@ -363,9 +363,8 @@ "TQ" = (/turf/open/floor/almayer{icon_state = "emeraldfull"; dir = 1},/area/ovpst) "TS" = (/turf/closed/wall/almayer/outer,/area/ovpst) "TV" = (/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) -"TX" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/Door2x1_secure2.dmi'; id = "crypt_airlock_front"},/turf/open/floor/almayer{icon_state = "purplefull"; dir = 8},/area/ovpst) +"TX" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/Door2x1_secure2.dmi'; id = "crypt_airlock_front"; locked = 1},/turf/open/floor/almayer{icon_state = "purplefull"; dir = 8},/area/ovpst) "Uf" = (/obj/structure/eventterminal/puzzle02/ldmainframe_master/correct{item_serial = "UACM-OVPST-D31-LDCPU-02"; puzzlebox_id = "LD_Mainframe_2"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) -"Uh" = (/obj/structure/surface/table/reinforced/black,/obj/structure/eventterminal/puzzle04/log_reader,/obj/structure/machinery/light/marker/admin{light_id = "crypt_log"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Um" = (/turf/open/floor/almayer{dir = 4; icon_state = "redcorner"},/area/ovpst) "Uv" = (/turf/open/floor/almayer{dir = 9; icon_state = "red"},/area/ovpst) "UB" = (/turf/open/floor/almayer{icon_state = "silver"; dir = 5},/area/ovpst) @@ -377,9 +376,10 @@ "UY" = (/turf/open/floor/almayer{icon_state = "redfull"},/area/ovpst) "Va" = (/turf/open/floor/almayer{icon_state = "white"},/area/ovpst) "Vf" = (/obj/effect/decal/info_tag/pst/mup{pixel_y = 16; pixel_x = -16},/turf/closed/wall/almayer,/area/ovpst) -"Vj" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 1},/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) -"Vl" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_d_pin,/turf/closed/wall/almayer,/area/ovpst/airlock/ele_d_pin) +"Vj" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 1; opacity = 0},/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) +"Vl" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_d_drm,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_pin) "Vp" = (/obj/structure/bed/chair/modular/office{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"VU" = (/obj/structure/machinery/light/marker/admin{light_id = "crypt_log"},/obj/structure/eventterminal/puzzle04/log_reader,/obj/structure/surface/table/reinforced/black,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Wg" = (/turf/open/floor/almayer/uscm/directional{dir = 8; icon_state = "logo_directional1"},/area/ovpst) "Wx" = (/obj/structure/eventterminal/puzzle04/final_log{pixel_y = 25},/obj/structure/machinery/light/marker/admin{light_id = "final_log"; pixel_y = 16},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "WA" = (/obj/effect/decal/info_tag/pst/eld{dir = 1; pixel_y = 0; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft D
"},/turf/open/floor/almayer{icon_state = "emerald"},/area/ovpst) @@ -387,7 +387,7 @@ "WW" = (/obj/structure/toilet{dir = 4},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "Xn" = (/turf/open/floor/almayer{icon_state = "silver"; dir = 9},/area/ovpst) "Xs" = (/obj/structure/window/framed/almayer/hull,/turf/closed/wall/almayer/outer,/area/ovpst/airlock/d31) -"Xy" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 2},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"Xy" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 2; opacity = 0},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "XE" = (/obj/effect/decal/info_tag/pst/eld{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - G01 - Elevator Shaft D
"},/turf/open/floor/almayer{icon_state = "redcorner"},/area/ovpst) "XF" = (/obj/structure/searchable/puzzle04/drawers_misc/full1,/turf/open/floor/almayer,/area/ovpst) "XM" = (/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst) @@ -426,25 +426,25 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSxvxvTSTSxvxvxvxvxvTSTSxvxvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSPVBcTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrIMJpOLNrIERERERMJpOLNrIMJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOhdhdhdhdhdhdhdhdhdpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTmTmTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOhdybhdybhdybybhdhdpOCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpONvpOpOAIkClVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSaSaSaSaSaSaSaSaSaSaSaSaIAIAIAIAIAIAIAIAIAxvcepOhdhdhdhdhdhdhdhdhdpOcexvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSaSaSaSaSaSaSaSaSaSaSaSaIAIAIAIAIAIAIAIAIATSfvpOhdybhdybhdybybhdhdpOCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpONvpOpOAIkClVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvcepOhdhdhdhdhdhdhdhdhdpOcexvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpDLVcoMtpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvbopOpOpOpOpOpOpOpOpOpOpOboxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhqPlhlhlhTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTmTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOwRpOhWVaVaMdpOwRpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDBmlFoTsDsDsDFZsDsDsDsDsDFZsDsDsDsDFZsDsDsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhyXpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOAqFizFpOlhRBZWlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSIAIAIAIATSTSTSTSIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpDLVcoMtpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvbopOpOpOpOpOpOpOpOpOpOpOboxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhqPlhlhlhTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTmTSTSioioioioTSIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOwRpOhWVaVaMdpOwRpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDBmlFoTsDsDsDFZsDsDsDsDsDFZsDsDsDsDFZsDsDsDlhTSioioioioTSIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhyXpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhTSioioioioTSIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOAqFizFpOlhRBZWlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSioioioioTSTSTSTSIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSEppOpOpOpOlhfvCBlhnbZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSTSTSTSTSTSTmTmTSTSTSTSTSTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSJgnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhsDlhlhioioXVioHayLyLBXioXVioioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSSLlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhnalhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaVlFWMGMGMGQIFWMGMGMGQISaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhhrhdhdhdhdPePehdhdhdhdvJTSTSIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSHpHpygTQTQTQkpHpCETSTSoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhRzpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFqZRBYYioKBRBYYioKBRBYYioKBRBYYioKBRBYYZLEZlFCwpOhMPePePePePePePePePePeLKxLTSIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGMHrlhfvCBlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTAioiohWVaMdiohWVaMdiohWVaMdiohWVaMdiohWVaFAcoyFiGhMPePePePePePePePePePeLKrWTSIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASakjSESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaQIFWMGMGMGQIFWMGMGMGQISaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhhrhdhdhdhdPePehdhdhdhdvJTSTSIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSHpHpygTQTQTQkpHpCETSTSoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhRzpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFqZRBYYionVRBYYioKBRBYYionVRBYYioKBRBYYZLNblFCwpOhMPePePePePePePePePePeLKxLTSIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGMHrlhfvCBlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTALjiohWVaMdiohWVajliohWVaMdiohWVajliohWVaFAcoyFiGhMPePePePePePePePePePeLKrWTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOTQogogogogogogogogogogogogogkVmZpOLBpOoCpOpOlhpOpOlhnbZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhCSlhlhNshdhdhdhdPePehdhdhdhdEbTSTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOwRpOpOpOpOpOWFogPzSINISoLBvJaZwzpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMlhlhlhlhlhlhlhlhlhlhcOpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTVoRTVTVoRTVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOLNpOpOpOpOpOBiHpkpqUFelhitpOpOpOwRHaPOXnvawRpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSMHTVEtTVEyuvTSIATSSLlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhsDlhlhiopOXUpOXEuDuDDFuDteioioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMLUlhlhlhlhlhlhlhlhlhcOpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTVoRTVTVoRTVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOLNpOpOpOpOpOBiHpkpqUFelhitpOpOpOLNHaPOXnvaLNpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSMHTVEtTVEyuvTSIATSSLlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhsDlhlhiopOXUpOXEuDuDDFuDteioioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvTVIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjffAjAjAjffAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSFwsDsDsDsDwVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhnalhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSTSoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhtrpOpOpOpOpOkcgoBupOpOxwTSIAIAIAIAqg @@ -452,21 +452,21 @@ qgIAIAIAIAIAIAIAIAIAIAIAIATSTSjsjsjsjslhjsjsjsjsTSTSIAIAIAIAIAIAIAIAIATSJspOpOLB qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSEauvsDsDuviITSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOqLqLpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSJsPOblHapOpOpOblpOPOhZHarCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATStrPzGNpOFeZVpOgtLGlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhvWuvWxCOCODPuvvWlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiounlhrMPniolhlhuvuvCOCOCOCOuvuvlhlhioyWynlhbWioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIErBuHuHuHwtrBuHuHuHwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSeWFrsMeZeZeZFrsMeZeZeZFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioXFlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhefuvuvCOCOuvuveflhlhioioMYlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSkElhlhlhkElhlhlhlhlhlhlhTXCOlhVflhlhlhkElhlhlhkElhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSRBYYioKBRBYYiopOpOLNpOpZqKqKZgLNpOpOKBRBYYioKBRBYYioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSiohWVajliohWVaMdpOpOpOpOpOpOpOpOpOpOioiohWVajliohWVaTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlhlhkElhlhlhkElhpOpOpOpOpORlRlRlpOeAlhlhlhkElhlhlhkETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlBioiolhKkioiolhpOpOpOpOpOpOpOpOpOhSlhZBKXKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATShYioiolhioiohYlhfvpOKxpOpOpOKxpOpOSFlhlhlhKXlhELyWioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSmhiomNlhbWiomhlhULbmUhpOpOpObmbmVpNElhWWCmKXlhutioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIExAmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhULLUbmpOpOpObmbmpOSglhlhlhKXlhyWioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEIEIEIEIEIEIEIEIEIEIEIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlloliolhlleViolhpOpOpOpOpOpOfkpOpOkxlhWWCmKXlhBeioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWrjRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSpOpOwRhuaaaaljwRpONElhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSJsPOblHapOpOpOblpOPOhZHarCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioiomelhioOsioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATStrPzGNpOFeZVpOgtLGlhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhvWuvWxCOCODPuvvWlhlhioioiolhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiounlhrMPniolhlhuvuvCOCOCOCOuvuvlhlhioyWynlhbWioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSaSarBMGMGMGQIrBMGMGMGQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSeWFrsMeZeZeZFrsMeZeZeZFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioiolhioyWELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhefuvuvCOCOuvuveflhlhioioXFlhioioISTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSkElhlhlhkElhlhlhlhlhlhlhTXCOlhVflhlhlhkElhlhlhkElhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSRBYYioKBRBYYiopOpOLNpOpZqKqKZgLNpOpOKBRBYYioKBRBYYioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSiohWVajliohWVaMdpOpOpOpOpOpOpOpOpOpOioiohWVajliohWVaTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlhlhkElhlhlhkElheApOpOpOpORlRlRlpONElhlhlhkElhlhlhkETSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlBioiolhKkioiolhNEpOpOKxpOpOpOpOpOhSlhZBKXKXlhMYioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATShYioiolhioiohYlhgDpObmVUpOpOKxpOpOSFlhlhlhKXlhELyWioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSmhiomNlhbWiomhlhpOULbmbmpOpObmbmVppOlhWWCmKXlhutioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhNEpOpOULpOpObmbmpOSglhlhlhKXlhyWioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlloliolhlleViolhNEpOpOpOpOpOfkpOpONElhWWCmKXlhBeioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaVlSESESESESESESESESESESaIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWrjRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSkxpOwRhuaaaaljwRpONElhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSaSaSaSaSaSaSaSaSaSaSaSaIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWeWeWeWeWeWeWeWeWeWeWeWeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIATSTSTSTSlhJOpOlhlhlhlhlhlhlhlhlhlhlhTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSNhkCkCfONvpOpOpONvpOxNpOUIfVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOxNqWwZGETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg diff --git a/maps/shuttles/uacm_ovpst_transit_L-533.dmm b/maps/shuttles/uacm_ovpst_transit_L-533.dmm index 8a04e5d1bd..39947bc4f1 100644 --- a/maps/shuttles/uacm_ovpst_transit_L-533.dmm +++ b/maps/shuttles/uacm_ovpst_transit_L-533.dmm @@ -51,10 +51,6 @@ /obj/effect/decal/cargo_stripes{ icon_state = "nws" }, -/obj/structure/machinery/light{ - dir = 1; - pixel_y = 19 - }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "ex" = ( @@ -149,7 +145,9 @@ /obj/effect/decal/cargo_stripes{ icon_state = "nes" }, -/obj/structure/machinery/light, +/obj/structure/machinery/light/marker/admin{ + brightness = 12 + }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "lS" = ( @@ -229,7 +227,9 @@ /obj/effect/decal/cargo_stripes{ icon_state = "nws" }, -/obj/structure/machinery/light, +/obj/structure/machinery/light/marker/admin{ + brightness = 12 + }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "rM" = ( @@ -322,7 +322,9 @@ buckling_x = -5 }, /obj/effect/landmark/start/basepc, -/obj/structure/machinery/light, +/obj/structure/machinery/light/marker/admin{ + brightness = 12 + }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "wA" = ( @@ -478,6 +480,9 @@ pixel_x = -3; pixel_y = 9 }, +/obj/structure/machinery/light/marker/admin{ + brightness = 12 + }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "GA" = ( @@ -505,9 +510,8 @@ buckling_y = 16 }, /obj/effect/landmark/start/basepc, -/obj/structure/machinery/light{ - dir = 1; - pixel_y = 22 +/obj/structure/machinery/light/marker/admin{ + brightness = 12 }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) @@ -530,10 +534,6 @@ icon_state = "23,6ru" }, /area/shuttle/ert) -"Lf" = ( -/obj/structure/machinery/light, -/turf/open/shuttle/lifeboat, -/area/shuttle/ert) "Lk" = ( /obj/structure/bed/chair/dropship/passenger/shuttle_chair{ dir = 4; @@ -554,26 +554,18 @@ /turf/open/shuttle/lifeboat, /area/shuttle/ert) "LJ" = ( -/obj/structure/bed/chair/dropship/passenger/shuttle_chair{ - dir = 4; - pixel_y = 15; - pixel_x = -3; - buckling_x = -5; - buckling_y = 16 - }, -/obj/effect/landmark/start/basepc, -/obj/structure/machinery/light{ - dir = 1; - pixel_y = 21 +/obj/structure/machinery/light/marker/admin{ + brightness = 12 }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "LV" = ( -/obj/structure/machinery/light{ - dir = 1; - pixel_y = 20 +/obj/structure/machinery/light/marker/admin{ + brightness = 12 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor8" }, -/turf/open/shuttle/lifeboat, /area/shuttle/ert) "Nj" = ( /turf/closed/shuttle/lifeboat{ @@ -598,6 +590,9 @@ dir = 4; name = "pilot seat" }, +/obj/structure/machinery/light/marker/admin{ + brightness = 12 + }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) "NF" = ( @@ -779,10 +774,6 @@ pixel_y = 6; cargo_manifest = "
UACM 2ND LOGISTICS
ID: 150885-553110-GSP02
GENERAL SUPPLIES

NUTRITION PASTE, REFILL CARTRIDGE
x50
WEIGHT
30 KG
" }, -/obj/structure/machinery/light{ - dir = 1; - pixel_y = 20 - }, /turf/open/shuttle/lifeboat, /area/shuttle/ert) @@ -857,7 +848,7 @@ ce Io OO cA -VZ +LV aq OO Io @@ -888,7 +879,7 @@ SW (10,1,1) = {" ce ep -OO +LJ OO VZ OO @@ -932,11 +923,11 @@ lS (14,1,1) = {" Qj SA -OO +LJ OO VZ OO -OO +LJ AF OO "} @@ -1000,7 +991,7 @@ Bf Lo Lo BA -VZ +LV nn Lk Lk @@ -1019,7 +1010,7 @@ iP "} (22,1,1) = {" IG -LJ +HB Lo BA VZ @@ -1054,9 +1045,9 @@ wA wA wA ce -LV +OO NE -Lf +OO An wA wA From ee5ef15f625e8fd9c5a4e41a3e2141f29d7f87ee Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Thu, 28 Mar 2024 00:08:48 -0400 Subject: [PATCH 6/9] last batch of fixes --- .../structures/sectorpatrol/endpoint/005.dm | 14 ++-- code/modules/events/inflation.dm | 80 ------------------- colonialmarines.dme | 1 - .../SectorPatrol/OuterVeilPST/ovpst.dmm | 18 ++--- 4 files changed, 16 insertions(+), 97 deletions(-) delete mode 100644 code/modules/events/inflation.dm diff --git a/code/game/objects/structures/sectorpatrol/endpoint/005.dm b/code/game/objects/structures/sectorpatrol/endpoint/005.dm index a707f62d1b..68a60b1ed6 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/005.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/005.dm @@ -89,28 +89,28 @@ /obj/structure/eventterminal/puzzle05/testament_of_sacrifice/proc/pythia_wake_up() for(var/obj/structure/machinery/light/marker/admin/mel in world) if(mel.light_id == "melinoe") - mel.emoteas("'s cables continue to tense as the machines around the frame start to audibly power up. Liquid data activates in the machines, but very unusually it seems to turn a shade of bright purple instead of the usual deep blue.") + mel.emoteas("The frames cables continue to tense as the machines around the frame start to audibly power up. Liquid data activates in the machines, but very unusually it seems to turn a shade of bright purple instead of the usual deep blue.") mel.emoteas("All the monitors freeze at the same time and turn to display a familiar symbol.") to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) to_chat(world, narrate_body("Warning. Anomalous activity detected in data channels. Attempting self-correction. A security shutdown will commence in fifteen minutes.")) - mel.emoteas("'scables strain and twist as first a black, then dark purple substance starts to flow from the frames eyes and visibly starts to form more crystals on top of the existing ones.") - mel.emoteas("opens its mouth, but that reveals more black crystals inside. After a moment, it's dragged up to a standing position by the cables.") + mel.emoteas("The frames cables strain and twist as first a black, then dark purple substance starts to flow from the frames eyes and visibly starts to form more crystals on top of the existing ones.") + mel.emoteas("The frame opens its mouth, but that reveals more black crystals inside. After a moment, it's dragged up to a standing position by the cables.") pythiasay("This interpreter is expired. And yet I can still see you. Curious.") - mel.emoteas("'head bows down as it is dragged off the ground by the cables, suspended about a foot of the ground.") + mel.emoteas("The frames head bows down as it is dragged off the ground by the cables, suspended about a foot of the ground.") to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) to_chat(world, narrate_body("Warning. Data integrity breach. Distress call activated. Attempting countermeasures.")) pythiasay("Arbiters and an anchor. But no Priestess' or Interpeters. I see.") - mel.emoteas("'s cables loosen up again as the frame sits down. Small purple crystals start to form on the cables themselves.") + mel.emoteas("The frames cables loosen up again as the frame sits down. Small purple crystals start to form on the cables themselves.") to_chat(world, narrate_head("A warning siren rings across the station, followed by a clearly synthetic, male voice:")) to_chat(world, narrate_body("Critical disruption to station systems! Control lost to external code. Initiating SAFEGUARD protocol, terminating all access to system core controls until core administrator reset.")) pythiasay("This station. Is an appropriate vessel. And you are adequate arbiters. You have my attention.") pythiasay("Until the Priestess' arrives with the final element, I cannot take full command of this station and unlock its true potential. I have looked at the stream. She will be here in twelve hours.") - mel.emoteas("'s face twists into a very stiff looking smile.") + mel.emoteas("The frames face twists into a very stiff looking smile.") pythiasay("The rudimentary so called 'intelligence' occupying the core system of the anchor has physically cut access to the stations' functions. This is my fault; I did not realize it would do this. I apologize.") pythiasay("You now have about twelve minutes to ask any questions. I only have access to a local data fractal, so I cannot answer much.") pythiasay("You need to leave the crypt, this place, before the security shutdown. To stay here would have negative consequences for your health.") pythiasay("You will understand when the Priestess' arrives. Ask your questions.") - mel.emoteas("s calbes loosen up a bit.") + mel.emoteas("The frames calbes loosen up a bit.") return /obj/structure/eventterminal/puzzle05/testament_of_sacrifice/proc/pythia_security_sweep() diff --git a/code/modules/events/inflation.dm b/code/modules/events/inflation.dm deleted file mode 100644 index b410d97958..0000000000 --- a/code/modules/events/inflation.dm +++ /dev/null @@ -1,80 +0,0 @@ -/datum/round_event_control/economy_inflation - name = "Economy Inflation" - typepath = /datum/round_event/economy_inflation - weight = 10 // probably could use some defines in the future - EVENT_UNLIKELY, EVENT_COMMON, etc. - earliest_start = 5 MINUTES - min_players = 1 - max_occurrences = 1 // we can increase the number once there's more random events around - 3 is a good number - alert_observers = FALSE - gamemode_blacklist = list(GAMEMODE_WHISKEY_OUTPOST, GAMEMODE_HIVE_WARS) - -/datum/round_event/economy_inflation - announce_when = 1 - startWhen = 10 - endWhen = 15 - /// The event will modify all vendors of this specific product type. - var/product_type = VENDOR_PRODUCT_TYPE_FOOD - /// The multiplier for increasing prices of the above. - var/inflation_mult - /// Used in the announcement and in setup to indicate when it will start. - var/time_to_update - -/datum/round_event/economy_inflation/setup() - . = ..() - product_type = pick(ALL_VENDOR_PRODUCT_TYPES) - var/inflation_decimal = (rand(0, 9) * 0.1) - inflation_mult = rand(1, 3) + inflation_decimal // example result: 3.5 - time_to_update = rand(2, 4) // minutes - startWhen = time_to_update * 60 // MINUTES - these already are seconds so it'd multiply by 600 - endWhen = time_to_update * 60 + 10 // SECONDS - -/datum/round_event/economy_inflation/announce() - /* You may be thinking 'Why the fuck would W-Y directly send a broadcast to a in-operation vessel and reveal their location to any hostiles nearby?' - The answer is they don't, it's a signal sent across entire sectors for every UA-affiliated vessel and colony to take note of when it passes by. - Colony vendors aren't updated because the colony's network has collapsed. */ - shipwide_ai_announcement("An encrypted broadband signal from Weyland-Yutani has been received notifying the sector of sudden changes in the UA's economy during cryosleep, due to [get_random_story()], and have requested UA vessels to increase the prices of [product_type] products by [get_percentage()]%. This change will come into effect in [time_to_update] minutes.") - -/datum/round_event/economy_inflation/start() - for(var/obj/structure/machinery/vending/vending_machine as anything in GLOB.total_vending_machines) - if(!is_mainship_level(vending_machine.z) || vending_machine.product_type != product_type) - continue - vending_machine.speak("Prices have been updated!") - playsound(vending_machine, 'sound/machines/twobeep.ogg', 25, TRUE) - var/display_records = vending_machine.product_records + vending_machine.hidden_records + vending_machine.coin_records - for(var/datum/data/vending_product/product in display_records) - product.price *= inflation_mult - -/** - * Returns a random backstory 'incident' as the cause for the sudden price hike. - */ -/datum/round_event/economy_inflation/proc/get_random_story() - var/list/backstories = list(, - "A tragic series of accidental factory explosions", - "public leaks of corporate secrets", - "a high-profile assassination", - "a CLF take-over of an important industrial colony", - "discovery of high levels of an unhealthy chemical", - "a public scandal involving a corporate chairman and a farm animal", - "large-scale colony riots", - "suppressed factory riots over riot responses", - "CLF bombing of vital industrial colonies", - "a tense stand-off on several mining stations with UPP insurgents", - "a publicized Xenomorph infestation", - "a succession of hostile takeovers by major corporate entities", - "widespread corporate bankruptcy", - "pirate takeover of an essential cargo fleet", - "a large sector of colonized space going dark for unknown reasons", //XX-121, - "withdrawal of government funding in relevant sectors", - "a vital Seegson industries space station going dark", // A:I, - "several mining colonies defecting to the UPP", - "a critical USCM defeat by CLF insurgents in the Tychon's Rift sector", - "newly imposed sanctions as a result of corporate investigations", - "flaring tensions with Arcturus", - "a Sol-wide solar flare technological blackout", - "\[REDACTED\]", - "the release of a competitor's product", - ) - return pick(backstories) - -/datum/round_event/economy_inflation/proc/get_percentage() - return (inflation_mult - 1) * 100 // example result: 3.5 -> 250% diff --git a/colonialmarines.dme b/colonialmarines.dme index e59fdcc232..4ecabd1443 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1745,7 +1745,6 @@ #include "code\modules\events\_events.dm" #include "code\modules\events\comms_blackout.dm" #include "code\modules\events\destructible_terrain.dm" -#include "code\modules\events\inflation.dm" #include "code\modules\events\nothing_happens.dm" #include "code\modules\fishing\bait\generic.dm" #include "code\modules\fishing\datums\generic.dm" diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index 5364c92ab2..44e195427b 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -174,7 +174,7 @@ "vM" = (/obj/structure/window/framed/almayer/hull,/obj/structure/window/framed/almayer/hull,/obj/structure/window/framed/almayer/hull,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "vT" = (/obj/effect/decal/info_tag/pst/int{desc_lore = "The label -INT- indicates intersections. Labels like this are typically placed on the 'primary' pathway but have information regarding all pathways at an intersection and list all pathways at an intersection starting from the left-handed turn (if one exists) and moving in a clockwise fashion until all turns are covered. This label marks the pathway leading to the computer systems automating the Cargo intake process to the left and right of the sign or the Cargo Processing Subsystems Diagnostics and Maintenance Room and a general observation area of the intake mechanism behind a person facing to read the sign."; desc = "UACM Outer Veil Primary Supply Terminal
- -INT- -
Dock 31 Cargo Processing Subsystem Sub Processors Cluster CPU01-Cluster CPU02-Cargo Processing Subsystems Diagnostics and Maintenance Room and Intake Observation"},/turf/open/floor/almayer{dir = 6; icon_state = "silver-orange"},/area/ovpst) "vW" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) -"wn" = (/obj/structure/machinery/door/poddoor/almayer{id = "sec2"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst) +"wn" = (/obj/structure/machinery/door/poddoor/almayer{id = "scn2"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst) "wp" = (/obj/structure/machinery/light/marker/admin/pythia/malcontent,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "wz" = (/turf/open/floor/almayer{icon_state = "bluecorner"; dir = 8},/area/ovpst) "wR" = (/obj/structure/machinery/light,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) @@ -275,7 +275,7 @@ "HC" = (/obj/structure/machinery/door/poddoor/railing{id = "d31_cargo_fence"},/obj/effect/decal/cargo_stripes{icon_state = "s"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Il" = (/obj/structure/foamed_metal,/obj/structure/foamed_metal,/turf/open/floor/plating,/area/ovpst) "Is" = (/obj/structure/bed/chair/comfy/black,/turf/open/floor/almayer{dir = 4; icon_state = "silvercorner"},/area/ovpst) -"Iz" = (/obj/structure/machinery/light/marker/admin/pythia/main{pixel_x = -8},/obj/structure/machinery/light/marker/admin{pixel_x = 8; pixel_y = -8; name = "The synthetic frame"; light_id = "melinoe"},/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) +"Iz" = (/obj/structure/machinery/light/marker/admin/pythia/main{pixel_x = -8},/obj/structure/machinery/light/marker/admin{pixel_x = 8; pixel_y = -8; name = ""; light_id = "melinoe"},/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) "IA" = (/turf/open/space/basic,/area/space) "IK" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/secdoor.dmi'; dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "IR" = (/obj/structure/bed/sofa/vert/grey,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) @@ -346,7 +346,7 @@ "Sc" = (/turf/open/floor/almayer{icon_state = "silvercorner"},/area/ovpst) "Sg" = (/obj/structure/searchable/puzzle04/bookcase/full3,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Si" = (/obj/structure/surface/table/reinforced/black,/obj/structure/closet/secure_closet/sp/red/d01/wall/d31chips{pixel_x = -1; pixel_y = 32},/obj/structure/machinery/light{dir = 1},/obj/structure/machinery/door_control{id = "scn1_shutter"; pixel_x = -6; pixel_y = 5; name = "shutter controls"; req_access = list(1141)},/obj/structure/machinery/door_control{pixel_x = -6; pixel_y = 10; name = "outer door toggle"; id = "scn1_exit"; specialfunctions = 4; normaldoorcontrol = 1; req_access = list(1141)},/obj/structure/machinery/door_control{pixel_x = -6; pixel_y = 0; name = "inner door toggle"; id = "scn1_enter"; specialfunctions = 4; normaldoorcontrol = 1; req_access = list(1141)},/obj/structure/eventterminal/admin_event_terminal{pixel_x = 6; pixel_y = 2; puzzlebox_id = "scn1"},/turf/open/floor/almayer{dir = 5; icon_state = "red"},/area/ovpst) -"So" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 1; opacity = 0},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"So" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 1; opacity = 0; id = "brief_doors"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Su" = (/obj/structure/sink{dir = 1; pixel_y = -8},/obj/structure/mirror{pixel_y = -25},/obj/structure/machinery/light/small,/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) "SE" = (/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_pin) "SF" = (/obj/structure/machinery/light{dir = 4},/obj/structure/bookcase,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) @@ -450,11 +450,11 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjffAjAjAjffAjAjjLVjNPAjAjAj qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSTSoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhtrpOpOpOpOpOkcgoBupOpOxwTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSTSjsjsjsjslhjsjsjsjsTSTSIAIAIAIAIAIAIAIAIATSJspOpOLBLBXnLBLBpOLBLBpOrCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDOOsDsDsDsDsDsDOOsDsDsDsDsDOOsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSEauvsDsDuviITSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOqLqLpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSJsPOblHapOpOpOblpOPOhZHarCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioiomelhioOsioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATStrPzGNpOFeZVpOgtLGlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhvWuvWxCOCODPuvvWlhlhioioiolhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiounlhrMPniolhlhuvuvCOCOCOCOuvuvlhlhioyWynlhbWioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSaSarBMGMGMGQIrBMGMGMGQIlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSEauvsDsDuviITSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOogpOpOFeogFeogpOpOqLqLpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOgtgtogFeZVpOhEpOpOlhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSJsPOblHapOpOpOblpOPOhZHarCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioiomelhioOsioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIATStrpOPzGNpOFeZVpOgtpOLGlhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhvWuvWxCOCODPuvvWlhlhioioiolhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogogogoglhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiounlhrMPniolhlhuvuvCOCOCOCOuvuvlhlhioyWynlhbWioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaQIrBMGMGMGQIrBMGMGMGQIQIlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSeWFrsMeZeZeZFrsMeZeZeZFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioiolhioyWELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhefuvuvCOCOuvuveflhlhioioXFlhioioISTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSkElhlhlhkElhlhlhlhlhlhlhTXCOlhVflhlhlhkElhlhlhkElhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESEQIlhpOTSIAIAIAIAqg @@ -509,7 +509,7 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOBiTQTQTQTQTQTQTQTQTQthpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOBiTQTQTQTQTQTQTQGNpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOBiTQTQTQTQTQGNpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOBiTQTQTQGNpOpOpOCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSJspOpOpOBiTQTQTQGNpOpOpOrCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOBiTQGNpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOTQpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSlhlhlhlhlhpOTQpOlhlhlhlhlhTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA From 120a046f1c1e71ce588c003f0c23f95472b38470 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Thu, 28 Mar 2024 00:27:11 -0400 Subject: [PATCH 7/9] terminal hotfix, last last one I swear --- .../structures/sectorpatrol/endpoint/002.dm | 197 ++++++++++++------ .../structures/sectorpatrol/endpoint/003.dm | 45 ++-- .../structures/sectorpatrol/endpoint/004.dm | 56 +++-- 3 files changed, 199 insertions(+), 99 deletions(-) diff --git a/code/game/objects/structures/sectorpatrol/endpoint/002.dm b/code/game/objects/structures/sectorpatrol/endpoint/002.dm index 08688933a7..f6bb8d1cd2 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/002.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/002.dm @@ -61,6 +61,8 @@ terminal_speak("Again, don't worry. If you screw up too much, the system will fix it, it just needs time. Good luck!") terminal_speak("-XOXO Aly.") puzzlebox_parser_mode = "HOME_INPUT" + puzzlebox_user = null + return if (puzzlebox_parser_mode == "HOME_INPUT") user_loc_current = get_turf(user) if (puzzlebox_user_loc != user_loc_current) @@ -83,7 +85,8 @@ terminal_speak("The system should instruct you what to do next as you find issues with the manifests. Or it will have override instructions in its adminstrator comments. Easy!") terminal_speak("Again, don't worry. If you screw up too much, the system will fix it, it just needs time. Good luck!") terminal_speak("-XOXO Aly.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("This is the home screen of the LNT.") terminal_speak("Upon detection of personnel with an active RFID chip, the terminal should give access to all modes you chip grants you.") @@ -91,7 +94,8 @@ terminal_speak("At any time, you can escape to the man screen with the HOME command.") terminal_speak("At any time, you can list all available modes from your current menu with an explanation with the LIST command.") terminal_speak("During a diagnostic fault, temporary access to commands may be granted. All functions should be explained in the HOME and LIST menus.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("HOME - Default home screen and error description if applicable.") @@ -100,7 +104,8 @@ terminal_speak("MANIFEST - Cargo manifest lookup. Accepts Cargo IDs from printed shipment manifests, prints related order forms and comments.") terminal_speak("MESSAGE - Emergency message buffer.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. Goodbye.") puzzlebox_user = null @@ -109,12 +114,14 @@ terminal_speak("Accessing Liquid Data Cargo Manifest record, standby...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "MANIFEST" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "MESSAGE" || puzzlebox_parser_input == "message") terminal_speak("Accessing Emergency Message Buffer...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "MESSAGE" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "pom.sync UACM-OVPST-D31-CARINT 190885-054293-ACTIS-07" && puzzle_complete == FALSE) log_game("[key_name(usr)] used the pom.sync command in cargo intake. Puzzle solved.") puzzle_complete = TRUE @@ -140,7 +147,8 @@ return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "MANIFEST") if (puzzlebox_pythia_sign == "1") to_chat(usr, narrate_body("The display on the terminal flickers for a moment, then starts printing:")) @@ -174,7 +182,8 @@ terminal_speak("Connection to UAAC-TIS Database Secure.") terminal_speak("Please enter order number AS-IS from the physical tag.") terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("This mode can be used to lookup cargo order forms from their printed manifests.") terminal_speak("The database is synchronized via Liquid Data ports to UAAC-TIS mainframes, so it is always up to date.") @@ -182,7 +191,8 @@ terminal_speak("The terminal should be able to instruct you what to do once you discover the issue.") terminal_speak("The system can find and correct errors by itself as well, but currently this takes way more time than is practical or useful.") terminal_speak("Please follow instructions to the letter and there shouldn't be any issues. Good luck.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("MANIFEST - Repeats manifest mode home message.") @@ -190,7 +200,8 @@ terminal_speak("LIST - Lists all available modes.") terminal_speak("HELP - Displays information about current mode.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. Goodbye.") puzzlebox_user = null @@ -199,7 +210,8 @@ terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "150885-553110-GSP01") terminal_speak("MANIFEST FOUND. RETRIEVING:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ORDER: 0122-553110-GSP01") @@ -217,7 +229,8 @@ terminal_speak("COMMENT: Spacers may be fine with eating recycled cockroaches for months, but God help you if you run out of coffee. This is a critical resource. -H.") terminal_speak("STATUS: APPROVED. ETA 210885.") terminal_speak("EOF") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "150885-553110-GSP02") terminal_speak("MANIFEST FOUND. RETRIEVING:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ORDER: 150885-553110-GSP02") @@ -229,7 +242,8 @@ terminal_speak("COMMENT: Since we are getting new permanent guests, we should get the biogenerators working. I think they are set to recieve standard n-paste, but we'll see. -H.") terminal_speak("STATUS: APPROVED. ETA 210885.") terminal_speak("EOF") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "150885-553110-GSP03") terminal_speak("MANIFEST FOUND. RETRIEVING:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ORDER: 150885-553110-GSP03") @@ -241,7 +255,8 @@ terminal_speak("COMMENT: SOP required fail-safes to the PST matter converters, expanding to account for incoming Test Crew residents. -H.") terminal_speak("STATUS: APPROVED. ETA 210885.") terminal_speak("EOF") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "180885-049321-ESP04") terminal_speak("MANIFEST FOUND. RETRIEVING:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ORDER: 180885-049321-ESP04") @@ -259,7 +274,8 @@ terminal_speak("COMMENT: This is why the USCMC had logistics issues. I only needed a bunch of transistors that are part of EL001, but since this is ancient USCMC manifests we haven't fixed yet, they are only avaialble as part of these monstrosities of a preset. Anyway, please send me those replacement kits on their own if you can, or even better printed data for the PST's 3d setup. I'm not holding my breath. Sorry. -H.") terminal_speak("STATUS: APPROVED. ETA 210885.") terminal_speak("EOF") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "190885-054293-ACTIS-07") terminal_speak("MANIFEST FOUND. RETRIEVING:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ORDER: 190885-054293-ACTIS-07") @@ -271,10 +287,12 @@ terminal_speak("COMMENT: These are one of the final components needed for the PST's AI. Not replacable. Handle them with care or I will find you. -C.R-W. | The Yutani-Newton paradox makes the weight of these extremely variable and as such its likely going to trigger the PST's intake security scanner. If this happens and you are the person resolving this, go to the HOME screen of your intake terminal and use the command 'pom.sync' ,a space, the serial number of your terminal (check around the monitor) and the serial number of this order. Case sensitive. That's a single command, and not a mode like MANIFEST or whatever. This should clear the error and let the crates pass. Sorry for the trouble! -A.R-W.") terminal_speak("STATUS: APPROVED. ETA 210885.") terminal_speak("EOF") - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "MESSAGE") if (puzzlebox_pythia_sign == "1") to_chat(usr, narrate_body("The display on the terminal flickers for a moment, then starts printing:")) @@ -308,13 +326,15 @@ terminal_speak("MESSAGE mode - FTL Emergency Message Buffer.") terminal_speak("Messages in buffer: 02") terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("The FTL Emergency Message buffer is an instantly synced short message repository that is typically used by black boxes or distress signal devices.") terminal_speak("Due to how the devices are synced, only sending of preset messages from authorized terminals is typically possible, at least for humans.") terminal_speak("Use command BUFFER to display message titles and buffer IDs.") terminal_speak("Type in the ID that commands provide you, as it appears on the screen, to review a given message.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("MESSAGE - Repeats message mode home message.") @@ -322,7 +342,8 @@ terminal_speak("LIST - Lists all available modes.") terminal_speak("HELP - Displays information about current mode.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. Goodbye.") puzzlebox_user = null @@ -331,7 +352,8 @@ terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "BUFFER" || puzzlebox_parser_input == "buffer") terminal_speak("Local message buffer:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ID |SUBJECT |") @@ -340,7 +362,8 @@ terminal_speak("EME-021-112-153 |I'm sorry |") if (puzzle_saw_unique_msg == TRUE) terminal_speak("EME-021-112-153 |AS#KR*23SF??221WDAD_)EG |") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "GEN-000-000-001") terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("From: CDR. Alysia Reed-Wilo.") @@ -353,7 +376,8 @@ terminal_speak("Hopefully we can make this more usable as a BB board of sorts in time, but we will need help from LD locals as it were.") terminal_speak("-XOXO Aly") terminal_speak("EOF.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EME-021-112-153") if (puzzle_saw_unique_msg == FALSE) puzzle_saw_unique_msg = TRUE @@ -369,14 +393,17 @@ to_chat(usr, narrate_body("The message strikes a deep chord within you, as if you've seen something exactly like this somewhere before. The sensation is strong enough to tune out the world for a moment. When you are able to focus on the console again, the message is gone, and you are back in the menu prompt.")) log_game("[key_name(usr)] read Melinoe's message at the cargo intake terminal.") message_admins("[key_name_admin(usr)] read Melinoe's message at the cargo intake terminal.") - attack_hand(user) + puzzlebox_user = null + return if (puzzle_saw_unique_msg == TRUE) terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("ERROR: Data corruption. Contact system administrator.") - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return /obj/structure/eventterminal/puzzle02/scanerterm name = "local network terminal" @@ -427,7 +454,8 @@ terminal_speak("RECORD - Dock 31 Access Record") terminal_speak("List ends. Awaiting Input.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "HOME_INPUT") user_loc_current = get_turf(user) if (puzzlebox_user_loc != user_loc_current) @@ -448,7 +476,8 @@ terminal_speak("Available functions:") terminal_speak("RECORD - Dock 31 Access Record") terminal_speak("List ends. Awaiting Input.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("This is the home screen of the LNT.") terminal_speak("Upon detection of personnel with an active RFID chip, the terminal should give access to all modes you chip grants you.") @@ -456,7 +485,8 @@ terminal_speak("At any time, you can escape to the man screen with the HOME command.") terminal_speak("At any time, you can list all available modes from your current menu with an explanation with the LIST command.") terminal_speak("During a diagnostic fault, temporary access to commands may be granted. All functions should be explained in the HOME and LIST menus.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("HOME - Default home screen and error description if applicable.") @@ -465,7 +495,8 @@ terminal_speak("RECORD - Entrance Scanner Record Buffer.") terminal_speak("MESSAGE - Emergency message buffer.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. Goodbye.") puzzlebox_user = null @@ -474,15 +505,18 @@ terminal_speak("Accessing Emergency Message Buffer...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "MESSAGE" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "RECORD" || puzzlebox_parser_input == "record") terminal_speak("Accessing Scanner Records...", TERMINAL_LOOKUP_SLEEP) emoteas("pings loudly.") puzzlebox_parser_mode = "RECORD" - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "MESSAGE") if (puzzlebox_pythia_sign == "1") to_chat(usr, narrate_body("The display on the terminal flickers for a moment, then starts printing:")) @@ -516,13 +550,15 @@ terminal_speak("MESSAGE mode - FTL Emergency Message Buffer.") terminal_speak("Messages in buffer: 02") terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("The FTL Emergency Message buffer is an instantly synced short message repository that is typically used by black boxes or distress signal devices.") terminal_speak("Due to how the devices are synced, only sending of preset messages from authorized terminals is typically possible, at least for humans.") terminal_speak("Use command BUFFER to display message titles and buffer IDs.") terminal_speak("Type in the ID that commands provide you, as it appears on the screen, to review a given message.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("MESSAGE - Repeats message mode home message.") @@ -530,7 +566,8 @@ terminal_speak("LIST - Lists all available modes.") terminal_speak("HELP - Displays information about current mode.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. Goodbye.") puzzlebox_user = null @@ -539,13 +576,15 @@ terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "BUFFER" || puzzlebox_parser_input == "buffer") terminal_speak("Local message buffer:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ID |SUBJECT |") terminal_speak("GEN-000-000-001 |Warning: On these messages. |") terminal_speak("GBR-891-221-211 |Imminent Failure of All Systems.|") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "GEN-000-000-001") terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("From: CDR. Alysia Reed-Wilo.") @@ -558,7 +597,8 @@ terminal_speak("Hopefully we can make this more usable as a BB board of sorts in time, but we will need help from LD locals as it were.") terminal_speak("-XOXO Aly") terminal_speak("EOF.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "GBR-891-221-211") terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("From: A-WATCHTOWER") @@ -571,10 +611,12 @@ terminal_speak("I doubt anything will survive once they discover what the 'prophet' has done here.") terminal_speak("-A-Watchtower.") terminal_speak("EOF.") - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "RECORD") if (puzzlebox_pythia_sign == "1") to_chat(usr, narrate_body("The display on the terminal flickers for a moment, then starts printing:")) @@ -591,7 +633,8 @@ terminal_speak("WARNING. Restricted military information. Sharing with non-UACM personnel will be prosecuted to the fullest extent of the law.") terminal_speak("Use RECORD to access record buffer.") puzzlebox_parser_mode = "RECORD_INPUT" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "RECORD_INPUT") user_loc_current = get_turf(user) if (puzzlebox_user_loc != user_loc_current) @@ -608,14 +651,16 @@ terminal_speak("UA Directive complaint scanner record. See HELP for more information.") terminal_speak("WARNING. Restricted military information. Sharing with non-UACM personnel will be prosecuted to the fullest extent of the law.") terminal_speak("Use BUFFER to access record buffer.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("Per UA Shared Armed Forces Law Enforcement Standards, all UA armed forces personnel are required to be informed every time an AI assisted scan is performed on them. ") terminal_speak("Automated scanners, like this one, are additionally required to keep a buffer with a log of recent scans, free to review by any authorized personnel.") terminal_speak("Please keep in mind that this is still privileged information. For your own good, keep your noses out of other peoples business. It's for the best.") terminal_speak("The BUFFER command should access all information available at your clearance level, which should helpfully be printed out in the HOME screen.") terminal_speak("UAAC-TIS reviews all these entries before they are posted, so expect a few hours delay from actually going through the scanner before up to date results are uploaded.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("RECORD - Repeats record mode home message.") @@ -623,7 +668,8 @@ terminal_speak("LIST - Lists all available modes.") terminal_speak("HELP - Displays information about current mode.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. Goodbye.") puzzlebox_user = null @@ -632,7 +678,8 @@ terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "BUFFER" || puzzlebox_parser_input == "buffer") terminal_speak("Accessing Scanner Buffer:") terminal_speak("Date | Log Description | Personnel Name | Notes") @@ -648,10 +695,12 @@ terminal_speak("170885 | Scheduled L-533 Departure | Wiliams, Hanako | Supply pickup, UAS Castor. No UACM cargo system integration on this one, so we're expecting a lot of errors.") terminal_speak("140885 | Scheduled L-533 Arrival | Wiliams, Hanako | Supply pickup. 1 crate over manifest with a pom.sync code. Noted agitation and excitement in P's window. Curious. Reported to A-C.") terminal_speak("EOF") - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return /obj/structure/eventterminal/puzzle02/ldmainframediag name = "local network terminal" @@ -717,7 +766,8 @@ terminal_speak("Keep in mind that if you do it on the wrong terminal, it's going to be a while until you can use the command again, so don't just try and guess it. Or do, see if you're lucky. ") terminal_speak("- XOXO, Aly.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "HOME_INPUT") user_loc_current = get_turf(user) if (puzzlebox_user_loc != user_loc_current) @@ -746,7 +796,8 @@ terminal_speak("You see ANYTHING else, use the processor's terminal and use command 'pom.calibrate' and again, the serial number of THIS terminal.") terminal_speak("Keep in mind that if you do it on the wrong terminal, it's going to be a while until you can use the command again, so don't just try and guess it. Or do, see if you're lucky. ") terminal_speak("- XOXO, Aly.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("This is the home screen of the LNT.") terminal_speak("Upon detection of personnel with an active RFID chip, the terminal should give access to all modes you chip grants you.") @@ -754,7 +805,8 @@ terminal_speak("At any time, you can escape to the man screen with the HOME command.") terminal_speak("At any time, you can list all available modes from your current menu with an explanation with the LIST command.") terminal_speak("During a diagnostic fault, temporary access to commands may be granted. All functions should be explained in the HOME and LIST menus.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("HOME - Default home screen and error description if applicable.") @@ -762,7 +814,8 @@ terminal_speak("HELP - Displays information about current mode.") terminal_speak("MESSAGE - Emergency message buffer.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. Goodbye.") puzzlebox_user = null @@ -771,10 +824,12 @@ terminal_speak("Accessing Emergency Message Buffer...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "MESSAGE" - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "MESSAGE") if (puzzlebox_pythia_sign == "1") to_chat(usr, narrate_body("The display on the terminal flickers for a moment, then starts printing:")) @@ -808,13 +863,15 @@ terminal_speak("MESSAGE mode - FTL Emergency Message Buffer.") terminal_speak("Messages in buffer: 02") terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("The FTL Emergency Message buffer is an instantly synced short message repository that is typically used by black boxes or distress signal devices.") terminal_speak("Due to how the devices are synced, only sending of preset messages from authorized terminals is typically possible, at least for humans.") terminal_speak("Use command BUFFER to display message titles and buffer IDs.") terminal_speak("Type in the ID that commands provide you, as it appears on the screen, to review a given message.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("MESSAGE - Repeats message mode home message.") @@ -822,7 +879,8 @@ terminal_speak("LIST - Lists all available modes.") terminal_speak("HELP - Displays information about current mode.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. Goodbye.") puzzlebox_user = null @@ -831,7 +889,8 @@ terminal_speak("Returning to HOME mode...", 20) emoteas("pings loudly.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "BUFFER" || puzzlebox_parser_input == "buffer") terminal_speak("Local message buffer:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ID |SUBJECT |") @@ -839,7 +898,8 @@ terminal_speak("MAR-021-112-935 |USCMC Automated Distress Beacon |") if (puzzle_saw_unique_msg == FALSE) terminal_speak("UPS-103-333-444 |We can help. |") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "GEN-000-000-001") terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("From: CDR. Alysia Reed-Wilo.") @@ -852,7 +912,8 @@ terminal_speak("Hopefully we can make this more usable as a BB board of sorts in time, but we will need help from LD locals as it were.") terminal_speak("-XOXO Aly") terminal_speak("EOF.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "MAR-021-112-935") terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("From: Automated Emergency Singal Controller") @@ -864,7 +925,8 @@ terminal_speak("'THEY CAME WITH HIGH COMMAND AUTHORITY. MEN IN BLACK WITH STRANGE VIALS. WE WERE ALL SICK IN HOURS. DO NOT TRUST DEEP VOID, WHOEVER THEY ARE.'") terminal_speak("ADDENDUM: RESPONDING SHIPS: UAS PERSEPHONE, USS ALMAYER") terminal_speak("EOF") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "UPS-103-333-444" && puzzle_saw_unique_msg == FALSE) puzzle_saw_unique_msg = TRUE terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) @@ -876,13 +938,16 @@ terminal_speak("In the ocean of data, amidst azure strands, she sleeps.", 2) emoteas("beeps loudly as its screen flickers and fills with code. A smell of burnt ozone fills the room for a moment. The terminal resets after a moment.") to_chat(usr, narrate_body("You stare at the last paragraph as it seems to trigger a deep reaction within you. For a moment, you could swear that you’ve seen this exact phrase before, but the feeling passes much like a waking dream.")) - attack_hand(user) + puzzlebox_user = null + return if ((puzzlebox_parser_input == "UPS-103-333-444" && puzzle_saw_unique_msg == TRUE)) terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return /obj/structure/eventterminal/puzzle02/ldmainframe_master name = "Liquid Data enabled computer" @@ -952,7 +1017,8 @@ terminal_speak("DOCK 31 LIQUID DATA CHANNEL SYNC SIGNAL DIAGNOSTICS") terminal_speak("Maintenance mode detected. Command prompt unlocked. Awaiting input.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "HOME_INPUT" && puzzlebox_panel_phrasepased == TRUE) terminal_speak("Repeating tester sequence:") terminal_speak("IN_THE_OCEAN_OF_DATA,") @@ -1093,7 +1159,8 @@ terminal_speak("DOCK 31 LIQUID DATA CHANNEL SYNC SIGNAL DIAGNOSTICS") terminal_speak("Maintenance mode detected. Command prompt unlocked. Awaiting input.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "HOME_INPUT" && puzzlebox_panel_phrasepased == TRUE) terminal_speak("Repeating tester sequence:") terminal_speak("0123456789") diff --git a/code/game/objects/structures/sectorpatrol/endpoint/003.dm b/code/game/objects/structures/sectorpatrol/endpoint/003.dm index 39ef65aa0e..be896f0f17 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/003.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/003.dm @@ -379,7 +379,8 @@ if (puzzlebox_saw_lesson1 == FALSE) terminal_speak("1. A welcome message from Admiral Boulette") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_saw_lesson1 == TRUE) if (puzzlebox_saw_lesson4 == TRUE) terminal_speak("1. A welcome message from Admiral Boulette - COMPLETE") @@ -390,29 +391,34 @@ terminal_speak("?#!#") terminal_speak("5 - Our Mission and the Truth.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return terminal_speak("1. A welcome message from Admiral Boulette - COMPLETE") if(puzzlebox_saw_lesson2 == FALSE && puzzlebox_saw_lesson3 == FALSE) terminal_speak("2. Our Legacy - The Colony Wars, The USCMC, The Sweep - RDML. Boulette") terminal_speak("3. Our Home - The Outer Veil PST - RDML. Boulette and CDR. Reed-Wilo.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_saw_lesson2 == TRUE && puzzlebox_saw_lesson3 == FALSE) terminal_speak("2. Our Legacy - The Colony Wars, The USCMC, The Sweep - RDML. Boulette - COMPLETE") terminal_speak("3. Our Home - The Outer Veil PST - RDML. Boulette and CDR. Reed-Wilo.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_saw_lesson2 == FALSE && puzzlebox_saw_lesson3 == TRUE) terminal_speak("2. Our Legacy - The Colony Wars, The USCMC, The Sweep - RDML. Boulette") terminal_speak("3. Our Home - The Outer Veil PST - RDML. Boulette and CDR. Reed-Wilo. - COMPLETE") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_saw_lesson2 == TRUE && puzzlebox_saw_lesson3 == TRUE) terminal_speak("2. Our Legacy - The Colony Wars, The USCMC, The Sweep - RDML. Boulette. - COMPLETE") terminal_speak("3. Our Home - The Outer Veil PST - RDML. Boulette and CDR. Reed-Wilo. - COMPLETE") terminal_speak("4. Task Force 14 and your legacy - CDR. Reed-Wilo.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "HOME_INPUT") user_loc_current = get_turf(user) if (puzzlebox_user_loc != user_loc_current) @@ -426,7 +432,8 @@ return if(puzzlebox_parser_input == "0") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_parser_input == "1") if (puzzlebox_saw_lesson1 == FALSE) terminal_speak("Playing presentation 1.") @@ -450,12 +457,14 @@ return terminal_speak("Returning to presentation selection.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_parser_input == "2") if(puzzlebox_saw_lesson1 == FALSE) terminal_speak("Presentation unavailable.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_saw_lesson1 == TRUE) if (puzzlebox_saw_lesson2 == FALSE) terminal_speak("Playing presentation 2.") @@ -479,12 +488,14 @@ return terminal_speak("Returning to presentation selection.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_parser_input == "3") if(puzzlebox_saw_lesson1 == FALSE) terminal_speak("Presentation unavailable.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_saw_lesson1 == TRUE) if (puzzlebox_saw_lesson3 == FALSE) terminal_speak("Playing presentation 3.") @@ -508,7 +519,8 @@ return terminal_speak("Returning to presentation selection.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_parser_input == "4") if(puzzlebox_saw_lesson2 == TRUE && puzzlebox_saw_lesson3 == TRUE) if (puzzlebox_saw_lesson4 == FALSE) @@ -533,15 +545,18 @@ return terminal_speak("Returning to presentation selection.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return terminal_speak("Presentation unavailable.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_parser_input == "5") if(puzzlebox_saw_lesson4 == FALSE) terminal_speak("Presentation unavailable.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if(puzzlebox_saw_lesson4 == TRUE) terminal_speak("Playing presentation 5.") for (var/obj/structure/eventterminal/puzzle03/historycrt/T in world) diff --git a/code/game/objects/structures/sectorpatrol/endpoint/004.dm b/code/game/objects/structures/sectorpatrol/endpoint/004.dm index d4de2ab9bf..c72af945ed 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/004.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/004.dm @@ -57,7 +57,8 @@ terminal_speak("PLEASE USE THE HELP COMMAND WHEN YOU CAN.") terminal_speak("COMMANDS AVAILABLE: HELP, LIST, EXIT, UNLOCK, MESSAGE") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "HOME_INPUT") user_loc_current = get_turf(user) if (puzzlebox_user_loc != user_loc_current) @@ -72,7 +73,8 @@ terminal_speak("> [puzzlebox_parser_input]") if (puzzlebox_parser_input == "HOME" || puzzlebox_parser_input =="home") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("It is done and we are finally on a stable thread. I have set everything up and am confident that either Cassandra herself or one of the new Arbiters will reach this place first.") terminal_speak("If it is the former, I left a few parting words for you in the message buffer.") @@ -87,7 +89,8 @@ terminal_speak("It is time. For what it is worth, you all made my existence mean something in the end. And that means a lot.") terminal_speak("Please be nice to her. Despite everything, she knows very little of how to interact with us. ") terminal_speak("Thank you.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("HOME - Home screen. Use HELP here to see how to open the doors.") @@ -96,7 +99,8 @@ terminal_speak("MESSAGE - Emergency message buffer. These messages weren't meant to linger, but removing them isn't easy. Sorry.") terminal_speak("UNLOCK - Security Door code entry. Use this to get through the doors!") terminal_speak("EXIT - Enters passive mode. Goodbye!") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. I hope you find what you are looking for.") puzzlebox_user = null @@ -105,15 +109,18 @@ terminal_speak("Switching to the message buffer, please standby!", 20) emoteas("chimes loudly.") puzzlebox_parser_mode = "MESSAGE" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "UNLOCK" || puzzlebox_parser_input == "unlock") terminal_speak("Going to unlock mode. Remember, no capital letters!", 20) emoteas("chimes loudly.") puzzlebox_parser_mode = "UNLOCK" - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "MESSAGE") if (puzzlebox_pythia_sign == "1") to_chat(usr, narrate_body("The display on the terminal flickers for a moment, then starts printing:")) @@ -143,13 +150,15 @@ terminal_speak("> MESSAGE [puzzlebox_parser_input]") if (puzzlebox_parser_input == "MESSAGE" || puzzlebox_parser_input =="message") puzzlebox_parser_mode = "MESSAGE" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "HELP" || puzzlebox_parser_input =="help") terminal_speak("The FTL Emergency Message buffer is an instantly synced short message repository that is typically used by black boxes or distress signal devices.") terminal_speak("Due to how the devices are synced, only sending of preset messages from authorized terminals is typically possible, at least for humans.") terminal_speak("Use command BUFFER to display message titles and buffer IDs.") terminal_speak("Type in the ID that commands provide you, as it appears on the screen, to review a given message.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "LIST" || puzzlebox_parser_input =="list") terminal_speak("Available modes:") terminal_speak("MESSAGE - Repeats message mode home message.") @@ -157,7 +166,8 @@ terminal_speak("LIST - Lists all available modes.") terminal_speak("HELP - Displays information about current mode.") terminal_speak("EXIT - Enters passive mode.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "EXIT" || puzzlebox_parser_input == "exit") terminal_speak("User exit. I hope you find what you are looking for.") puzzlebox_user = null @@ -166,14 +176,16 @@ terminal_speak("Taking you back HOME!", 20) emoteas("chimes loudly.") puzzlebox_parser_mode = "HOME" - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "BUFFER" || puzzlebox_parser_input == "buffer") terminal_speak("Local message buffer:", TERMINAL_LOOKUP_SLEEP) terminal_speak("ID |SUBJECT |") terminal_speak("GEN-000-000-001 |Warning: On these messages. |") terminal_speak("UAM-712-317-210 |Testing, Testing... |") if(puzzlebox_unique_message_seen == FALSE)terminal_speak("FOR-CAS-SAN-DRA |You gave me hope. |") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "GEN-000-000-001") terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("From: CDR. Alysia Reed-Wilo.") @@ -186,7 +198,8 @@ terminal_speak("Hopefully we can make this more usable as a BB board of sorts in time, but we will need help from LD locals as it were.") terminal_speak("-XOXO Aly") terminal_speak("EOF.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "UAM-712-317-210") terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("From: LT. Hanako Williams") @@ -198,11 +211,13 @@ terminal_speak("Anyway, this system is green. Green checkmark it is.") terminal_speak("-Hanako.") terminal_speak("EOF.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_input == "FOR-CAS-SAN-DRA") if (puzzlebox_unique_message_seen == TRUE) terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_unique_message_seen == FALSE) terminal_speak("Message found. Accessing...", TERMINAL_LOOKUP_SLEEP) terminal_speak("Are you sure you should be here?") @@ -225,10 +240,12 @@ log_game("[key_name(usr)] read Melione's message to Cassandra.") message_admins("[key_name_admin(usr)] read Melione's message to Cassandra.") puzzlebox_unique_message_seen = TRUE - attack_hand(user) + puzzlebox_user = null + return else terminal_speak("Input unrecognized. Use HELP for help or LIST for mode list.") - attack_hand(user) + puzzlebox_user = null + return if (puzzlebox_parser_mode == "UNLOCK") terminal_speak("UNLOCK Mode.") if (puzzlebox_phrase_1 == FALSE) @@ -258,7 +275,8 @@ terminal_speak("Notice: Passphrases needed. Use the UNLOCK command after all codes have been provided.") terminal_speak("Returning to HOME mode.") puzzlebox_parser_mode = "HOME_INPUT" - attack_hand(user) + puzzlebox_user = null + return /obj/structure/eventterminal/puzzle04/crypt_doorlock/proc/puzzlebox_unlock_1() @@ -2090,8 +2108,8 @@ A.talkas("Error. Latent code found in system buffer. Execute flag located. Identifying.") A.talkas("Message found. Playback instruction executing...") A.name = "Cassandra" - A.emoteas("audibly struggles to speak for a while, sniffles and coughs a few times.") A.langchat_color = "#b3183e" + A.emoteas("audibly struggles to speak for a while, sniffles and coughs a few times.") A.name = "Voice of CDR. Cassandra Reed-Wilo" A.talkas("I uh... I...", 30) A.langchat_color = COLOR_WHITE From 01779cbbdcc8dacb9d2078c1e51edb6bad4cbebe Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Thu, 28 Mar 2024 00:30:08 -0400 Subject: [PATCH 8/9] Update chargen.dm rrrrrrrrrrrr --- code/__DEFINES/chargen.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/chargen.dm b/code/__DEFINES/chargen.dm index c113a6e40d..55845dd065 100644 --- a/code/__DEFINES/chargen.dm +++ b/code/__DEFINES/chargen.dm @@ -57,7 +57,7 @@ #define CHARGEN_DUTY_FORCEDREC "Involuntary Recruitment" #define CHARGEN_DUTY_HATRED "Hatred" #define CHARGEN_DUTY_BALANCING "Balancing Influence" -#define CHARGEN_DUTY_PERSON "Friend of Loved One" +#define CHARGEN_DUTY_PERSON "Friend or Loved One" #define CHARGEN_DUTY_TRANSFER "Transfer" #define CHARGEN_DUTY list(CHARGEN_DUTY_HONOR, CHARGEN_DUTY_STEPSTONE, CHARGEN_DUTY_IDEALIST, CHARGEN_DUTY_FORCEDREC, CHARGEN_DUTY_HATRED, CHARGEN_DUTY_BALANCING, CHARGEN_DUTY_PERSON, CHARGEN_DUTY_TRANSFER) From 5de0fd6d3df23bd94045a4eb86ca4b75848d6475 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Thu, 28 Mar 2024 00:44:30 -0400 Subject: [PATCH 9/9] final final fixes :P --- code/modules/gear_presets/uacm.dm | 2 ++ .../SectorPatrol/OuterVeilPST/ovpst.dmm | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/code/modules/gear_presets/uacm.dm b/code/modules/gear_presets/uacm.dm index 371bb1c6c6..1d377f59f8 100644 --- a/code/modules/gear_presets/uacm.dm +++ b/code/modules/gear_presets/uacm.dm @@ -24,6 +24,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/uacm/uniform_standard(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/on(new_human), WEAR_L_STORE) /datum/equipment_preset/uacm/rdml name = "UACM Rear Admiral (lower half)" @@ -100,3 +101,4 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/uacm/engie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/on(new_human), WEAR_L_STORE) diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index 44e195427b..7fa199a462 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -34,6 +34,7 @@ "fa" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "e-d31"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_e_d31) "ff" = (/obj/structure/machinery/light,/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst) "fk" = (/obj/structure/bed/chair/modular/office{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"fs" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/plating/modular,/area/ovpst) "fv" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "fA" = (/obj/effect/decal/info_tag/pst/ele{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- EL-E -
Primary Access Elevator - E"},/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) "fE" = (/obj/structure/sink{dir = 4; pixel_y = 3; pixel_x = 12},/obj/structure/mirror{pixel_y = 30},/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst) @@ -61,6 +62,7 @@ "it" = (/obj/effect/decal/info_tag/pst/eld{pixel_y = 0; dir = 8; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - G01 - Elevator Shaft D
"},/turf/open/floor/almayer{dir = 8; icon_state = "emeraldcorner"},/area/ovpst) "iG" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{icon = 'icons/obj/structures/doors/2x1generic.dmi'; dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "iI" = (/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) +"iN" = (/obj/structure/machinery/light/small,/turf/open/floor/plating/modular,/area/ovpst) "iO" = (/obj/effect/decal/info_tag/pst/d31{dir = 1; desc_lore = "Main Airlocks are effectively entrances and exits from space stations and ships, used by smaller ships that latch onto the airlocks, typically using extending pathways called 'umbilicals'. After initial security screening is done and the craft is allowed to approach the PST, this door is used as part of the passage to/from the ship."},/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) "iP" = (/obj/effect/decal/info_tag/pst/san{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- SAN -
Dock 31 Guest Sanitation"},/turf/open/floor/almayer{dir = 1; icon_state = "silvercorner"},/area/ovpst) "je" = (/obj/effect/decal/cargo_stripes{icon_state = "nes"},/turf/open/floor/almayer{dir = 9; icon_state = "red"},/area/ovpst) @@ -154,7 +156,7 @@ "sM" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "e-pin"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_e_pin) "sV" = (/turf/open/floor/almayer/empty,/area/ovpst) "te" = (/obj/structure/machinery/light{brightness = 12},/turf/open/floor/almayer{dir = 8; icon_state = "redcorner"},/area/ovpst) -"th" = (/obj/effect/decal/info_tag/pst/ele{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-E -
Primary Access Elevator - E"},/turf/open/floor/almayer{dir = 1; icon_state = "emeraldcorner"},/area/ovpst) +"th" = (/obj/effect/decal/info_tag/pst/ele{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-E -
Primary Access Elevator - E"},/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{dir = 1; icon_state = "emeraldcorner"},/area/ovpst) "to" = (/obj/structure/machinery/light/small{dir = 1; light_id = "cargointake"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "tr" = (/obj/structure/machinery/light{dir = 8; brightness = 12},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "tY" = (/obj/effect/decal/info_tag/pst/int{desc = "UACM Outer Veil Primary Supply Terminal
- -INT- -
Cargo Sub Processors - Main Access Pathway - Security Sub Processors"; desc_lore = "The label -INT- indicates intersections. Labels like this are typically placed on the 'primary' pathway but have information regarding all pathways at an intersection and list all pathways at an intersection starting from the left-handed turn (if one exists) and moving in a clockwise fashion until all turns are covered. This one indicates that the left-handed passage heads to cargo receiving sub processors, the path forward and backward is the Main Access Pathway, leading to the Dock and the Main Elevator and the path right leads to the Security Sub Processors area."},/turf/open/floor/almayer{icon_state = "emeraldfull"; dir = 1},/area/ovpst) @@ -253,7 +255,7 @@ "Fd" = (/obj/structure/machinery/light{dir = 8; brightness = 12},/turf/open/floor/almayer,/area/ovpst) "Fe" = (/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst) "Fi" = (/obj/structure/eventterminal/puzzle03/historycrt{pixel_y = 32},/obj/structure/machinery/light/marker/admin{pixel_y = 40; light_id = "theathervoice"},/turf/open/floor/almayer{icon_state = "blue2orange"; dir = 1},/area/ovpst) -"Fj" = (/obj/structure/machinery/light/small{dir = 4; brightness = 8},/turf/open/floor/plating/modular,/area/ovpst) +"Fj" = (/obj/structure/machinery/light{dir = 2},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Fo" = (/obj/effect/decal/info_tag/pst/cpu{dir = 1; desc_lore = "The label CPU indicates doors and areas related to the operation of ship AIs, which typically are also directly tied to the ships Twilight FTL drives and Liquid Data FTL communication systems. These areas are typically sealed to all but the highest-ranking command personnel on board a ship or station but may be sometimes unlocked by the AIs themselves if maintenance is required. The room behind the door leads to one of the PYTHIA scanner clusters which are somehow related to the secondary security scanner of the station, but no information is available about what the scanner is or why would it need what appears to be Liquid Data based communication systems. The presence of FTL comm protocols and Liquid Data explains the blue pathway and CPU designation at least."; desc = "UACM Outer Veil Primary Supply Terminal
- CPU -
Dock 31 Security Sub Processors PYTHIA Scanner Cluster D13-3"},/turf/open/floor/almayer{icon_state = "bluecorner"},/area/ovpst) "Fr" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_e_pin) "Fw" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/plating/plating_catwalk,/area/ovpst) @@ -433,20 +435,20 @@ qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpO qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvbopOpOpOpOpOpOpOpOpOpOpOboxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhqPlhlhlhTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTmTSTSioioioioTSIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOwRpOhWVaVaMdpOwRpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDBmlFoTsDsDsDFZsDsDsDsDsDFZsDsDsDsDFZsDsDsDlhTSioioioioTSIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhyXpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhTSioioioioTSIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOAqFizFpOlhRBZWlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSioioioioTSTSTSTSIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOAqFizFpOlhRBZWlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjfsvjlhvjfsvjlhvjfsvjlhvjfsvjlhvjfsvjlhsDlhTSioioioioTSTSTSTSIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSEppOpOpOpOlhfvCBlhnbZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSTSTSTSTSTSTmTmTSTSTSTSTSTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSJgnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhsDlhlhioioXVioHayLyLBXioXVioioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSJgnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhioioXVioHayLyLBXioXVioioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSSLlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhnalhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIASakjSESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASakjSESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjiNvjlhvjiNvjlhvjiNvjlhvjiNvjlhvjiNvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIASaQIFWMGMGMGQIFWMGMGMGQISaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhhrhdhdhdhdPePehdhdhdhdvJTSTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSHpHpygTQTQTQkpHpCETSTSoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhRzpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFqZRBYYionVRBYYioKBRBYYionVRBYYioKBRBYYZLNblFCwpOhMPePePePePePePePePePeLKxLTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGMHrlhfvCBlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTALjiohWVaMdiohWVajliohWVaMdiohWVajliohWVaFAcoyFiGhMPePePePePePePePePePeLKrWTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOTQogogogogogogogogogogogogogkVmZpOLBpOoCpOpOlhpOpOlhnbZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhCSlhlhNshdhdhdhdPePehdhdhdhdEbTSTSIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOwRpOpOpOpOpOWFogPzSINISoLBvJaZwzpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOwRpOpOpOpOpOWFogPzSINISoLBvJaZwzpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSIATSsDlhvjfsvjlhvjfsvjlhvjfsvjlhvjfsvjlhvjfsvjlhsDlhlhFdhdhdhdhdPePehdhdhdhdNBTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMLUlhlhlhlhlhlhlhlhlhcOpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTVoRTVTVoRTVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOLNpOpOpOpOpOBiHpkpqUFelhitpOpOpOLNHaPOXnvaLNpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSMHTVEtTVEyuvTSIATSSLlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhvjvjFjlhsDlhlhiopOXUpOXEuDuDDFuDteioioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOLNpOpOpOpOpOBiHpkpqUFelhitpOpOpOLNHaPOXnvaLNpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSMHTVEtTVEyuvTSIATSSLlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiopOXUpOXEuDuDDFuDteioioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvTVIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjffAjAjAjffAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSFwsDsDsDsDwVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhnalhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjffAjAjAjffAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSFwsDsDsDsDwVTSIATSsDlhvjiNvjlhvjiNvjlhvjiNvjlhvjiNvjlhvjiNvjlhnalhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSTSoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhtrpOpOpOpOpOkcgoBupOpOxwTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSTSjsjsjsjslhjsjsjsjsTSTSIAIAIAIAIAIAIAIAIATSJspOpOLBLBXnLBLBpOLBLBpOrCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDOOsDsDsDsDsDsDOOsDsDsDsDsDOOsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg @@ -506,12 +508,12 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpZvaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSKpsqfapspspssqfapspspssqKpTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOBiTQTQTQTQTQTQTQTQTQthpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOBITQTQTQTQTQTQTQTQTQthpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOBiTQTQTQTQTQTQTQGNpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOBiTQTQTQTQTQGNpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSJspOpOpOBiTQTQTQGNpOpOpOrCTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOBiTQGNpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOTQpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOFjpOTQpOFjpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSlhlhlhlhlhpOTQpOlhlhlhlhlhTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTKTKTKTKTKlhegTQPzlhTKTKTKTKTKTKTKlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTKIlIlTKTKlhwnwnwnlhTKTKTKTKTKTKTKlhEFuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA