From 3b6256021d4ed00781becabd1dd86187ddad0c7c Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Sat, 23 Mar 2024 11:26:00 -0400 Subject: [PATCH 01/10] Update 004.dm releasing used searchables and error in referencing --- .../structures/sectorpatrol/endpoint/004.dm | 224 +++++++++++++++++- 1 file changed, 223 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/sectorpatrol/endpoint/004.dm b/code/game/objects/structures/sectorpatrol/endpoint/004.dm index 7a6404dec8..e193b055bb 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/004.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/004.dm @@ -466,6 +466,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -481,6 +484,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -496,6 +502,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -511,6 +520,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -521,6 +533,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(4) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -531,6 +546,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(5) to_chat(user, narrate_body("There does not seem to be anything of note left on the bookshelf. If you want to start the search over, use the bookshelf in GRAB mode.")) searchable_used = FALSE @@ -555,6 +573,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -575,6 +596,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -585,6 +609,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -595,6 +622,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -605,6 +635,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(4) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -626,6 +659,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(5) to_chat(user, narrate_body("There does not seem to be anything of note left on the bookshelf. If you want to start the search over, use the bookshelf in GRAB mode.")) searchable_used = FALSE @@ -651,6 +687,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -666,6 +705,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -681,6 +723,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -698,6 +743,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -713,6 +761,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(4) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -723,6 +774,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(5) to_chat(user, narrate_body("There does not seem to be anything of note left on the bookshelf. If you want to start the search over, use the bookshelf in GRAB mode.")) searchable_used = FALSE @@ -747,6 +801,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -762,6 +819,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -777,6 +837,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -792,6 +855,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -802,6 +868,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(4) user.visible_message(SPAN_NOTICE("[user] starts to search the bookcase."), SPAN_INFO("You search through the bookcase..."), SPAN_DANGER("You hear shuffling and the sound of rustling paper.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -812,6 +881,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(5) to_chat(user, narrate_body("There does not seem to be anything of note left on the bookshelf. If you want to start the search over, use the bookshelf in GRAB mode.")) searchable_used = FALSE @@ -843,6 +915,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -858,6 +933,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -873,6 +951,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -883,6 +964,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) to_chat(user, narrate_body("These drawers have been throughly searched. There is nothing else to find here. If you want to start the search over, use the drawers in GRAB mode.")) searchable_used = FALSE @@ -906,6 +990,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -921,6 +1008,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -931,6 +1021,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -946,6 +1039,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) to_chat(user, narrate_body("These drawers have been throughly searched. There is nothing else to find here. If you want to start the search over, use the drawers in GRAB mode.")) searchable_used = FALSE @@ -975,6 +1071,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -995,6 +1094,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1005,6 +1107,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1016,6 +1121,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) to_chat(user, narrate_body("These drawers have been throughly searched. There is nothing else to find here. If you want to start the search over, use the drawers in GRAB mode.")) searchable_used = FALSE @@ -1039,6 +1147,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1054,6 +1165,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1069,6 +1183,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1080,6 +1197,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) to_chat(user, narrate_body("These drawers have been throughly searched. There is nothing else to find here. If you want to start the search over, use the drawers in GRAB mode.")) searchable_used = FALSE @@ -1110,6 +1230,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1130,6 +1253,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1145,6 +1271,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) to_chat(user, narrate_body("These drawers have been throughly searched. There is nothing else to find here. If you want to start the search over, use the drawers in GRAB mode.")) searchable_used = FALSE @@ -1169,6 +1298,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1189,6 +1321,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the storage drawers."), SPAN_INFO("You search through the storage drawers..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1204,6 +1339,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) to_chat(user, narrate_body("These drawers have been throughly searched. There is nothing else to find here. If you want to start the search over, use the drawers in GRAB mode.")) searchable_used = FALSE @@ -1235,6 +1373,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1248,6 +1389,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the bunk chest."), SPAN_INFO("You search through the bunk chest..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1263,6 +1407,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) to_chat(user, narrate_body("This chest has been throughly searched. There is nothing else to find here. If you want to start the search over, use it in GRAB mode.")) searchable_used = FALSE @@ -1286,6 +1433,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1304,6 +1454,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the bunk chest."), SPAN_INFO("You search through the bunk chest..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1314,6 +1467,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) to_chat(user, narrate_body("This chest has been throughly searched. There is nothing else to find here. If you want to start the search over, use it in GRAB mode.")) searchable_used = FALSE @@ -1339,6 +1495,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1359,6 +1518,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the bunk chest."), SPAN_INFO("You search through the bunk chest..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1367,6 +1529,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the bunk chest."), SPAN_INFO("You search through the bunk chest..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1382,6 +1547,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) to_chat(user, narrate_body("This chest has been throughly searched. There is nothing else to find here. If you want to start the search over, use it in GRAB mode.")) searchable_used = FALSE @@ -1405,6 +1573,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1418,6 +1589,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the bunk chest."), SPAN_INFO("You search through the bunk chest..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1431,6 +1605,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the bunk chest."), SPAN_INFO("You search through the bunk chest..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1441,6 +1618,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) to_chat(user, narrate_body("This chest has been throughly searched. There is nothing else to find here. If you want to start the search over, use it in GRAB mode.")) searchable_used = FALSE @@ -1471,6 +1651,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1489,6 +1672,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the locker."), SPAN_INFO("You search through the locker..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1499,6 +1685,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) to_chat(user, narrate_body("This locker has been throughly searched. There is nothing else to find here. If you want to start the search over, use it in GRAB mode.")) searchable_used = FALSE @@ -1522,6 +1711,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1535,6 +1727,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the locker."), SPAN_INFO("You search through the locker..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1550,6 +1745,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) to_chat(user, narrate_body("This locker has been throughly searched. There is nothing else to find here. If you want to start the search over, use it in GRAB mode.")) searchable_used = FALSE @@ -1573,6 +1771,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1586,6 +1787,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the locker."), SPAN_INFO("You search through the locker..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1594,6 +1798,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the locker."), SPAN_INFO("You search through the locker..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1609,6 +1816,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) to_chat(user, narrate_body("This locker has been throughly searched. There is nothing else to find here. If you want to start the search over, use it in GRAB mode.")) searchable_used = FALSE @@ -1632,6 +1842,9 @@ update_icon() searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return else searchable_used = FALSE return @@ -1645,6 +1858,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(1) user.visible_message(SPAN_NOTICE("[user] starts to search the locker."), SPAN_INFO("You search through the locker..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1658,6 +1874,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(2) user.visible_message(SPAN_NOTICE("[user] starts to search the locker."), SPAN_INFO("You search through the locker..."), SPAN_DANGER("You hear shuffling and the rustle of small objects.")) if(do_after(user, SEARCH_TIME_NORMAL, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) @@ -1668,6 +1887,9 @@ searchable_step += 1 searchable_used = FALSE return + to_chat(usr,SPAN_WARNING("You moved too far away.")) + searchable_used = FALSE + return if(3) to_chat(user, narrate_body("This locker has been throughly searched. There is nothing else to find here. If you want to start the search over, use it in GRAB mode.")) searchable_used = FALSE @@ -1700,7 +1922,7 @@ to_chat(usr, narrate_body("The reader does not react. It seems to be already playing something back.")) return if(istype(W, /obj/item/cargo/efolder/folder_pid)) - var/obj/item/cargo/efolder/folder_pid/F + var/obj/item/cargo/efolder/folder_pid/F = W switch(F.efolder_folder_id) if("RED-33895-027-8032") playing_log = TRUE From 609cab8242112347515e2ea51990f46ad1403074 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Sat, 23 Mar 2024 16:13:14 -0400 Subject: [PATCH 02/10] bugfixes, part 1 Door, power, icon issues, terminal multi user issues, terminal deadlock instances --- code/game/area/ovpst.dm | 2 +- code/game/machinery/doors/multi_tile.dm | 4 +- .../objects/items/sectorpatrol/cargo_items.dm | 2 + .../structures/sectorpatrol/endpoint/002.dm | 75 ++++++++++++------- .../structures/sectorpatrol/endpoint/003.dm | 11 ++- .../structures/sectorpatrol/endpoint/004.dm | 27 ++++--- .../structures/sectorpatrol/event_terminal.dm | 2 +- .../searchable/search_structures.dm | 1 + .../SectorPatrol/OuterVeilPST/ovpst.dmm | 65 +++++++--------- maps/shuttles/uacm_ovpst_transit_L-533.dmm | 13 +--- 10 files changed, 112 insertions(+), 90 deletions(-) diff --git a/code/game/area/ovpst.dm b/code/game/area/ovpst.dm index 95fc93761c..d54431c364 100644 --- a/code/game/area/ovpst.dm +++ b/code/game/area/ovpst.dm @@ -9,7 +9,7 @@ // soundscape_playlist = list('sound/effects/xylophone1.ogg', 'sound/effects/xylophone2.ogg', 'sound/effects/xylophone3.ogg') ambience_exterior = AMBIENCE_ALMAYER ceiling_muffle = FALSE - requires_power = TRUE + requires_power = FALSE unlimited_power = TRUE /area/ovpst/airlock diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index b918528033..0131bf959b 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -578,8 +578,8 @@ desc_lore = "The so called 'general access' airlock is probably the most commonly used one in the galaxy, which is also why airlocks with this access level typically are the ones in their factory default colors, like this one." req_access = list(ACCESS_SP_OVPST_GENERAL_DEFAULT) icon = 'icons/obj/structures/doors/2x1comdoor.dmi' - opacity = FALSE - glass = TRUE + opacity = TRUE + glass = FALSE /obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin req_access = list(ACCESS_SP_ADMIN) diff --git a/code/game/objects/items/sectorpatrol/cargo_items.dm b/code/game/objects/items/sectorpatrol/cargo_items.dm index 09008e8dbb..ffe810c7c8 100644 --- a/code/game/objects/items/sectorpatrol/cargo_items.dm +++ b/code/game/objects/items/sectorpatrol/cargo_items.dm @@ -117,6 +117,7 @@ name = "book" desc = "Sheets of paper with text and images bound together with a soft cover material." desc_lore = "The printed word industry was quite literally saved by the sudden explosion of intergalactic travel. For the longest time, the written word remained the most trusted way to transfer information, news, and entertainment among the colonies. The ascent of the Civ, Mil and Corp Nets following the Colony Wars meant that most colonists with a permanent home got all these directly from Earth via electronic devices. Physical books, however, are still collected, used, and cherished by Spacers, who often find themselves out of the range of Liquid Data uplinks and can't sync with any of the general networks. Most colonies maintain a small 'printing' facility for visiting spacers, often offering access to a shared galaxy spanning repository from which any book can be accessed and printed on-site for a fee. Most books found on spaceships are likely to have been created this way. Using the book while its in your active hand will let you scan it for information, if there is any to gain." + icon = 'icons/obj/items/sp_cargo.dmi' icon_state = "book" flags_item = NOBLUDGEON var/book_searched = 0 @@ -125,6 +126,7 @@ name = "bound notebook" desc = "Handwritten notes printed on sheets of paper, bound together with a soft cover, much like a book." desc_lore = "Notebook scanning is a relatively new service offered in the Neroid Sector for the past decade or so and pioneered by a small group of colonists calling themselves 'Bookworms'. The Bookworms formed a formal Corporation under the Corporate Standard and are the exclusive patent holders and distributors of scanner technology that seemingly seamlessly and without error scans even the most illegible of handwriting, parses and edits them into a standardized colony print format, uploads them to a shared, global, Liquid Data based repository and prints it out in the same way colony books are created, preserving the knowledge, musings, vulgar poetry and whatever else bored spacers write and doodle into their personal notebooks. Using the notebook while its in your active hand will let you scan it for information, if there is any to gain." + icon = 'icons/obj/items/sp_cargo.dmi' icon_state = "book_rough" flags_item = NOBLUDGEON var/book_searched = 0 diff --git a/code/game/objects/structures/sectorpatrol/endpoint/002.dm b/code/game/objects/structures/sectorpatrol/endpoint/002.dm index fbcfaa6e56..f63bbf991b 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/002.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/002.dm @@ -12,9 +12,14 @@ item_serial = "UACM-OVPST-D31-CARINT" /obj/structure/eventterminal/puzzle02/cargoparse/attack_hand(mob/user as mob) - var/user_loc_start = get_turf(user) if(!puzzlebox_user) puzzlebox_user = usr.real_name + puzzlebox_user_loc = get_turf(usr) + var/user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) + to_chat(user, narrate_body("You moved away from the console!")) + puzzlebox_user = null + return if(puzzlebox_user != usr.real_name) for (var/mob/living/carbon/human/h in range(2, src)) if (h.real_name == puzzlebox_user) @@ -57,8 +62,8 @@ terminal_speak("-XOXO Aly.") puzzlebox_parser_mode = "HOME_INPUT" if (puzzlebox_parser_mode == "HOME_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -153,8 +158,8 @@ terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") puzzlebox_parser_mode = "MANIFEST_INPUT" if (puzzlebox_parser_mode == "MANIFEST_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -288,8 +293,8 @@ terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") puzzlebox_parser_mode = "MESSAGE_INPUT" if (puzzlebox_parser_mode == "MESSAGE_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -386,9 +391,14 @@ item_serial = "UACM-OVPST-D31-SCN02LOGTERM" /obj/structure/eventterminal/puzzle02/cargoparse/attack_hand(mob/user as mob) - var/user_loc_start = get_turf(user) if(!puzzlebox_user) puzzlebox_user = usr.real_name + puzzlebox_user_loc = get_turf(usr) + var/user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) + to_chat(user, narrate_body("You moved away from the console!")) + puzzlebox_user = null + return if(puzzlebox_user != usr.real_name) for (var/mob/living/carbon/human/h in range(2, src)) if (h.real_name == puzzlebox_user) @@ -419,8 +429,8 @@ puzzlebox_parser_mode = "HOME_INPUT" attack_hand(user) if (puzzlebox_parser_mode == "HOME_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -491,8 +501,8 @@ terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") puzzlebox_parser_mode = "MESSAGE_INPUT" if (puzzlebox_parser_mode == "MESSAGE_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -583,8 +593,8 @@ puzzlebox_parser_mode = "RECORD_INPUT" attack_hand(user) if (puzzlebox_parser_mode == "RECORD_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -657,9 +667,14 @@ item_serial = "UACM-OVPST-D31-LDDIAG" /obj/structure/eventterminal/puzzle02/ldmainframediag/attack_hand(mob/user as mob) - var/user_loc_start = get_turf(user) if(!puzzlebox_user) puzzlebox_user = usr.real_name + puzzlebox_user_loc = get_turf(usr) + var/user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) + to_chat(user, narrate_body("You moved away from the console!")) + puzzlebox_user = null + return if(puzzlebox_user != usr.real_name) for (var/mob/living/carbon/human/h in range(2, src)) if (h.real_name == puzzlebox_user) @@ -704,8 +719,8 @@ puzzlebox_parser_mode = "HOME_INPUT" attack_hand(user) if (puzzlebox_parser_mode == "HOME_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -777,8 +792,8 @@ terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") puzzlebox_parser_mode = "MESSAGE_INPUT" if (puzzlebox_parser_mode == "MESSAGE_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -894,9 +909,14 @@ /obj/structure/eventterminal/puzzle02/ldmainframe_master/correct/attack_hand(mob/user as mob) - var/user_loc_start = get_turf(user) if(!puzzlebox_user) puzzlebox_user = usr.real_name + puzzlebox_user_loc = get_turf(usr) + var/user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) + to_chat(user, narrate_body("You moved away from the console!")) + puzzlebox_user = null + return if(puzzlebox_user != usr.real_name) for (var/mob/living/carbon/human/h in range(2, src)) if (h.real_name == puzzlebox_user) @@ -937,8 +957,8 @@ puzzlebox_user = null return if (puzzlebox_parser_mode == "HOME_INPUT" && puzzlebox_panel_phrasepased == FALSE) - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -1030,9 +1050,14 @@ /obj/structure/eventterminal/puzzle02/ldmainframe_master/incorrect/attack_hand(mob/user as mob) - var/user_loc_start = get_turf(user) if(!puzzlebox_user) puzzlebox_user = usr.real_name + puzzlebox_user_loc = get_turf(usr) + var/user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) + to_chat(user, narrate_body("You moved away from the console!")) + puzzlebox_user = null + return if(puzzlebox_user != usr.real_name) for (var/mob/living/carbon/human/h in range(2, src)) if (h.real_name == puzzlebox_user) @@ -1073,8 +1098,8 @@ puzzlebox_user = null return if (puzzlebox_parser_mode == "HOME_INPUT" && puzzlebox_panel_phrasepased == FALSE) - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return diff --git a/code/game/objects/structures/sectorpatrol/endpoint/003.dm b/code/game/objects/structures/sectorpatrol/endpoint/003.dm index f06da3b420..f6962f21dd 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/003.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/003.dm @@ -341,9 +341,14 @@ return /obj/structure/eventterminal/puzzle03/historyterm/attack_hand(mob/user as mob) - var/user_loc_start = get_turf(user) if(!puzzlebox_user) puzzlebox_user = usr.real_name + puzzlebox_user_loc = get_turf(usr) + var/user_loc_current = get_turf(usr) + if (puzzlebox_user_loc != user_loc_current) + to_chat(user, narrate_body("You moved away from the console!")) + puzzlebox_user = null + return if(puzzlebox_user != usr.real_name) for (var/mob/living/carbon/human/h in range(2, src)) if (h.real_name == puzzlebox_user) @@ -407,8 +412,8 @@ puzzlebox_parser_mode = "HOME_INPUT" attack_hand(user) if (puzzlebox_parser_mode == "HOME_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) 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 e193b055bb..27cacfebc1 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/004.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/004.dm @@ -15,9 +15,14 @@ //Crypt terminal /obj/structure/eventterminal/puzzle04/crypt_doorlock/attack_hand(mob/user as mob) - var/user_loc_start = get_turf(user) if(!puzzlebox_user) puzzlebox_user = usr.real_name + puzzlebox_user_loc = get_turf(usr) + var/user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) + to_chat(user, narrate_body("You moved away from the console!")) + puzzlebox_user = null + return if(puzzlebox_user != usr.real_name) for (var/mob/living/carbon/human/h in range(2, src)) if (h.real_name == puzzlebox_user) @@ -54,8 +59,8 @@ puzzlebox_parser_mode = "HOME_INPUT" attack_hand(user) if (puzzlebox_parser_mode == "HOME_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -125,8 +130,8 @@ terminal_speak("LIST to list available modes, HELP for help screen, EXIT to exit.") puzzlebox_parser_mode = "MESSAGE_INPUT" if (puzzlebox_parser_mode == "MESSAGE_INPUT") - var/user_loc_current = get_turf(user) - if (user_loc_start != user_loc_current) + user_loc_current = get_turf(user) + if (puzzlebox_user_loc != user_loc_current) to_chat(user, narrate_body("You moved away from the console!")) puzzlebox_user = null return @@ -294,10 +299,10 @@ /obj/item/cargo/book/uppmanual/attack_self(mob/user) ..() - if(usr.a_intent != INTENT_GRAB) + if(usr.a_intent != INTENT_HELP) to_chat(usr, SPAN_WARNING("You have no idea how to do that. If you want to read the book, use HELP intent.")) return - if(usr.a_intent == INTENT_GRAB) + if(usr.a_intent == INTENT_HELP) if(book_searched == 1) to_chat(usr, narrate_body("It looks like multiple pages of this manual were scrambled during a previous search. If you were to make heads and tails of it, you're going to need an hour or two in relative peace to rearrange the pages in sequence again.")) return @@ -318,16 +323,16 @@ /obj/item/cargo/book_handwritten/twejournal/attack_self(mob/user) ..() - if(usr.a_intent != INTENT_GRAB) + if(usr.a_intent != INTENT_HELP) to_chat(usr, SPAN_WARNING("You have no idea how to do that. If you want to read the book, use HELP intent.")) return - if(usr.a_intent == INTENT_GRAB) + if(usr.a_intent == INTENT_HELP) if(book_searched == 1) to_chat(usr, narrate_body("The journal appears to be written in Japanese, but someone seems to have already gone through it and scrambled it pages. There is no time at present to restore it, but it will be available for further examination later.")) 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(LANGUAGE_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.")) @@ -493,7 +498,7 @@ user.visible_message(SPAN_NOTICE("[user] finishes searching the bookcase."), SPAN_INFO("You finish searching through part of the bookcase and take a moment to think about your findings..."), SPAN_DANGER("The shuffling noise stops.")) to_chat(user, narrate_body("Some of the left-over books are carefully collected lists of items available for printing and purchase on various colonies across the Neroid sector. The lists are detailed, and certain items are underlined, but there isn't any time to properly analyze them at the moment. There are more books to look through.")) if(searchable_item == TRUE) - to_chat(user, narrate_body("One of the books that was left behind unscathed turns out to be a plastic electronic folder. You pick it up and take it with you. There are still several other things to think about here.")) + to_chat(user, narrate_body("One of the books that was left behind unscathed turns out to be a plastic electronic folder. You pick it up and take it with you.")) var/obj/item/cargo/efolder/folder/crypt_red/dud1/folder = new(get_turf(user)) user.put_in_active_hand(folder) searchable_item = FALSE diff --git a/code/game/objects/structures/sectorpatrol/event_terminal.dm b/code/game/objects/structures/sectorpatrol/event_terminal.dm index 58598eaecc..a6b1ee517b 100644 --- a/code/game/objects/structures/sectorpatrol/event_terminal.dm +++ b/code/game/objects/structures/sectorpatrol/event_terminal.dm @@ -13,7 +13,7 @@ var/puzzlebox_pythia_sign = "0"// For determining if this terminal had a Pythia episode var/puzzlebox_id //for doors and lights etc var/puzzlebox_user //Determines who can type if multiple users - + var/puzzlebox_user_loc // Moving away check //Cutscene tools - speaking, doors, lights, etc //Emote and say moved to general objects and device defs diff --git a/code/game/objects/structures/sectorpatrol/searchable/search_structures.dm b/code/game/objects/structures/sectorpatrol/searchable/search_structures.dm index 5f90aa9f41..ec241f2968 100644 --- a/code/game/objects/structures/sectorpatrol/searchable/search_structures.dm +++ b/code/game/objects/structures/sectorpatrol/searchable/search_structures.dm @@ -3,6 +3,7 @@ desc = "Hello there! If you are in game then soemome f... Uh... You know." icon = 'icons/obj/structures/sp_searchable.dmi' icon_state = "default" + density = TRUE var/searchable_step = 0 var/searchable_used = FALSE var/searchable_item = TRUE diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index ef00408eb3..091ee14e69 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -14,11 +14,10 @@ "bR" = (/obj/structure/window/framed/almayer/hull,/turf/open/floor/almayer{icon_state = "plate"},/area/ovpst/airlock/d31) "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"},/obj/structure/machinery/power/apc{dir = 1},/turf/open/floor/almayer{dir = 1; icon_state = "red"},/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) "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) -"de" = (/obj/structure/machinery/power/apc{dir = 1},/turf/open/floor/almayer{dir = 4; icon_state = "emeraldcorner"},/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) "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) @@ -79,7 +78,7 @@ "lm" = (/obj/structure/machinery/conveyor{dir = 8},/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/power/apc{dir = 1},/turf/open/floor/almayer{dir = 1; icon_state = "orange"},/area/ovpst) +"lx" = (/obj/structure/machinery/light/marker/admin/pythia/repressed,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "lB" = (/obj/structure/searchable/puzzle04/bunk_locker/full3,/turf/open/floor/almayer,/area/ovpst) "lF" = (/turf/open/floor/almayer{dir = 1; icon_state = "orange"},/area/ovpst) "lM" = (/obj/effect/step_trigger/message/seeonce/D31Scn2,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) @@ -106,7 +105,7 @@ "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) "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/power/apc{dir = 1},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) +"pe" = (/obj/structure/machinery/light/marker/admin/pythia/triumphant,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "po" = (/turf/open/floor/almayer{dir = 9; icon_state = "orange"},/area/ovpst) "ps" = (/obj/structure/machinery/door/poddoor/almayer{id = "e-d31"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/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) @@ -124,12 +123,10 @@ "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) -"rj" = (/obj/structure/machinery/power/apc{dir = 4},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "rI" = (/obj/structure/bed/sofa/south/grey/left,/turf/open/floor/almayer{allow_construction = 0},/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) -"so" = (/obj/structure/machinery/power/apc{dir = 1},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "sq" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_e_d31) "sD" = (/turf/open/floor/plating/plating_catwalk,/area/ovpst) "sM" = (/obj/structure/machinery/door/poddoor/almayer{id = "e-pin"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst/airlock/ele_e_pin) @@ -159,7 +156,6 @@ "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) -"xA" = (/turf/closed/wall/almayer/outer,/area/event/metal) "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) @@ -188,7 +184,7 @@ "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) "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/power/apc{dir = 1},/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{dir = 4; icon_state = "emeraldcorner"},/area/ovpst) +"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) "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) @@ -211,7 +207,7 @@ "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) "EB" = (/turf/open/floor/almayer{icon_state = "blue2silver1"},/area/ovpst) -"EE" = (/obj/structure/machinery/power/apc{dir = 1},/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) +"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/correct{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) @@ -264,7 +260,6 @@ "Md" = (/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 8},/area/ovpst) "Mt" = (/turf/open/floor/almayer{icon_state = "orangecorner"; dir = 8},/area/ovpst) "ME" = (/obj/effect/decal/info_tag/pst/eng{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal

- ENG -
G01 -

Dock 31 Security Sub Processors 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. 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. According to the label, the room behind this door should contain everything you need to diagnose and begin servicing issues with the security scanners."},/turf/open/floor/almayer{dir = 1; icon_state = "orangecorner"},/area/ovpst) -"MG" = (/obj/structure/machinery/power/apc,/obj/structure/machinery/light/small,/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) "Nh" = (/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 4},/area/ovpst) @@ -288,7 +283,6 @@ "PR" = (/turf/open/floor/almayer{dir = 10; icon_state = "orange"},/area/ovpst) "PV" = (/obj/structure/ladder{id = "crypt2"; icon_state = "ladder01"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Qk" = (/obj/effect/decal/info_tag/pst/elb{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-B - G01 - Elevator Shaft B
"},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) -"Qn" = (/obj/structure/machinery/power/apc{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "QG" = (/obj/structure/machinery/door/poddoor/almayer/locked{dir = 8},/turf/open/floor/almayer{dir = 1; icon_state = "emerald"},/area/ovpst) "QI" = (/obj/structure/machinery/door/poddoor/almayer{id = "d-pin"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_pin) "QM" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{dir = 9; icon_state = "orange"},/area/ovpst) @@ -349,7 +343,6 @@ "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" = (/turf/open/space/basic,/area/ovpst) "ZB" = (/obj/structure/sink{dir = 8; pixel_y = 0; pixel_x = -9},/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) @@ -396,26 +389,26 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMlhlhlhlhlhlhlhlh qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOBiHpkpqUFelhitpOpOpOpOHaPOXnvapOpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSmRTVTBTVTBuvTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiopOpOpOXEuDuDDFuDBuioioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvHJIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjAjAjAjAjAjAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDsDsDsDsDTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSoQoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSoQoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSlxuvsDsDuvpeTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSjsjsjsjsjsjsjsjsjsTSIAIAIAIAIAIAIAIAIAIATSpOpOpOLBLBXnLBLBpOLBLBpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOpOpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSZvTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSfvPOblHapOpOpOblpOPOhZHaCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOPzGNpOFeZVpOgtpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSioioiolhioioiolhlhuvuvWxCOCOuvuvuvlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSioiomhlhmhPniolhlhuvuvCOCOCOCOuvuvlhlhioyWELlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEuHuHuHuHuHuHuHuHuHwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSeWFrsMsMsMsMsMsMsMsMsMFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioXFlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSioioeJlhioiondlhlhuvuvuvCOCOuvuvuvlhlhioioMYlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSkElhlhlhkElhlhlhlhlhlhlhTXCOlhVflhlhlhkElhlhlhkElhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSRBYYioKBRBYYiopOpOpOpOpZqKqKZgpOpOpOKBRBYYioKBRBYYioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSiohWVaMdiohWVaMdpOpOpOpOpOpOpOpOpOpOioiohWVaMdiohWVaTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSlhlhkElhlhlhkElhpOpOpOpOpORlRlRlpOeAlhlhlhkElhlhlhkETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSlBioiolhKkioiolhpOpOpOpOpOpOpOpOpOhSlhZBKXKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTShYioiolhioiohYlhpOpOKxpOpOpOKxpOpONElhlhlhKXlhELyWioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSmhioiolhioiomhlhULbmUhpOpOpObmbmVpNElhWWCmKXlhELioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSioioiolhioioiolhULLUbmpOpOpObmbmpOSglhlhlhKXlhyWioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEIEIEIEIEIEIEIEIEIEIEIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSlloliolhlleViolhpOpOpOpOpOpOfkpOpOkxlhWWCmKXlhBeioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAZvTSTSTSTSTSTSTSTSTSpOpOpOhuaaaaljpOpONElhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSfvPOblHapOpOpOblpOPOhZHaCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOPzGNpOFeZVpOgtpOlhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhuvuvWxCOCOuvuvuvlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiomhlhmhPniolhlhuvuvCOCOCOCOuvuvlhlhioyWELlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEuHuHuHuHuHuHuHuHuHwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSeWFrsMsMsMsMsMsMsMsMsMFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioXFlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhuvuvuvCOCOuvuvuvlhlhioioMYlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSkElhlhlhkElhlhlhlhlhlhlhTXCOlhVflhlhlhkElhlhlhkElhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSRBYYioKBRBYYiopOpOpOpOpZqKqKZgpOpOpOKBRBYYioKBRBYYioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSiohWVaMdiohWVaMdpOpOpOpOpOpOpOpOpOpOioiohWVaMdiohWVaTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlhlhkElhlhlhkElhpOpOpOpOpORlRlRlpOeAlhlhlhkElhlhlhkETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlBioiolhKkioiolhpOpOpOpOpOpOpOpOpOhSlhZBKXKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATShYioiolhioiohYlhpOpOKxpOpOpOKxpOpONElhlhlhKXlhELyWioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSmhioiolhioiomhlhULbmUhpOpOpObmbmVpNElhWWCmKXlhELioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhULLUbmpOpOpObmbmpOSglhlhlhKXlhyWioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEIEIEIEIEIEIEIEIEIEIEIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlloliolhlleViolhpOpOpOpOpOpOfkpOpOkxlhWWCmKXlhBeioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSpOpOpOhuaaaaljpOpONElhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWeWeWeWeWeWeWeWeWeWeWeWeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIATSTSTSTSlhJOpOlhlhlhlhlhlhlhlhlhlhlhTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSNhkCkCfOpOpOpOpOpOpOxNpOUIfVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOxNqWwZGETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg @@ -455,7 +448,7 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSKpsqpspspspspspspspspssqKpTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOdeTQTQTQTQTQTQTQTQTQthpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOBiTQTQTQTQTQTQTQTQTQthpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOBiTQTQTQTQTQTQTQGNpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOBiTQTQTQTQTQGNpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOBiTQTQTQGNpOpOpOCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA @@ -464,19 +457,19 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSlhlhlhlhlhpOTQpOlhlhlhlhlhTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTKTKTKTKTKlhegTQPzlhTKTKTKTKTKTKTKlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTKIlIlTKTKlhwnwnwnlhTKTKTKTKTKTKTKlhEFuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhuvuvuvlhlhlhlhlhlhlhlhlhuvMGuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpolxlFlFLclhOPlMcTSNQMlFlxlFUQlFXMlhlhlhGATSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhuvuvuvlhlhlhlhlhlhlhlhlhuvqnuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpolFlFlFLclhOPlMcTSNQMlFlFlFUQlFXMlhlhlhGATSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSiaXZpOpOTglhuvuvuvSNvrXZpOpOpOGkOblhlhAquGTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAxAPRcococoarlhwnwnwnlhPRcococococoarlhlhpOLKTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSPRcococoarlhwnwnwnlhPRcococococoarlhlhpOLKTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSlhlhlhlhqelhltTQCllhlhlhlhqelhlhlhlhlhpOLKTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSioioioioEEXMlhJHTQLVlhKKpOpeXMMEpOpOpOpOpOLKpOoIlhsouvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSioioioioEEXMlhJHTQLVlhKKpOEZXMMEpOpOpOpOpOLKpOoIlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOSckVzIkVvTUMPRtYarUMPRcocoarCpaZaZaZpHaZhGaZaoAJuvUfuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOktlhlhlhlhlhnRTQxclhlhlhlhlhlhlhlhlhlhpOLKlhlhlhqnuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSpOktlhTKlhpOQnpOTQSclhBUfElhTKTKTKTKTKlhpOLKTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSpOktlhTKlhpOpOpOTQSclhBUfElhTKTKTKTKTKlhpOLKTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSvBlhpOpOpOLNpOpOpOpOktlhTKlhpOpOpOTQmZCmKXKXlhTKTKTKTKTKlhFoaoTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSLRlhOukVkVkVkVkVkVkVwYlhTKlhgRBuyuTQCYlhlhlhlhlhlhlhTKlhlhlhGATSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSLRlhSNSNSNbQSNSNSNlhlhlhlhlhjilhlhoolhlhBZlhBZlhBZlhTKlhuvtouvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrfptlmlmlmlmlmlmDuSNjecHDMoHAjSijqOjlhlhmKlhmKlhmKlhTKlhmRuvrjTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrfptlmlmlmlmlmlmDuSNjecHDMoHAjSijqOjlhlhmKlhmKlhmKlhTKlhmRuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSnESNYLuDuDnGuDuNdbuvlhlhSGSuKXSuSGlhTKlhuvuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSnElhSNSNSNlhjiSNlhhDlhlhlhlhkulhlhTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSLRlhnhnhnhbCAjapBIHpyypOpOHaPOiPpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA diff --git a/maps/shuttles/uacm_ovpst_transit_L-533.dmm b/maps/shuttles/uacm_ovpst_transit_L-533.dmm index 32a56217b8..d77a971ba0 100644 --- a/maps/shuttles/uacm_ovpst_transit_L-533.dmm +++ b/maps/shuttles/uacm_ovpst_transit_L-533.dmm @@ -95,15 +95,6 @@ }, /turf/template_noop, /area/shuttle/ert) -"ig" = ( -/obj/structure/prop/invuln/dropship_parts/lifeboat{ - name = "Shuttle L-533"; - desc = "A transit shuttle, fairly big for its size. Its markings designate it as L-533, a UACM vessel."; - desc_lore = "Transit shuttles are typically maintained by space stations and other installations where docking for medium and large ships would be impractical or outright impossible. They are also typically used to drop off and pick up cargo and/or personnel from ships during their stay. L-533 has been part of its space stations since its fairly infamous start and little is known about its design."; - icon_state = "26,5" - }, -/turf/template_noop, -/area/template_noop) "iP" = ( /turf/closed/shuttle/lifeboat/transparent, /area/shuttle/ert) @@ -237,7 +228,7 @@ icon_state = "24,02" }, /turf/template_noop, -/area/template_noop) +/area/shuttle/ert) "su" = ( /obj/structure/prop/invuln/dropship_parts/lifeboat{ name = "Twilight Paradox jump jet M-60"; @@ -971,7 +962,7 @@ nn WK "} (23,1,1) = {" -ig +gS Fd kC ke From a1769ce9577a31fbbe7314cc90779f506df8938f Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Sat, 23 Mar 2024 17:26:01 -0400 Subject: [PATCH 03/10] elevator action adds elevators, removes errors with shuttle. Elevators can still yeet themlseves out into different shafts, for now I will smartly restrict that via admin req access har har --- code/modules/shuttle/shuttles/sectorpatrol.dm | 57 +++++++++++++++++-- .../SectorPatrol/OuterVeilPST/ovpst.dmm | 48 +++++++++------- maps/shuttles/uacm_ovpst_ele-d.dmm | 16 +++--- maps/shuttles/uacm_ovpst_ele-e.dmm | 43 +++++++------- maps/shuttles/uacm_ovpst_transit_L-533.dmm | 4 +- 5 files changed, 112 insertions(+), 56 deletions(-) diff --git a/code/modules/shuttle/shuttles/sectorpatrol.dm b/code/modules/shuttle/shuttles/sectorpatrol.dm index e520727c2c..7fa8faf5ed 100644 --- a/code/modules/shuttle/shuttles/sectorpatrol.dm +++ b/code/modules/shuttle/shuttles/sectorpatrol.dm @@ -60,7 +60,6 @@ name = "Outer Veil PST Elevator Shaft E, Dock 31" dir = NORTH id = "ovpst_el-e_d31" - roundstart_template = /datum/map_template/shuttle/pst_elevator_e width = 11 height = 11 airlock_id = "e-d31" @@ -138,7 +137,7 @@ id = "ovpst_el-d_drm" width = 9 height = 9 - airlock_id = "e-drm" + airlock_id = "d-drm" airlock_area = /area/ovpst/airlock/ele_d_drm /obj/docking_port/stationary/emergency_response/external/pst_elevator_d_pin @@ -147,13 +146,61 @@ id = "ovpst_el-d_pin" width = 9 height = 9 - airlock_id = "e-pin" + airlock_id = "d-pin" airlock_area = /area/ovpst/airlock/ele_d_pin -/datum/map_template/shuttle/pst_elevator_e +/obj/docking_port/mobile/emergency_response/pst_elevator_d + name = "Outer Veil PST Elevator D" + id = "uacm_ovpst_ele-d" + preferred_direction = EAST + port_direction = EAST + width = 9 + height = 9 + var/north_door + var/south_door + +/obj/docking_port/mobile/emergency_response/pst_elevator_d/Initialize(mapload) + . = ..() + external_doors = list() + for(var/place in shuttle_areas) + for(var/obj/structure/machinery/door/air in place) + if(air.id == "north_door") + north_door = air + external_doors += list(air) + air.breakable = FALSE + air.indestructible = TRUE + air.unacidable = TRUE + else if(air.id == "south_door") + south_door = air + external_doors += list(air) + air.breakable = FALSE + air.indestructible = TRUE + air.unacidable = TRUE + if(!north_door) + WARNING("No north door found for [src]") + if(!south_door) + WARNING("No south door found for [src]") + +/datum/map_template/shuttle/pst_elevator_d name = "Outer Veil PST Elevator d" shuttle_id = "uacm_ovpst_ele-d" -/area/shuttle/pst_elevator_e +/area/shuttle/pst_elevator_d name = "Outer Veil PST Elevator D" + +/obj/docking_port/stationary/emergency_response/pst_shaft_e + name = "OV-PST, Elevator Shaft E" + dir = NORTH + id = "pst_shaft_e" + roundstart_template = /datum/map_template/shuttle/pst_elevator_e + width = 11 + height = 11 + +/obj/docking_port/stationary/emergency_response/pst_shaft_d + name = "OV-PST, Elevator Shaft D" + dir = NORTH + id = "pst_shaft_d" + roundstart_template = /datum/map_template/shuttle/pst_elevator_d + width = 9 + height = 9 diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index 091ee14e69..349bd3670c 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -78,11 +78,11 @@ "lm" = (/obj/structure/machinery/conveyor{dir = 8},/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/repressed,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) +"lx" = (/obj/structure/machinery/light/marker/admin/pythia/triumphant,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "lB" = (/obj/structure/searchable/puzzle04/bunk_locker/full3,/turf/open/floor/almayer,/area/ovpst) "lF" = (/turf/open/floor/almayer{dir = 1; icon_state = "orange"},/area/ovpst) "lM" = (/obj/effect/step_trigger/message/seeonce/D31Scn2,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) -"lP" = (/obj/structure/machinery/telecomms/broadcaster/preset_cent,/obj/structure/machinery/telecomms/broadcaster/preset_left,/obj/structure/machinery/telecomms/broadcaster/preset_right,/obj/structure/machinery/telecomms/bus/preset_cent,/obj/structure/machinery/telecomms/bus/preset_four,/obj/structure/machinery/telecomms/bus/preset_one,/obj/structure/machinery/telecomms/bus/preset_three,/obj/structure/machinery/telecomms/bus/preset_two,/obj/structure/machinery/telecomms/hub/preset,/obj/structure/machinery/telecomms/hub/preset_cent,/obj/structure/machinery/telecomms/processor/preset_cent,/obj/structure/machinery/telecomms/processor/preset_four,/obj/structure/machinery/telecomms/processor/preset_one,/obj/structure/machinery/telecomms/processor/preset_three,/obj/structure/machinery/telecomms/processor/preset_two,/obj/structure/machinery/telecomms/receiver/preset,/obj/structure/machinery/telecomms/receiver/preset_cent,/obj/structure/machinery/telecomms/receiver/preset_left,/obj/structure/machinery/telecomms/relay/preset,/obj/structure/machinery/telecomms/relay/preset/centcom,/obj/structure/machinery/telecomms/relay/preset/telecomms,/obj/structure/machinery/telecomms/relay/preset/mining,/obj/structure/machinery/telecomms/relay/preset/station,/obj/structure/machinery/telecomms/relay/preset/station/prison,/obj/structure/machinery/telecomms/server/presets,/obj/structure/machinery/telecomms/server/presets/centcomm,/obj/structure/machinery/telecomms/server/presets/command,/obj/structure/machinery/telecomms/server/presets/common,/obj/structure/machinery/telecomms/server/presets/engineering,/obj/structure/machinery/telecomms/server/presets/medical,/obj/structure/machinery/telecomms/server/presets/security,/obj/structure/machinery/telecomms/server/presets/squads,/turf/open/floor/almayer{icon_state = "tcomms"},/area/space) +"lP" = (/obj/structure/machinery/telecomms/broadcaster/preset_cent,/obj/structure/machinery/telecomms/broadcaster/preset_left,/obj/structure/machinery/telecomms/broadcaster/preset_right,/obj/structure/machinery/telecomms/bus/preset_cent,/obj/structure/machinery/telecomms/bus/preset_four,/obj/structure/machinery/telecomms/bus/preset_one,/obj/structure/machinery/telecomms/bus/preset_three,/obj/structure/machinery/telecomms/bus/preset_two,/obj/structure/machinery/telecomms/hub/preset,/obj/structure/machinery/telecomms/hub/preset_cent,/obj/structure/machinery/telecomms/processor/preset_cent,/obj/structure/machinery/telecomms/processor/preset_four,/obj/structure/machinery/telecomms/processor/preset_one,/obj/structure/machinery/telecomms/processor/preset_three,/obj/structure/machinery/telecomms/processor/preset_two,/obj/structure/machinery/telecomms/receiver/preset,/obj/structure/machinery/telecomms/receiver/preset_cent,/obj/structure/machinery/telecomms/receiver/preset_left,/obj/structure/machinery/telecomms/relay/preset,/obj/structure/machinery/telecomms/relay/preset/centcom,/obj/structure/machinery/telecomms/relay/preset/telecomms,/obj/structure/machinery/telecomms/relay/preset/mining,/obj/structure/machinery/telecomms/relay/preset/station,/obj/structure/machinery/telecomms/relay/preset/station/prison,/obj/structure/machinery/telecomms/server/presets,/obj/structure/machinery/telecomms/server/presets/centcomm,/obj/structure/machinery/telecomms/server/presets/command,/obj/structure/machinery/telecomms/server/presets/common,/obj/structure/machinery/telecomms/server/presets/engineering,/obj/structure/machinery/telecomms/server/presets/medical,/obj/structure/machinery/telecomms/server/presets/security,/obj/structure/machinery/telecomms/server/presets/squads,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "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) @@ -105,10 +105,11 @@ "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) "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/triumphant,/turf/open/floor/almayer{icon_state = "tcomms"},/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" = (/obj/structure/machinery/door/poddoor/almayer{id = "e-d31"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/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) +"pu" = (/obj/docking_port/stationary/emergency_response/pst_shaft_d,/turf/open/floor/almayer/empty,/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) @@ -123,10 +124,12 @@ "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) +"rj" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_e_pinnacle,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_e_pin) "rI" = (/obj/structure/bed/sofa/south/grey/left,/turf/open/floor/almayer{allow_construction = 0},/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) +"se" = (/obj/docking_port/stationary/emergency_response/pst_shaft_e,/turf/open/floor/almayer/empty,/area/ovpst) "sq" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_e_d31) "sD" = (/turf/open/floor/plating/plating_catwalk,/area/ovpst) "sM" = (/obj/structure/machinery/door/poddoor/almayer{id = "e-pin"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst/airlock/ele_e_pin) @@ -137,7 +140,7 @@ "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" = (/obj/structure/machinery/door/poddoor/almayer{id = "e-drm"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_drm) +"uH" = (/obj/structure/machinery/door/poddoor/almayer{id = "d-drm"},/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) @@ -156,6 +159,7 @@ "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) +"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) @@ -260,6 +264,7 @@ "Md" = (/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 8},/area/ovpst) "Mt" = (/turf/open/floor/almayer{icon_state = "orangecorner"; dir = 8},/area/ovpst) "ME" = (/obj/effect/decal/info_tag/pst/eng{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal

- ENG -
G01 -

Dock 31 Security Sub Processors 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. 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. According to the label, the room behind this door should contain everything you need to diagnose and begin servicing issues with the security scanners."},/turf/open/floor/almayer{dir = 1; icon_state = "orangecorner"},/area/ovpst) +"MG" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_d_pin,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_pin) "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) "Nh" = (/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 4},/area/ovpst) @@ -343,6 +348,7 @@ "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) "ZE" = (/obj/structure/searchable/puzzle04/bunk_chest/full1,/turf/open/floor/almayer,/area/ovpst) "ZL" = (/turf/open/floor/almayer{icon_state = "sterile"},/area/ovpst) @@ -379,7 +385,7 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSpOAqFizF qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSEppOpOpOpOlhpOpOlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSTSTSTSTSTSTmTmTSTSTSTSTSTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSqMnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhioioioioHayLyLBXioioioioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIASaMGSESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIASaQIQIQIQIQIQIQIQIQISaIAIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhhrhdhdhdhdPePehdhdhdhdvJTSTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSHpHpygTQTQTQkpHpCETSxvoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhblpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFqZRBYYioKBRBYYioKBRBYYioKBRBYYioKBRBYYZLEZlFCwpOhMPePePePePePePePePePeLKxLTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGMGMlhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTAioiohWVaMdiohWVaMdiohWVaMdiohWVaMdiohWVaFAcoyFiGhMPePePePePePePePePePeLKrWTSIAIAIAqg @@ -389,7 +395,7 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMlhlhlhlhlhlhlhlh qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOBiHpkpqUFelhitpOpOpOpOHaPOXnvapOpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSmRTVTBTVTBuvTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiopOpOpOXEuDuDDFuDBuioioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvHJIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjAjAjAjAjAjAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDsDsDsDsDTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSoQoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSlxuvsDsDuvpeTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSoQoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSjsjsjsjsjsjsjsjsjsTSIAIAIAIAIAIAIAIAIAIATSpOpOpOLBLBXnLBLBpOLBLBpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOpOpOpOTSIAIAIAIAqg @@ -405,10 +411,10 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRa qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlhlhkElhlhlhkElhpOpOpOpOpORlRlRlpOeAlhlhlhkElhlhlhkETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlBioiolhKkioiolhpOpOpOpOpOpOpOpOpOhSlhZBKXKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATShYioiolhioiohYlhpOpOKxpOpOpOKxpOpONElhlhlhKXlhELyWioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSmhioiolhioiomhlhULbmUhpOpOpObmbmVpNElhWWCmKXlhELioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSmhioiolhioiomhlhULbmUhpOpOpObmbmVpNElhWWCmKXlhELioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIExAmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhULLUbmpOpOpObmbmpOSglhlhlhKXlhyWioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEIEIEIEIEIEIEIEIEIEIEIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlloliolhlleViolhpOpOpOpOpOpOfkpOpOkxlhWWCmKXlhBeioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSpOpOpOhuaaaaljpOpONElhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWrjRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSpOpOpOhuaaaaljpOpONElhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWeWeWeWeWeWeWeWeWeWeWeWeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIATSTSTSTSlhJOpOlhlhlhlhlhlhlhlhlhlhlhTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSNhkCkCfOpOpOpOpOpOpOxNpOUIfVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOxNqWwZGETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg @@ -423,18 +429,18 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgqgqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qglPqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpusVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgsesVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpKpKpKpKpKpKpKpKpKpKpKpKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA @@ -446,7 +452,7 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpZvaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSKpsqpspspspspspspspspssqKpTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOBiTQTQTQTQTQTQTQTQTQthpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOBiTQTQTQTQTQTQTQGNpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA diff --git a/maps/shuttles/uacm_ovpst_ele-d.dmm b/maps/shuttles/uacm_ovpst_ele-d.dmm index 209e850f1a..7fb48442a5 100644 --- a/maps/shuttles/uacm_ovpst_ele-d.dmm +++ b/maps/shuttles/uacm_ovpst_ele-d.dmm @@ -1,11 +1,13 @@ -"a" = (/obj/structure/machinery/door/poddoor/almayer,/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/space) -"s" = (/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/space) -"t" = (/obj/structure/machinery/computer/shuttle/ert/big{dir = 4; icon_state = "retro"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/space) -"J" = (/turf/closed/wall/almayer/outer,/area/space) -"U" = (/turf/open/floor/almayer{icon_state = "outerhull"},/area/space) +"a" = (/obj/structure/machinery/door/poddoor/almayer{id = "south_door"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"i" = (/obj/docking_port/mobile/emergency_response/pst_elevator_d,/turf/closed/wall/almayer/outer,/area/shuttle/ert) +"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/poddoor/almayer{id = "north_door"},/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) (1,1,1) = {" -JaaaaaaaJ +JvvvvvvvJ JsssssssJ JssUUsssJ JssUsUssJ @@ -13,5 +15,5 @@ JtsUsUssJ JssUsUssJ JssUUsssJ JsssssssJ -JaaaaaaaJ +iaaaaaaaJ "} diff --git a/maps/shuttles/uacm_ovpst_ele-e.dmm b/maps/shuttles/uacm_ovpst_ele-e.dmm index 5718cb2ce8..e971fc9416 100644 --- a/maps/shuttles/uacm_ovpst_ele-e.dmm +++ b/maps/shuttles/uacm_ovpst_ele-e.dmm @@ -1,23 +1,24 @@ -"a" = (/obj/structure/catwalk,/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/pst_elevator_e) -"b" = (/obj/effect/decal/cargo_stripes{icon_state = "ne"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"e" = (/obj/effect/decal/cargo_stripes{icon_state = "s"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"h" = (/obj/structure/bed/chair/dropship/passenger,/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"j" = (/obj/effect/decal/cargo_stripes{icon_state = "se"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"r" = (/obj/effect/decal/cargo_stripes{icon_state = "w"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"v" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{id = "south_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/pst_elevator_e) -"w" = (/obj/effect/decal/cargo_stripes{icon_state = "e"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"x" = (/obj/structure/catwalk,/obj/structure/bed/chair/dropship/passenger{dir = 1},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/pst_elevator_e) -"y" = (/turf/closed/wall/almayer/outer,/area/shuttle/pst_elevator_e) -"C" = (/obj/structure/machinery/computer/shuttle/ert/big{dir = 1; icon_state = "retro"},/obj/structure/catwalk,/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/pst_elevator_e) -"E" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{dir = 4; id = "west_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/pst_elevator_e) -"G" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{id = "east_door"; dir = 8},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/pst_elevator_e) -"J" = (/obj/effect/decal/cargo_stripes{icon_state = "nw"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"K" = (/obj/effect/decal/cargo_stripes{icon_state = "n"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"L" = (/obj/effect/decal/cargo_stripes{icon_state = "sw"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"Q" = (/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"V" = (/obj/structure/bed/chair/dropship/passenger{dir = 1},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) -"W" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{id = "north_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/pst_elevator_e) -"Z" = (/obj/effect/decal/cargo_stripes{icon_state = "open"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/pst_elevator_e) +"a" = (/obj/structure/catwalk,/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"b" = (/obj/effect/decal/cargo_stripes{icon_state = "ne"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"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,/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) +"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/poddoor/almayer{id = "south_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) +"x" = (/obj/structure/catwalk,/obj/structure/bed/chair/dropship/passenger{dir = 1},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"y" = (/turf/closed/wall/almayer/outer,/area/shuttle/ert) +"C" = (/obj/structure/machinery/computer/shuttle/ert/big{dir = 1; icon_state = "retro"},/obj/structure/catwalk,/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"E" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{dir = 4; id = "west_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"G" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{id = "east_door"; dir = 8},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"J" = (/obj/effect/decal/cargo_stripes{icon_state = "nw"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"K" = (/obj/effect/decal/cargo_stripes{icon_state = "n"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"L" = (/obj/effect/decal/cargo_stripes{icon_state = "sw"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"Q" = (/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"V" = (/obj/structure/bed/chair/dropship/passenger{dir = 1},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"W" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{id = "north_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"Y" = (/obj/docking_port/mobile/emergency_response/pst_elevator_e,/turf/closed/wall/almayer/outer,/area/shuttle/ert) +"Z" = (/obj/effect/decal/cargo_stripes{icon_state = "open"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) (1,1,1) = {" yWWWWWWWWWy @@ -30,5 +31,5 @@ EhhhhxhhhhG EQQQQaQQQQG EQQQQaQQQQG EVVVVaVVVVG -yvvvvvvvvvy +Yvvvvvvvvvy "} diff --git a/maps/shuttles/uacm_ovpst_transit_L-533.dmm b/maps/shuttles/uacm_ovpst_transit_L-533.dmm index d77a971ba0..3ace57c752 100644 --- a/maps/shuttles/uacm_ovpst_transit_L-533.dmm +++ b/maps/shuttles/uacm_ovpst_transit_L-533.dmm @@ -149,7 +149,7 @@ /area/shuttle/ert) "lS" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{ - id = "starboard_door"; + id = "port_door"; throw_dir = 2 }, /turf/open/shuttle/lifeboat, @@ -285,7 +285,7 @@ /area/shuttle/ert) "uX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat{ - id = "Boat2-D2"; + id = "starboard_door"; throw_dir = 1 }, /turf/open/shuttle/lifeboat{ From 7ada4aacdcb02a47d5004b8db7b1d80ef5b15e00 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Sat, 23 Mar 2024 21:41:36 -0400 Subject: [PATCH 04/10] Update ovpst.dmm ladders --- maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index 349bd3670c..95f0340636 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -33,7 +33,7 @@ "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) "fO" = (/obj/effect/decal/info_tag/pst/t14{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- T-14 -
Hideaway O37"},/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 1},/area/ovpst) -"fV" = (/obj/structure/ladder{id = "crypt1"; icon_state = "ladder10"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"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) "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) @@ -181,7 +181,7 @@ "Aq" = (/turf/open/floor/almayer{dir = 4; icon_state = "bluecorner"},/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"},/turf/open/floor/almayer{allow_construction = 0},/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) "Bu" = (/turf/open/floor/almayer{dir = 8; icon_state = "redcorner"},/area/ovpst) @@ -226,7 +226,7 @@ "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) -"GE" = (/obj/structure/ladder{id = "crypt2"; icon_state = "ladder10"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"GE" = (/obj/structure/ladder{id = "crypt2"; icon_state = "ladder10"; height = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "GJ" = (/turf/open/floor/almayer{dir = 4; icon_state = "red"},/area/ovpst) "GM" = (/obj/structure/bed/chair/comfy/black,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "GN" = (/turf/open/floor/almayer{dir = 1; icon_state = "emeraldcorner"},/area/ovpst) @@ -286,7 +286,7 @@ "Pz" = (/turf/open/floor/almayer{dir = 10; icon_state = "emerald"},/area/ovpst) "PO" = (/turf/open/floor/almayer{icon_state = "silver"; dir = 1},/area/ovpst) "PR" = (/turf/open/floor/almayer{dir = 10; icon_state = "orange"},/area/ovpst) -"PV" = (/obj/structure/ladder{id = "crypt2"; icon_state = "ladder01"},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) +"PV" = (/obj/structure/ladder{id = "crypt2"; icon_state = "ladder01"; height = 2},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Qk" = (/obj/effect/decal/info_tag/pst/elb{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-B - G01 - Elevator Shaft B
"},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) "QG" = (/obj/structure/machinery/door/poddoor/almayer/locked{dir = 8},/turf/open/floor/almayer{dir = 1; icon_state = "emerald"},/area/ovpst) "QI" = (/obj/structure/machinery/door/poddoor/almayer{id = "d-pin"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_pin) From 1be90961821cf0090e521cdf538fa4de125f7bb3 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Mon, 25 Mar 2024 04:43:23 -0400 Subject: [PATCH 05/10] admin terminals access level --- .../structures/sectorpatrol/admin/admin_event_terminal.dm | 7 +++++-- maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) 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 9c8a84d53d..35ed431102 100644 --- a/code/game/objects/structures/sectorpatrol/admin/admin_event_terminal.dm +++ b/code/game/objects/structures/sectorpatrol/admin/admin_event_terminal.dm @@ -1,7 +1,10 @@ /obj/structure/eventterminal/admin_event_terminal + name = "local network terminal" + desc = "A standard computer terminal with the words 'LNT' imprinted on its side. Activated by standing in its proximity. It appears to be in standby mode." + desc_lore = "Local Network Terminals typically regulate local functions of a given area or are used to interface with bigger systems on a ship or installation. They distinction technically means that the terminal interfaces with the local AI somehow, but few outside of systems engineers use the term for its actual intended purpose, sometimes mistaking other terminal types for LNTs." icon = 'icons/obj/structures/machinery/clio_term.dmi' - plane = GAME_PLANE //These likely can be split since they arent complicated -// req_access = list(ACCESS_SP_ADMIN) + plane = GAME_PLANE + req_access = list(ACCESS_SP_ADMIN) /obj/structure/eventterminal/admin_event_terminal/attack_hand(mob/user as mob) diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index 95f0340636..5d37a5c664 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -186,6 +186,7 @@ "Bi" = (/turf/open/floor/almayer{dir = 4; icon_state = "emeraldcorner"},/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) +"By" = (/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) "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) "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) @@ -401,7 +402,7 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOPO qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOpOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSfvPOblHapOpOpOblpOPOhZHaCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOPzGNpOFeZVpOgtpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhuvuvWxCOCOuvuvuvlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhuvuvWxCOCOByuvuvlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiomhlhmhPniolhlhuvuvCOCOCOCOuvuvlhlhioyWELlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEuHuHuHuHuHuHuHuHuHwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSeWFrsMsMsMsMsMsMsMsMsMFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioXFlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhuvuvuvCOCOuvuvuvlhlhioioMYlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg From 6c3ace0d4d50b5d942cf64d84e1140c936e49d96 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Mon, 25 Mar 2024 07:38:41 -0400 Subject: [PATCH 06/10] Bugfixes, pt 2 Gearsets, missing icons, elevators, positioning of docks, wheee --- code/__DEFINES/job.dm | 1 + code/game/jobs/job/uacm/admin.dm | 4 + code/game/machinery/doors/multi_tile.dm | 22 ++++ code/modules/gear_presets/uacm.dm | 26 +++++ code/modules/mob/new_player/new_player.dm | 2 +- code/modules/shuttle/shuttles/sectorpatrol.dm | 76 +++++--------- icons/obj/items/clothing/cm_hats.dmi | Bin 52251 -> 52506 bytes .../SectorPatrol/OuterVeilPST/ovpst.dmm | 99 +++++++++--------- maps/shuttles/uacm_ovpst_ele-d.dmm | 24 +++-- maps/shuttles/uacm_ovpst_ele-e.dmm | 36 +++---- 10 files changed, 165 insertions(+), 125 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index ae89bbbe10..a88539685e 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -354,6 +354,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define JOB_UACM_RDML "UACM Read Admiral (lower half)" #define JOB_UACM_CMISRS_LT "CMISRS Intelligence Liaison" +#define JOB_UACM_PSTENG "UACM Station Engineer" #define JOB_PREDATOR "Predator" diff --git a/code/game/jobs/job/uacm/admin.dm b/code/game/jobs/job/uacm/admin.dm index 1d5e82dfd4..3911e3d828 100644 --- a/code/game/jobs/job/uacm/admin.dm +++ b/code/game/jobs/job/uacm/admin.dm @@ -5,3 +5,7 @@ /datum/job/uacm/cmisrs_lt title = JOB_UACM_CMISRS_LT gear_preset = /datum/equipment_preset/uacm/cmisrs_lt + +/datum/job/uacm/psteng + title = JOB_UACM_PSTENG + gear_preset = /datum/equipment_preset/uacm/psteng diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 0131bf959b..1242c9289d 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -583,3 +583,25 @@ /obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin req_access = list(ACCESS_SP_ADMIN) + +/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_inner + name = "elevator door" + desc = "A heavy looking metal door." + desc_lore = "Since time immemorial, people have taken great effort not to fall out of elevators in transit. These doors are one such method. Simple, yet effective. Spaceship freight elevators have not changed the game - people still hate falling down elevator shafts." + icon = 'icons/obj/structures/doors/4x1_elevator.dmi' + icon_state = "door_closed" + width = 4 + openspeed = 22 + opacity = TRUE + glass = FALSE + +/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer + name = "elevator door" + desc = "A heavy looking metal door with an equally heavy looking glass panel that lets you peek inside." + desc_lore = "Since time immemorial, people have taken great effort not to fall out of elevators in transit. These doors are one such method. Simple, yet effective. Spaceship freight elevators have not changed the game - people still hate falling down elevator shafts." + icon = 'icons/obj/structures/doors/4x1_elevator_access.dmi' + icon_state = "door_closed" + width = 4 + openspeed = 22 + opacity = FALSE + glass = TRUE diff --git a/code/modules/gear_presets/uacm.dm b/code/modules/gear_presets/uacm.dm index 5321e1854d..371bb1c6c6 100644 --- a/code/modules/gear_presets/uacm.dm +++ b/code/modules/gear_presets/uacm.dm @@ -74,3 +74,29 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/uacm/cmisrs(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + +/datum/equipment_preset/uacm/psteng + name = "UACM PST Station Engineer" + flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE + + idtype = /obj/item/card/id/dogtag + assignment = JOB_UACM_PSTENG + rank = JOB_UACM_PSTENG + paygrade = "NO3" + role_comm_title = "PST-ENG" + skills = /datum/skills/CE + flags = EQUIPMENT_PRESET_EXTRA + languages = ALL_HUMAN_LANGUAGES + + access = list(ACCESS_SP_OVPST_GENERAL_DEFAULT, ACCESS_SP_OVPST_SECURITY_DEFAULT, ACCESS_SP_OVPST_ENGINEERING_DEFAULT, ACCESS_SP_ADMIN) + + minimap_icon = list("cic" = MINIMAP_ICON_COLOR_BRONZE) + minimap_background = MINIMAP_ICON_BACKGROUND_CIC + +/datum/equipment_preset/uacm/psteng/load_gear(mob/living/carbon/human/new_human) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/uacm/jumpsuit_engie(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/clothing/head/beret/uacm/engie(new_human), WEAR_HEAD) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 54e105c5b3..8b9e828e04 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -60,7 +60,7 @@ output += "" if (refresh) close_browser(src, "playersetup") - show_browser(src, output, null, "playersetup", "size=240x[round_start ? 500 : 610];can_close=0;can_minimize=0") + show_browser(src, output, null, "playersetup", "size=240x[round_start ? 400 : 510];can_close=0;can_minimize=0") return /mob/new_player/Topic(href, href_list[]) diff --git a/code/modules/shuttle/shuttles/sectorpatrol.dm b/code/modules/shuttle/shuttles/sectorpatrol.dm index 7fa8faf5ed..a8e25b06dd 100644 --- a/code/modules/shuttle/shuttles/sectorpatrol.dm +++ b/code/modules/shuttle/shuttles/sectorpatrol.dm @@ -22,8 +22,8 @@ port_direction = EAST width = 27 height = 9 - var/port_door var/starboard_door + var/port_door /obj/docking_port/mobile/emergency_response/l533/Initialize(mapload) . = ..() @@ -81,48 +81,30 @@ port_direction = EAST width = 11 height = 11 - var/north_door - var/south_door - var/east_door - var/west_door + var/starboard_door + var/port_door /obj/docking_port/mobile/emergency_response/pst_elevator_e/Initialize(mapload) . = ..() external_doors = list() for(var/place in shuttle_areas) for(var/obj/structure/machinery/door/air in place) - if(air.id == "north_door") - north_door = air - external_doors += list(air) - air.breakable = FALSE - air.indestructible = TRUE - air.unacidable = TRUE - else if(air.id == "south_door") - south_door = air - external_doors += list(air) - air.breakable = FALSE - air.indestructible = TRUE - air.unacidable = TRUE - else if(air.id == "east_door") - east_door = air + if(air.id == "starboard_door") + starboard_door = air external_doors += list(air) air.breakable = FALSE air.indestructible = TRUE air.unacidable = TRUE - else if(air.id == "west_door") - west_door = air + else if(air.id == "port_door") + port_door = air external_doors += list(air) air.breakable = FALSE air.indestructible = TRUE air.unacidable = TRUE - if(!north_door) - WARNING("No north door found for [src]") - if(!south_door) - WARNING("No south door found for [src]") - if(!east_door) - WARNING("No east door found for [src]") - if(!west_door) - WARNING("No west door found for [src]") + if(!port_door) + WARNING("No port door found for [src]") + if(!starboard_door) + WARNING("No starboard door found for [src]") /datum/map_template/shuttle/pst_elevator_e name = "Outer Veil PST Elevator E" @@ -135,8 +117,8 @@ name = "Outer Veil PST Elevator Shaft D, Dormitories level 37" dir = NORTH id = "ovpst_el-d_drm" - width = 9 - height = 9 + width = 11 + height = 11 airlock_id = "d-drm" airlock_area = /area/ovpst/airlock/ele_d_drm @@ -144,8 +126,8 @@ name = "Outer Veil PST Elevator Shaft D, Pinnacle" dir = NORTH id = "ovpst_el-d_pin" - width = 9 - height = 9 + width = 11 + height = 11 airlock_id = "d-pin" airlock_area = /area/ovpst/airlock/ele_d_pin @@ -155,32 +137,32 @@ id = "uacm_ovpst_ele-d" preferred_direction = EAST port_direction = EAST - width = 9 - height = 9 - var/north_door - var/south_door + width = 11 + height = 11 + var/starboard_door + var/port_door /obj/docking_port/mobile/emergency_response/pst_elevator_d/Initialize(mapload) . = ..() external_doors = list() for(var/place in shuttle_areas) for(var/obj/structure/machinery/door/air in place) - if(air.id == "north_door") - north_door = air + if(air.id == "starboard_door") + starboard_door = air external_doors += list(air) air.breakable = FALSE air.indestructible = TRUE air.unacidable = TRUE - else if(air.id == "south_door") - south_door = air + else if(air.id == "port_door") + port_door = air external_doors += list(air) air.breakable = FALSE air.indestructible = TRUE air.unacidable = TRUE - if(!north_door) - WARNING("No north door found for [src]") - if(!south_door) - WARNING("No south door found for [src]") + if(!port_door) + WARNING("No port door found for [src]") + if(!starboard_door) + WARNING("No starboard door found for [src]") /datum/map_template/shuttle/pst_elevator_d name = "Outer Veil PST Elevator d" @@ -202,5 +184,5 @@ dir = NORTH id = "pst_shaft_d" roundstart_template = /datum/map_template/shuttle/pst_elevator_d - width = 9 - height = 9 + width = 11 + height = 11 diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index ae311984e2c3ff3e33b1c4ae6e4e0869fdbfb4b9..c192606536f4297cd2ddbdec0c2433578b4edf23 100644 GIT binary patch delta 13881 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

G$90!Ac< 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 diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index 5d37a5c664..8b8c8b33f3 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -28,6 +28,8 @@ "eJ" = (/obj/structure/searchable/puzzle04/bunk_locker/full1,/turf/open/floor/almayer,/area/ovpst) "eV" = (/obj/structure/searchable/puzzle04/bunk_chest/full4,/turf/open/floor/almayer,/area/ovpst) "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) "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) @@ -107,7 +109,7 @@ "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" = (/obj/structure/machinery/door/poddoor/almayer{id = "e-d31"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst/airlock/ele_e_d31) +"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) "pu" = (/obj/docking_port/stationary/emergency_response/pst_shaft_d,/turf/open/floor/almayer/empty,/area/ovpst) "pH" = (/obj/structure/machinery/light{dir = 2},/turf/open/floor/almayer{icon_state = "blue"},/area/ovpst) @@ -125,6 +127,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},/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) "rI" = (/obj/structure/bed/sofa/south/grey/left,/turf/open/floor/almayer{allow_construction = 0},/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) @@ -132,7 +135,7 @@ "se" = (/obj/docking_port/stationary/emergency_response/pst_shaft_e,/turf/open/floor/almayer/empty,/area/ovpst) "sq" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_e_d31) "sD" = (/turf/open/floor/plating/plating_catwalk,/area/ovpst) -"sM" = (/obj/structure/machinery/door/poddoor/almayer{id = "e-pin"},/turf/open/floor/almayer{icon_state = "emeraldfull"},/area/ovpst/airlock/ele_e_pin) +"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) "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) @@ -140,7 +143,7 @@ "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" = (/obj/structure/machinery/door/poddoor/almayer{id = "d-drm"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_drm) +"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) @@ -186,7 +189,6 @@ "Bi" = (/turf/open/floor/almayer{dir = 4; icon_state = "emeraldcorner"},/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) -"By" = (/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) "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) "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) @@ -208,6 +210,7 @@ "Du" = (/obj/structure/machinery/conveyor{dir = 9},/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) "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) @@ -224,6 +227,7 @@ "Fr" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_e_pin) "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) "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) @@ -265,7 +269,7 @@ "Md" = (/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 8},/area/ovpst) "Mt" = (/turf/open/floor/almayer{icon_state = "orangecorner"; dir = 8},/area/ovpst) "ME" = (/obj/effect/decal/info_tag/pst/eng{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal

- ENG -
G01 -

Dock 31 Security Sub Processors 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. 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. According to the label, the room behind this door should contain everything you need to diagnose and begin servicing issues with the security scanners."},/turf/open/floor/almayer{dir = 1; icon_state = "orangecorner"},/area/ovpst) -"MG" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_d_pin,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_pin) +"MG" = (/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_pin) "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) "Nh" = (/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 4},/area/ovpst) @@ -290,7 +294,7 @@ "PV" = (/obj/structure/ladder{id = "crypt2"; icon_state = "ladder01"; height = 2},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "Qk" = (/obj/effect/decal/info_tag/pst/elb{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-B - G01 - Elevator Shaft B
"},/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst) "QG" = (/obj/structure/machinery/door/poddoor/almayer/locked{dir = 8},/turf/open/floor/almayer{dir = 1; icon_state = "emerald"},/area/ovpst) -"QI" = (/obj/structure/machinery/door/poddoor/almayer{id = "d-pin"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_pin) +"QI" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_d_pin) "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) @@ -331,6 +335,7 @@ "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) "Vp" = (/obj/structure/bed/chair/modular/office{dir = 8},/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) @@ -376,19 +381,19 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSxvxvTSTS qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrIMJpOpOrIERERERMJpOpOrIMJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOhdhdhdhdhdhdhdhdhdpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTmTmTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOhdybhdybhdybybhdhdpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpONhkClVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAxvcepOhdhdhdhdhdhdhdhdhdpOcexvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSaSaSaSaSaSaSaSaSaSaIAIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOLVcoMtpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIAxvbopOpOpOpOpOpOpOpOpOpOpOboxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhqPlhlhlhTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTmTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOhWVaVaMdpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDEZlFoTsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhyXpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSpOAqFizFpOlhRBZWlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSIAIAIAIATSTSTSTSIAIAIAIAIAIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSEppOpOpOpOlhpOpOlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSTSTSTSTSTSTmTmTSTSTSTSTSTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSqMnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhioioioioHayLyLBXioioioioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaMGSESESESESESESESESaIAIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIASaQIQIQIQIQIQIQIQIQISaIAIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhhrhdhdhdhdPePehdhdhdhdvJTSTSIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSHpHpygTQTQTQkpHpCETSxvoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhblpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFqZRBYYioKBRBYYioKBRBYYioKBRBYYioKBRBYYZLEZlFCwpOhMPePePePePePePePePePeLKxLTSIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSaSaSaSaSaSaSaSaSaSaSaSaIAIAIAIAIAIAIAIAIAxvcepOhdhdhdhdhdhdhdhdhdpOcexvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOLVcoMtpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvbopOpOpOpOpOpOpOpOpOpOpOboxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhqPlhlhlhTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTmTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOpOhWVaVaMdpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDEZlFoTsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhyXpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOAqFizFpOlhRBZWlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSIAIAIAIATSTSTSTSIAIAIAIAIAIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSEppOpOpOpOlhpOpOlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhTSTSTSTSTSTSTmTmTSTSTSTSTSTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhioioioioHayLyLBXioioioioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIASaVlFWMGMGMGQIFWMGMGMGQISaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhhrhdhdhdhdPePehdhdhdhdvJTSTSIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSHpHpygTQTQTQkpHpCETSTSoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhblpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFqZRBYYioKBRBYYioKBRBYYioKBRBYYioKBRBYYZLEZlFCwpOhMPePePePePePePePePePeLKxLTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGMGMlhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTAioiohWVaMdiohWVaMdiohWVaMdiohWVaMdiohWVaFAcoyFiGhMPePePePePePePePePePeLKrWTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOTQogogogogogogogogogogogogogkVmZpOLBpOoCpOpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhCSlhlhNshdhdhdhdPePehdhdhdhdEbTSTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOWFogPzSINISoLBvJaZwzpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg @@ -396,19 +401,19 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMlhlhlhlhlhlhlhlh qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOBiHpkpqUFelhitpOpOpOpOHaPOXnvapOpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSmRTVTBTVTBuvTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiopOpOpOXEuDuDDFuDBuioioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvHJIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjAjAjAjAjAjAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDsDsDsDsDTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSoQoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSjsjsjsjsjsjsjsjsjsTSIAIAIAIAIAIAIAIAIAIATSpOpOpOLBLBXnLBLBpOLBLBpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOpOpOpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSfvPOblHapOpOpOblpOPOhZHaCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOPzGNpOFeZVpOgtpOlhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhuvuvWxCOCOByuvuvlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiomhlhmhPniolhlhuvuvCOCOCOCOuvuvlhlhioyWELlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEuHuHuHuHuHuHuHuHuHwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIATSeWFrsMsMsMsMsMsMsMsMsMFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioXFlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhuvuvuvCOCOuvuvuvlhlhioioMYlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSkElhlhlhkElhlhlhlhlhlhlhTXCOlhVflhlhlhkElhlhlhkElhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSRBYYioKBRBYYiopOpOpOpOpZqKqKZgpOpOpOKBRBYYioKBRBYYioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSiohWVaMdiohWVaMdpOpOpOpOpOpOpOpOpOpOioiohWVaMdiohWVaTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSTSoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSTSjsjsjsjslhjsjsjsjsTSTSIAIAIAIAIAIAIAIAIATSpOpOpOLBLBXnLBLBpOLBLBpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOpOpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSfvPOblHapOpOpOblpOPOhZHaCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOPzGNpOFeZVpOgtpOlhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhuvuvWxCOCODPuvuvlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOfAogogogogogogogogogSIpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioiomhlhmhPniolhlhuvuvCOCOCOCOuvuvlhlhioyWELlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIErBuHuHuHwtrBuHuHuHwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSeWFrsMeZeZeZFrsMeZeZeZFreWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioSTlhioioiolhlhuvuvCOCOCOCOuvuvlhlhioioXFlhioioELTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioeJlhioiondlhlhuvuvuvCOCOuvuvuvlhlhioioMYlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSkElhlhlhkElhlhlhlhlhlhlhTXCOlhVflhlhlhkElhlhlhkElhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSRBYYioKBRBYYiopOpOpOpOpZqKqKZgpOpOpOKBRBYYioKBRBYYioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSiohWVaMdiohWVaMdpOpOpOpOpOpOpOpOpOpOioiohWVaMdiohWVaTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlhlhkElhlhlhkElhpOpOpOpOpORlRlRlpOeAlhlhlhkElhlhlhkETSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSlBioiolhKkioiolhpOpOpOpOpOpOpOpOpOhSlhZBKXKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqwtlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAeWRaRaRaRaRaRaRaRaRaRaRaeWIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATShYioiolhioiohYlhpOpOKxpOpOpOKxpOpONElhlhlhKXlhELyWioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIEmqmqmqmqmqmqmqmqmqIEIAIAIAIAIAIAIAqg @@ -429,19 +434,19 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qgqgqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg qglPqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg -qgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpusVsVsVsVsVsVsVsVqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSqgsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgsesVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpusVsVsVsVsVsVsVsVsVsVTSsesVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpKpKpKpKpKpKpKpKpKpKpKpKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA @@ -454,7 +459,7 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpaXaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAKpZvaXaXaXaXaXaXaXaXaXaXKpIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSKpsqpspspspspspspspspssqKpTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSKpsqfapspspssqfapspspssqKpTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOBiTQTQTQTQTQTQTQTQTQthpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOBiTQTQTQTQTQTQTQGNpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOBiTQTQTQTQTQGNpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA @@ -499,7 +504,6 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA -qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAdKIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA @@ -508,5 +512,6 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA +qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA qgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqgqg "} diff --git a/maps/shuttles/uacm_ovpst_ele-d.dmm b/maps/shuttles/uacm_ovpst_ele-d.dmm index 7fb48442a5..43aa06f0d8 100644 --- a/maps/shuttles/uacm_ovpst_ele-d.dmm +++ b/maps/shuttles/uacm_ovpst_ele-d.dmm @@ -1,19 +1,21 @@ -"a" = (/obj/structure/machinery/door/poddoor/almayer{id = "south_door"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"a" = (/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) "i" = (/obj/docking_port/mobile/emergency_response/pst_elevator_d,/turf/closed/wall/almayer/outer,/area/shuttle/ert) "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/poddoor/almayer{id = "north_door"},/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) "J" = (/turf/closed/wall/almayer/outer,/area/shuttle/ert) "U" = (/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) (1,1,1) = {" -JvvvvvvvJ -JsssssssJ -JssUUsssJ -JssUsUssJ -JtsUsUssJ -JssUsUssJ -JssUUsssJ -JsssssssJ -iaaaaaaaJ +JvUUUJvUUUJ +JsssssssssJ +JsssssssssJ +JsssUUssssJ +JsssUsUsssJ +JtssUsUsssJ +JsssUsUsssJ +JsssUUssssJ +JsssssssssJ +JsssssssssJ +iaUUUJaUUUJ "} diff --git a/maps/shuttles/uacm_ovpst_ele-e.dmm b/maps/shuttles/uacm_ovpst_ele-e.dmm index e971fc9416..623ca3e51b 100644 --- a/maps/shuttles/uacm_ovpst_ele-e.dmm +++ b/maps/shuttles/uacm_ovpst_ele-e.dmm @@ -1,35 +1,33 @@ "a" = (/obj/structure/catwalk,/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) "b" = (/obj/effect/decal/cargo_stripes{icon_state = "ne"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "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,/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) "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/poddoor/almayer{id = "south_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/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) -"x" = (/obj/structure/catwalk,/obj/structure/bed/chair/dropship/passenger{dir = 1},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) "y" = (/turf/closed/wall/almayer/outer,/area/shuttle/ert) -"C" = (/obj/structure/machinery/computer/shuttle/ert/big{dir = 1; icon_state = "retro"},/obj/structure/catwalk,/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) -"E" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{dir = 4; id = "west_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) -"G" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{id = "east_door"; dir = 8},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"C" = (/obj/structure/catwalk,/obj/structure/machinery/computer/shuttle/ert/big{dir = 8; icon_state = "retro"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"E" = (/obj/structure/catwalk,/obj/structure/bed/chair/dropship/passenger{dir = 4},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) "J" = (/obj/effect/decal/cargo_stripes{icon_state = "nw"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "K" = (/obj/effect/decal/cargo_stripes{icon_state = "n"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "L" = (/obj/effect/decal/cargo_stripes{icon_state = "sw"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) "Q" = (/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) -"V" = (/obj/structure/bed/chair/dropship/passenger{dir = 1},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) -"W" = (/obj/structure/catwalk,/obj/structure/machinery/door/poddoor/almayer{id = "north_door"},/turf/open/floor/almayer{icon_state = "outerhull"},/area/shuttle/ert) +"V" = (/obj/structure/bed/chair/dropship/passenger{dir = 4},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) +"W" = (/obj/structure/catwalk,/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) "Y" = (/obj/docking_port/mobile/emergency_response/pst_elevator_e,/turf/closed/wall/almayer/outer,/area/shuttle/ert) "Z" = (/obj/effect/decal/cargo_stripes{icon_state = "open"},/turf/open/floor/almayer{allow_construction = 0; icon_state = "plate"},/area/shuttle/ert) (1,1,1) = {" -yWWWWWWWWWy -EJKKbaJKKbG -ErZZwarZZwG -ErZZwarZZwG -ELeejaLeejG -EaaaaCaaaaG -EhhhhxhhhhG -EQQQQaQQQQG -EQQQQaQQQQG -EVVVVaVVVVG -Yvvvvvvvvvy +yWaaayWaaay +yVQJKKKbQhy +yVQrZZZwQhy +yVQrZZZwQhy +yVQLeeejQhy +yaaaaaaaECy +yVQJKKKbQhy +yVQrZZZwQhy +yVQrZZZwQhy +yVQLeeejQhy +Yvaaayvaaay "} From 7f57c687983c50649d9b5df13dd9876468e31a89 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Mon, 25 Mar 2024 08:32:23 -0400 Subject: [PATCH 07/10] Update multi_tile.dm access woes, I'm sure no one will fall down an elevator shaft haha --- code/game/machinery/doors/multi_tile.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 1242c9289d..56610d6d7c 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -588,6 +588,7 @@ name = "elevator door" desc = "A heavy looking metal door." desc_lore = "Since time immemorial, people have taken great effort not to fall out of elevators in transit. These doors are one such method. Simple, yet effective. Spaceship freight elevators have not changed the game - people still hate falling down elevator shafts." + req_access = list() icon = 'icons/obj/structures/doors/4x1_elevator.dmi' icon_state = "door_closed" width = 4 @@ -599,6 +600,7 @@ name = "elevator door" desc = "A heavy looking metal door with an equally heavy looking glass panel that lets you peek inside." desc_lore = "Since time immemorial, people have taken great effort not to fall out of elevators in transit. These doors are one such method. Simple, yet effective. Spaceship freight elevators have not changed the game - people still hate falling down elevator shafts." + req_access = list() icon = 'icons/obj/structures/doors/4x1_elevator_access.dmi' icon_state = "door_closed" width = 4 From 6b9c06d4f88f1c0c872100932585d75cb9c8b2df Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Tue, 26 Mar 2024 08:48:48 -0400 Subject: [PATCH 08/10] Poor Melinoe ;( Adds Pythia terminal/tos sprites --- .../structures/sectorpatrol/endpoint/002.dm | 6 ++-- .../structures/sectorpatrol/endpoint/005.dm | 28 ++++++++++++++++++ icons/obj/structures/machinery/pythia.dmi | Bin 0 -> 4296 bytes icons/obj/structures/machinery/tos.dmi | Bin 0 -> 1316 bytes .../SectorPatrol/OuterVeilPST/ovpst.dmm | 11 +++---- 5 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 icons/obj/structures/machinery/pythia.dmi create mode 100644 icons/obj/structures/machinery/tos.dmi diff --git a/code/game/objects/structures/sectorpatrol/endpoint/002.dm b/code/game/objects/structures/sectorpatrol/endpoint/002.dm index f63bbf991b..9ec80052ce 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/002.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/002.dm @@ -889,6 +889,8 @@ 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 = 32 + bound_y = 32 var/puzzlebox_panel_open = FALSE var/puzzlebox_panel_locked = TRUE var/puzzlebox_panel_phrasepased = FALSE @@ -898,7 +900,7 @@ /obj/structure/eventterminal/puzzle02/ldmainframe_master/proc/lockout() puzzlebox_lockout = TRUE - sleep(5 MINUTES) + sleep(2 MINUTES) puzzlebox_lockout = FALSE if(!puzzlebox_id) puzzlebox_id = "I forgot to set an ID. Oops." log_game("[puzzlebox_id] has lifted its lockdown!") @@ -1125,7 +1127,7 @@ return if (puzzlebox_parser_input == "pom.calibrate UACM-OVPST-D31-LDDIAG") terminal_speak("Deploying recalibration buffer.", 50) - 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: 5 minutes.") + 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.") for (var/obj/structure/eventterminal/puzzle02/ldmainframe_master/T in world) diff --git a/code/game/objects/structures/sectorpatrol/endpoint/005.dm b/code/game/objects/structures/sectorpatrol/endpoint/005.dm index 020ab52b28..c6b9eac3da 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/005.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/005.dm @@ -32,11 +32,39 @@ name = "repressed echo" langchat_color = "#b17e0f" +/obj/structure/eventterminal/puzzle05/pythia + + name = "modified LD mainframe" + desc = "A Liquid Data mainframe with clear signs of tampering and customization." + desc_lore = "Due to the unpredictability of Liquid Data, modifying or tampering with already working LD devices is typically discouraged and official research into the matter has been in a virtual standstill. Regardless, someone seems to have been not only able to open and modify this console, the did so without covering everything around it with toxic crystalline which is the typical outcome of such endeavors." + icon = 'icons/obj/structures/machinery/pythia.dmi' + icon_state = "center_off" + puzzlebox_id = "pythia_center" + density = TRUE + opacity = FALSE + plane = FLOOR_PLANE + bound_x = 32 + bound_y = 32 + +/obj/structure/eventterminal/puzzle05/pythia/left + icon_state = "left_off" + puzzlebox_id = "pythia_left" + +/obj/structure/eventterminal/puzzle05/pythia/right + icon_state = "right_off" + puzzlebox_id = "pythia_right" + /obj/structure/eventterminal/puzzle05/testament_of_sacrifice + icon = 'icons/obj/structures/machinery/tos.dmi' + icon_state = "tos" name = "synthetic frame" 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 + opacity = FALSE + density = TRUE + plane = GAME_PLANE var/pythia_talk /obj/structure/eventterminal/puzzle05/testament_of_sacrifice/proc/pythiadelay() diff --git a/icons/obj/structures/machinery/pythia.dmi b/icons/obj/structures/machinery/pythia.dmi new file mode 100644 index 0000000000000000000000000000000000000000..708b95b8290b2c98c86b025c7f67c4ea0757bfad GIT binary patch literal 4296 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 WvGMb;r{*6D$Tq*gtyMmer~VH?gREKr literal 0 HcmV?d00001 diff --git a/icons/obj/structures/machinery/tos.dmi b/icons/obj/structures/machinery/tos.dmi new file mode 100644 index 0000000000000000000000000000000000000000..df445043ceab94bf59aa5a545836b529db42056a GIT binary patch literal 1316 zcmV+<1>5?GP)=6?a{rw}`w3`M7AWBSIX>5VFmx`B~upA{NTwihx4-N9t znO|RDy_t;C*+|OQ*ZceX(xq3vh$|u{S2#OTyUNPc;NYQdpOvw&(d+8j>FJoUui)_S zbTDAz}D5BqOg~gr<07Lnt-09skeGr zfr@&Vk$jnwe3^M#g1C)`>A|H~b#!crh-86)UlMcM00001bW%=J06^y0W&i*HYI;;y zbVOxyV{&P5bZKvH004NLQ&wi4sSc!`>C9|j)q>PI*ttc@!6~b0laP@Nmn+gCD z0U4NJ10U`H00V4EL_t(oh3%FBchWEr$4l4Rm0V?GbOBE-Rcz<5b3?ZwZVq+RsT+L% zZ)0fEG=;7dwkPu5j`yIn$>smMyIiVikM?N)u~l?kujs2*vAk9E4P!&ER93BHS<`jH zd}10b39DAJlv&oMX;<0DTu%UtfMeKI)3#X(tW~R7!mOvYO{Z$xcGX!^0H|$&W16N@ z*JWY%w8LQUE#0U4ZuecAr5CFSMCeKGumf-+U3&IcK$8N71Yylz4uwvER(bNqoV2+L~ZQ>_;vw%QZ z#G~LGd%o{?Pr8AFK*STwZw}LXRc}*;JqG~QF{t>MOMsw8iDjVSd8eV@IqV!aOeBe; z1prj#PzC^I3JyUbfI|I%nL2d{aXdfrX{X*fc5DG435oy`LRc6;1IYGG36O^FPQxi| zhd@6Jqfdk0pbrizdtmbTZUC495N=7iJ|qazz=LwTI0cwI7n6Vi&@hSygF*kPj3016 zPy~?N08}Ip%s#)HK&=)DFu8)V0FVHj`cXs&pH+Z3lX(DAUmAB*V_7l-Y#_+%UKXa+zd|Lpwyyid~QIpAyGLCqK!fmSWt`;*?~OW?Ta%ZJ4zn zV*R1?#<;EB8aI@Ph{nftB0uYh#3|=?Z?y}eN#iOfVp$-qAQ+9tV{JShjifXIlEmR5 a*8d9(6=b7utWdcC0000- 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/correct{puzzlebox_id = "LD_Mainframe_1"; item_serial = "UACM-OVPST-D31-LDCPU-01"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) @@ -239,7 +241,6 @@ "Hp" = (/turf/open/floor/almayer{dir = 1; icon_state = "emerald"},/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) -"HJ" = (/obj/structure/eventterminal/puzzle05/testament_of_sacrifice,/turf/open/floor/kutjevo/colors/blue/tile,/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) @@ -270,6 +271,7 @@ "Mt" = (/turf/open/floor/almayer{icon_state = "orangecorner"; dir = 8},/area/ovpst) "ME" = (/obj/effect/decal/info_tag/pst/eng{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal

- ENG -
G01 -

Dock 31 Security Sub Processors 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. 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. According to the label, the room behind this door should contain everything you need to diagnose and begin servicing issues with the security scanners."},/turf/open/floor/almayer{dir = 1; icon_state = "orangecorner"},/area/ovpst) "MG" = (/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_d_pin) +"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) "Nh" = (/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 4},/area/ovpst) @@ -315,7 +317,6 @@ "Tg" = (/turf/open/floor/almayer{dir = 4; icon_state = "orange"},/area/ovpst) "Tm" = (/obj/structure/machinery/door/poddoor/almayer/locked,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) "TA" = (/obj/effect/decal/info_tag/pst/eng{dir = 1; pixel_y = 0; 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"},/area/ovpst) -"TB" = (/obj/structure/eventterminal/puzzle02/ldmainframe_master/incorrect{item_serial = "UACM-OVPST-D31-LDCPU-03"; puzzlebox_id = "LD_Mainframe_3"},/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) "TK" = (/obj/structure/foamed_metal,/turf/open/floor/plating,/area/ovpst) "TQ" = (/turf/open/floor/almayer{icon_state = "emeraldfull"; dir = 1},/area/ovpst) "TS" = (/turf/closed/wall/almayer/outer,/area/ovpst) @@ -398,8 +399,8 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGM qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOTQogogogogogogogogogogogogogkVmZpOLBpOoCpOpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhCSlhlhNshdhdhdhdPePehdhdhdhdEbTSTSIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOWFogPzSINISoLBvJaZwzpOlhpOpOlhZhZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhEMlhlhlhlhlhlhlhlhlhlhcOpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSTVTVTVTVTVTVTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiohdhdhdhdPePehdhdhdhdioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOBiHpkpqUFelhitpOpOpOpOHaPOXnvapOpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSmRTVTBTVTBuvTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiopOpOpOXEuDuDDFuDBuioioTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvHJIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOBiHpkpqUFelhitpOpOpOpOHaPOXnvapOpOpOvJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSMHTVEtTVEyuvTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhiopOpOpOXEuDuDDFuDBuioioTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOpOPzogZVpOPzogogogogogogEBaZaZaZaZrRREIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSkwuvTVIzuvwpTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhlhlhlhlhlhUPpOlhIKlhlhlhTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjAjAjAjAjAjAjAjjLVjNPAjAjAjAjAjAjzulFlFlFlFXMQGIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDsDsDsDsDTSIATSsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhsDlhlhpOpOpOpOUmAjdPemAjFzpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSTSoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSTSjsjsjsjslhjsjsjsjsTSTSIAIAIAIAIAIAIAIAIATSpOpOpOLBLBXnLBLBpOLBLBpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg From f25313d8bbc18a61ca62bdb25c1ebf22083b6088 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:07:56 -0400 Subject: [PATCH 09/10] fixing rfid manipulation and pythia final touches --- code/game/objects/items/cards_ids.dm | 8 +++----- code/game/objects/items/devices/uacmrfid.dm | 14 +++++++------- .../structures/sectorpatrol/endpoint/005.dm | 11 ++++++++++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index fdb7a4be13..ef31d07587 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -363,7 +363,6 @@ item_state = "dogtag" pinned_on_uniform = FALSE var/dogtag_taken = FALSE - var/list/rfid //UACM Rfid chips /obj/item/card/id/dogtag/get_examine_text(mob/user) @@ -373,8 +372,9 @@ /obj/item/card/id/dogtag/attackby(obj/item/W as obj, mob/user as mob) - if ( !(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER) || (istype(W, /obj/item/device/encryptionkey)) )) + if (!((HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) || (istype(W, /obj/item/device/uacmrfid)))) to_chat(user, SPAN_WARNING("You have no idea how to combine these two together.")) + return if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) var/turf/T = get_turf(user) @@ -382,9 +382,8 @@ to_chat(user, "You cannot do it here.") return var/removed_rfid = FALSE - for (var/obj/item/device/uacmrfid/key in rfid) + for (var/obj/item/device/uacmrfid/key in contents) key.forceMove(T) - rfid -= key removed_rfid = TRUE if(removed_rfid) to_chat(user, SPAN_NOTICE("You wedge the RFID chip from the slot on the back of the dogtags.")) @@ -392,7 +391,6 @@ if(istype(W, /obj/item/device/uacmrfid)) if(user.drop_held_item()) W.forceMove(src) - rfid += W to_chat(user, SPAN_NOTICE("The RFID slots into the dog tag with a click.")) return /obj/item/dogtag diff --git a/code/game/objects/items/devices/uacmrfid.dm b/code/game/objects/items/devices/uacmrfid.dm index 194880672e..ed512bb950 100644 --- a/code/game/objects/items/devices/uacmrfid.dm +++ b/code/game/objects/items/devices/uacmrfid.dm @@ -10,17 +10,17 @@ var/set_name var/set_rank -/obj/item/device/uacmrfid/attack_self() +/obj/item/device/uacmrfid/attack_self(mob/user) ..() + if(!set_name) + set_name = tgui_input_text (usr, "Name not found. Setting:", "Name:", max_length = MAX_MESSAGE_LEN, timeout = 0) + if(!set_name) return + if(!set_rank) + set_rank = tgui_input_text (usr, "Rank not found. Setting:", "Rank:", max_length = MAX_MESSAGE_LEN, timeout = 0) + if(!set_rank) return if(set_name && set_rank && icon_state == "rfid") name = "set UACM RFID chip" icon_state = "rfid_set" desc = "A small chip with what looks like a capsule with a translucent, slightly blue colored liquid in the middle. The liquid appears to be swirling lazily and gives of the slightest of glows, only visible in almost absolute darkness." desc_lore = "The UACM using RFID chips as ways of tagging their crews for on-board AIs is fairly common practice. This chip utilizes a small amount of Liquid Data, which is a prototype solution implemented currently only on the PST. This one seems to have been set to someone's biometrics and is very likely to engage an alarm if pried apart from its designated dog tags for too long." - if(!set_name) - set_name = tgui_input_text (src, "Name not found. Setting:", "Name:", max_length = MAX_MESSAGE_LEN, timeout = 0) - if(!set_name) return - if(!set_rank) - set_rank = tgui_input_text (src, "Rank not found. Setting:", "Rank:", max_length = MAX_MESSAGE_LEN, timeout = 0) - if(!set_rank) return return diff --git a/code/game/objects/structures/sectorpatrol/endpoint/005.dm b/code/game/objects/structures/sectorpatrol/endpoint/005.dm index c6b9eac3da..85b2bf68b8 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/005.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/005.dm @@ -152,4 +152,13 @@ puzzlebox_user = null return - +/obj/structure/eventterminal/puzzle05/testament_of_sacrifice/proc/pythia_terminal_icons(str) + for(var/obj/structure/eventterminal/puzzle05/pythia/center in world) + center.icon_state = "[str]" + center.update_icon() + for(var/obj/structure/eventterminal/puzzle05/pythia/left/left in world) + left.icon_state = "[str]" + left.update_icon() + for(var/obj/structure/eventterminal/puzzle05/pythia/right/right in world) + right.icon_state = "[str]" + right.update_icon() From db87cef16b0c95c0628b8c4815b36f0f7df9b682 Mon Sep 17 00:00:00 2001 From: silencer-pl <103842328+silencer-pl@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:27:44 -0400 Subject: [PATCH 10/10] Final bugfixes Some LD mainframe shenanigans --- code/game/objects/structures/sectorpatrol/endpoint/002.dm | 7 +++++-- maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/sectorpatrol/endpoint/002.dm b/code/game/objects/structures/sectorpatrol/endpoint/002.dm index 9ec80052ce..43d64e2c74 100644 --- a/code/game/objects/structures/sectorpatrol/endpoint/002.dm +++ b/code/game/objects/structures/sectorpatrol/endpoint/002.dm @@ -741,8 +741,9 @@ terminal_speak("In each chamber, first use the processor's terminal and run command 'pom.sync global_override' followed by a space and the serial number of THIS very terminal, which you should probably note down somewhere.") terminal_speak("This should let you access the calibration port, or rather the hatch covering the port which you will need a screwdriver to open.") terminal_speak("Once you can access the port, plug in your multitool and send a standard testing phrase to the terminal.") + terminal_speak("When the multitool is done and beeps, you need to remember to close the port or the terminal will not know you are done.") terminal_speak("Check the terminals output. What you should see is digits going from zero to nine, followed by the 26 basic alphabet letters, lowercase then uppercase.") - terminal_speak("You see ANYTHING else, close the port, use the processor's terminal and use command 'pom.calibrate' and again, the serial number of THIS terminal.") + 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) @@ -889,8 +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 = 32 + bound_x = 64 bound_y = 32 + density = TRUE + opacity = TRUE var/puzzlebox_panel_open = FALSE var/puzzlebox_panel_locked = TRUE var/puzzlebox_panel_phrasepased = FALSE diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm index a387feba4b..786862a3f0 100644 --- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm +++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm @@ -119,6 +119,7 @@ "qg" = (/turf/closed/wall/almayer/outer,/area/space) "qn" = (/obj/structure/machinery/light/small,/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst) "qK" = (/turf/open/floor/almayer{icon_state = "purple"; dir = 1},/area/ovpst) +"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) @@ -218,7 +219,7 @@ "Ey" = (/obj/structure/eventterminal/puzzle05/pythia/right,/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst) "EB" = (/turf/open/floor/almayer{icon_state = "blue2silver1"},/area/ovpst) "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/correct{puzzlebox_id = "LD_Mainframe_1"; item_serial = "UACM-OVPST-D31-LDCPU-01"},/turf/open/floor/almayer{icon_state = "tcomms"},/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) "ER" = (/obj/structure/bed/sofa/south/grey,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst) @@ -405,7 +406,7 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOGJUvAjAjAjAjAjAjAjAjAjAjAjAjAjAjjLVjNPAjAjAj qgIAIAIAIAIAIAIAIAIAIAIAIAIATSrPuDuDUYUYuDuDuDuDTSTSoQTSoQoQoQTSoQoQoQTSFzpOpOLBLBXnLBXnblyGLBpOQkTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSpeuvsDsDuvlxTSIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhpOpOpOpOpOpOkcgoBupOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSTSjsjsjsjslhjsjsjsjsTSTSIAIAIAIAIAIAIAIAIATSpOpOpOLBLBXnLBLBpOLBLBpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIATSsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJBvOtpOpOpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOPOhZblblPOblblblpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSOKOKmjsDOKOKTSIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSpOpOpOpOpOpOBFlhlhemememTSIAIAIAIAqg -qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOpOpOpOTSIAIAIAIAqg +qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOXnLBLBLBpOpOXnLBXnblUBblTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIATSuvuvsDsDuvuvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOogpOpOFeogFeogpOqLqLpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOLBLBLBLBPOblXnblPOLBaMpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSTSTSTSTSTSTSTSTSTSTSuvuvsDsDuvuvTSIATSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOgtgtogFeZVpOhEpOlhlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSfvPOblHapOpOpOblpOPOhZHaCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSllZEiolhllDWiolhlhlhlhlhjgCOlhlhTSTSTSioioOslhioiomeTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOPzGNpOFeZVpOgtpOlhlhpOTSIAIAIAIAqg qgIAIAIAIAIAIAIAIAIAIAIAIATSsVsVsVsVsVsVsVsVsVsVsVTSIAIAIAIAIAIAIAIAIATSpOpOpOpOpOpOpOpOpOpOpOpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIATSioioiolhioioiolhlhuvuvWxCOCODPuvuvlhlhioioISlhioioyWTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSWAogogogogogogogoglhlhpOTSIAIAIAIAqg